Attachment 40776 Details for Bug 31308 – patch to fix this

[patch] patch to fix this

0001-Fix-failed-popup-launches-on-Windows.patch (text/plain), 1.87 KB, created by Kohei Yoshida on 2010-12-03 06:42:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kohei Yoshida

Created: 2010-12-03 06:42:57 UTC

Size: 1.87 KB

patch

obsolete

>From 72dfc04d7a23f66ab569c1bdedf41a42f587a430 Mon Sep 17 00:00:00 2001
>From: Kohei Yoshida <kyoshida@novell.com>
>Date: Fri, 3 Dec 2010 09:39:32 -0500
>Subject: [PATCH] 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)
>---
> svx/source/tbxctrls/linectrl.cxx |    2 +-
> 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 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 fc53228..20a77cd 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 );
> 
>-- 
>1.6.6.1
>

Actions: View

Attachments on bug 31308: 40776