[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-164-g10e447e
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit a57f39f0493117d421bb3a0f8ccb337a3f673006
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jan 9 13:56:32 2013 +0100
lp#1097718: torn off popups trigger keyboard focus problems
diff --git a/changelog b/changelog
index fade9da..d2032d2 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,7 @@ libreoffice (1:3.5.7-0ubuntu3) UNRELEASED; urgency=low
* backport Do not move nCurUndoAction < 0 (LP: #1097437)
* backport Do not check the stored DIFAT sector count (LP: #1097710)
* backport Enable NPP_Initialize/Shutdown again (LP: #1097715)
+ * backport torn off popups trigger keyboard focus problems (LP: #1097718)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 08 Jan 2013 17:09:36 +0100
diff --git a/patches/lp-1097718-fdo-48096-possibly-also-lp-26303-lp-399765-.diff b/patches/lp-1097718-fdo-48096-possibly-also-lp-26303-lp-399765-.diff
new file mode 100644
index 0000000..3fe8e1e
--- /dev/null
+++ b/patches/lp-1097718-fdo-48096-possibly-also-lp-26303-lp-399765-.diff
@@ -0,0 +1,68 @@
+From 77ed44361e3929cf2a0f79c2ed8f969923bce8af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 2 Apr 2012 20:57:02 +0100
+Subject: [PATCH 03/14] Resolves: fdo#48096 (possibly also: lp#26303,
+ lp#399765, lp#999269) 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 01334d4..cb63ddc 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 b5c50a5..40de3c0 100644
+--- a/svx/source/tbxctrls/tbcontrl.cxx
++++ b/svx/source/tbxctrls/tbcontrl.cxx
+@@ -824,7 +824,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) ),
+@@ -1051,7 +1051,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)
+
+@@ -1328,7 +1328,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.10.4
+
diff --git a/patches/series b/patches/series
index a372698..dedd649 100644
--- a/patches/series
+++ b/patches/series
@@ -44,3 +44,4 @@ lp-1097433-fdo-56009-fdo-54695-Calculate-positions-of-.diff
lp-1097437-Do-not-move-nCurUndoAction-0.diff
lp-1097710-Do-not-check-the-stored-DIFAT-sector-count.diff
lp-1097715-Enable-NPP_Initialize-Shutdown-again.diff
+lp-1097718-fdo-48096-possibly-also-lp-26303-lp-399765-.diff
--
LibreOffice packaging repository
Reply to: