[libreoffice/f16] Resolves: rhbz#708041 focus problems and tearable menus
Caolán McNamara
caolanm at fedoraproject.org
Mon Apr 2 20:13:37 UTC 2012
commit 0a1ebb93265999c1690486dbfe7f00b5a3576d19
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Apr 2 21:13:33 2012 +0100
Resolves: rhbz#708041 focus problems and tearable menus
...o-48096-torn-off-popups-trigger-keyboard-.patch | 67 ++++++++++++++++++++
libreoffice.spec | 7 ++-
2 files changed, 73 insertions(+), 1 deletions(-)
---
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?= <caolanm at redhat.com>
+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 bf6dda4..df804cb 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -33,7 +33,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.2
-Release: 10%{?dist}
+Release: 11%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain and ASL 2.0 and Artistic
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
@@ -244,6 +244,7 @@ Patch122: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch
Patch123: 0001-rhbz-789022-SwNodes-fix-inconsistent-outline-check.patch
Patch124: 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch
Patch125: libreoffice-kde4fix.patch
+Patch126: 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}
@@ -1175,6 +1176,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch123 -p1 -b .rhbz-789022-SwNodes-fix-inconsistent-outline-check.patch
%patch124 -p1 -b .rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch
%patch125 -p0 -b .libreoffice-kde4fix.patch
+%patch126 -p1 -b .fdo-48096-torn-off-popups-trigger-keyboard-.patch
# these are horribly incomplete--empty translations and copied english
# strings with spattering of translated strings
@@ -2494,6 +2496,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
+* Mon Apr 02 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-11
+- Resolves: rhbz#708041 focus problems and tearable menus
+
* Thu Mar 29 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-10
- Resolves: rhbz#789022 SwNodes: fix inconsistent outline check
- Resolves: rhbz#806663 SlideshowImpl can outlive SdModule
More information about the scm-commits
mailing list