[libreoffice/f16] fix patch to apply

Caolán McNamara caolanm at fedoraproject.org
Tue Apr 3 07:16:22 UTC 2012


commit 013c637fee3349ed0d3be883f647a186edbc169b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Apr 3 08:16:16 2012 +0100

    fix patch to apply

 ...o-48096-torn-off-popups-trigger-keyboard-.patch |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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
index 86b2aca..8b663e8 100644
--- a/0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch
+++ b/0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch
@@ -13,24 +13,24 @@ 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(
+@@ -381,7 +381,7 @@
      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(
+     pLineEndList	( NULL ),
+     aLineEndSet		( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
+     nCols			( 2 ),
+@@ -403,7 +403,7 @@
      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 ),
+     pLineEndList	( NULL ),
+     aLineEndSet		( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
+     nCols			( 2 ),
 diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
 index cb56fac..f9f25a8 100644
 --- a/svx/source/tbxctrls/tbcontrl.cxx


More information about the scm-commits mailing list