diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2010-12-03 09:39:32 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-12-03 10:10:14 -0500 |
| commit | 969cac7c1792f3a22f589db1baff3919a90820d5 (patch) | |
| tree | 3c76acd8b5df6cfe7b40cb245fa826feaabb60e5 | |
| parent | f2de7d08669eafe30ba9c1def0e84c3d453dd853 (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)
| -rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 2 |
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 3c6eb57b11..6f47b96b52 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 ); |