From 27162f68ce4f756c6c1e10788172e35adc6b077b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 2 Apr 2012 21:10:07 +0100 Subject: [PATCH] Resolves: rhbz#708041 focus problems with tearable menus --- ...96-torn-off-popups-trigger-keyboard-.patch | 67 +++++++++++++++++++ libreoffice.spec | 7 +- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch diff --git a/0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch b/0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch new file mode 100644 index 0000000..86b2aca --- /dev/null +++ b/0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch @@ -0,0 +1,67 @@ +From a482b89e4d9c41b6f7c1616d193ac6cde05a69a7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 2 Apr 2012 20:57:02 +0100 +Subject: [PATCH] Resolves: fdo#48096 torn off popups trigger keyboard focus + problems + +--- + svx/source/tbxctrls/linectrl.cxx | 4 ++-- + svx/source/tbxctrls/tbcontrl.cxx | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx +index c81177e..ccc047c4 100644 +--- a/svx/source/tbxctrls/linectrl.cxx ++++ b/svx/source/tbxctrls/linectrl.cxx +@@ -379,7 +379,7 @@ SvxLineEndWindow::SvxLineEndWindow( + const String& rWndTitle ) : + SfxPopupWindow( nSlotId, + rFrame, +- WinBits( WB_STDPOPUP ) ), ++ WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), + aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), + nCols ( 2 ), + nLines ( 12 ), +@@ -400,7 +400,7 @@ SvxLineEndWindow::SvxLineEndWindow( + SfxPopupWindow( nSlotId, + rFrame, + pParentWindow, +- WinBits( WB_STDPOPUP ) ), ++ WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), + aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), + nCols ( 2 ), + nLines ( 12 ), +diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx +index cb56fac..f9f25a8 100644 +--- a/svx/source/tbxctrls/tbcontrl.cxx ++++ b/svx/source/tbxctrls/tbcontrl.cxx +@@ -822,7 +822,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, + Window* pParentWindow, + const ::Color rLastColor ) : + +- SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ), ++ SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), + + theSlotId( nSlotId ), + aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ), +@@ -1049,7 +1049,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co + + SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : + +- SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ), ++ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), + aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), + bParagraphMode(sal_False) + +@@ -1326,7 +1326,7 @@ Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) + + SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : + +- SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_AUTOSIZE ) ), ++ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION | WB_AUTOSIZE ) ), + m_aLineStyleLb( this ) + { + try +-- +1.7.7.6 + diff --git a/libreoffice.spec b/libreoffice.spec index 6ea1735..54c605d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -35,7 +35,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.1 -Release: 2%{?dist} +Release: 3%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Applications/Productivity URL: http://www.documentfoundation.org/develop @@ -141,6 +141,7 @@ Patch24: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch Patch26: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch Patch27: 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch Patch28: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch +Patch29: 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -993,6 +994,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch26 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch %patch27 -p1 -b .rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch %patch28 -p1 -b .do-not-complain-about-soffice-command-line-o.patch +%patch29 -p1 -b .fdo48096-torn-off-popups-trigger-keyboard-.patch # TODO: check this # these are horribly incomplete--empty translations and copied english @@ -2280,6 +2282,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %endif %changelog +* Mon Apr 02 2012 Caolán McNamara - 3.5.2.1-3 +- Resolves: rhbz#708041 focus problems with tearable menus + * Mon Mar 26 2012 Caolán McNamara - 3.5.2.1-2 - Resolves: rhbz#806663 SlideshowImpl can outlive SdModule