[Libreoffice-commits] .: Branch 'libreoffice-3-3' - svx/source

[Kohei Yoshida]

 svx/source/tbxctrls/linectrl.cxx |    2 +-
 svx/source/tbxctrls/tbcontrl.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 969cac7c1792f3a22f589db1baff3919a90820d5
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Dec 3 09:39:32 2010 -0500

    Fix failed popup launches on Windows.
    
    These two popup windows failed to grab focus when launched, which
    would cause them to immediately quit after launch.  The old code
    passed a BOOL argument where a popup launch flag was expected.
    This looks like an existing bug to me. (fdo#31308)

diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index e336c65..976c41e 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -765,7 +765,7 @@ SfxPopupWindow*	SvxLineEndToolBoxControl::CreatePopupWindow()
 {
     SvxLineEndWindow* pLineEndWin =
         new SvxLineEndWindow( GetId(), m_xFrame, &GetToolBox(), SVX_RESSTR( RID_SVXSTR_LINEEND ) );
-    pLineEndWin->StartPopupMode( &GetToolBox(), TRUE );
+    pLineEndWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS );
     pLineEndWin->StartSelection();
     SetPopupWindow( pLineEndWin );
     return pLineEndWin;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 3c6eb57..6f47b96 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2664,7 +2664,7 @@ SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
 SfxPopupWindow*	SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
 {
     SvxLineWindow_Impl* pLineWin = new SvxLineWindow_Impl( GetSlotId(), m_xFrame, &GetToolBox() );
-    pLineWin->StartPopupMode( &GetToolBox(), TRUE );
+    pLineWin->StartPopupMode( &GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS );
     pLineWin->StartSelection();
     SetPopupWindow( pLineWin );