summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorKohei Yoshida <kyoshida@novell.com>2010-12-03 09:39:32 -0500
committerKohei Yoshida <kyoshida@novell.com>2010-12-03 10:08:21 -0500
commit9b97e2ca0fca2f24882a1c9eaa430b9bfecc032f (patch)
treef499a3b03f64e988843f493300af2bf404637604 /svx
parent7b82cada98ad2d13bb53ded9fee0210d9e241cb8 (diff)
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)
Diffstat (limited to 'svx')
-rw-r--r--svx/source/tbxctrls/linectrl.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index e336c658bb..976c41efa2 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 ce83d7a3a8..3f26cfc58d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2653,7 +2653,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 );