|
 |
27162f6 |
From a482b89e4d9c41b6f7c1616d193ac6cde05a69a7 Mon Sep 17 00:00:00 2001
|
|
|
27162f6 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
27162f6 |
Date: Mon, 2 Apr 2012 20:57:02 +0100
|
|
|
27162f6 |
Subject: [PATCH] Resolves: fdo#48096 torn off popups trigger keyboard focus
|
|
|
27162f6 |
problems
|
|
|
27162f6 |
|
|
|
27162f6 |
---
|
|
|
27162f6 |
svx/source/tbxctrls/linectrl.cxx | 4 ++--
|
|
|
27162f6 |
svx/source/tbxctrls/tbcontrl.cxx | 6 +++---
|
|
|
27162f6 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
27162f6 |
|
|
|
27162f6 |
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
|
|
|
27162f6 |
index c81177e..ccc047c4 100644
|
|
|
27162f6 |
--- a/svx/source/tbxctrls/linectrl.cxx
|
|
|
27162f6 |
+++ b/svx/source/tbxctrls/linectrl.cxx
|
|
|
27162f6 |
@@ -379,7 +379,7 @@ SvxLineEndWindow::SvxLineEndWindow(
|
|
|
27162f6 |
const String& rWndTitle ) :
|
|
|
27162f6 |
SfxPopupWindow( nSlotId,
|
|
|
27162f6 |
rFrame,
|
|
|
27162f6 |
- WinBits( WB_STDPOPUP ) ),
|
|
|
27162f6 |
+ WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
|
|
|
27162f6 |
aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
|
|
|
27162f6 |
nCols ( 2 ),
|
|
|
27162f6 |
nLines ( 12 ),
|
|
|
27162f6 |
@@ -400,7 +400,7 @@ SvxLineEndWindow::SvxLineEndWindow(
|
|
|
27162f6 |
SfxPopupWindow( nSlotId,
|
|
|
27162f6 |
rFrame,
|
|
|
27162f6 |
pParentWindow,
|
|
|
27162f6 |
- WinBits( WB_STDPOPUP ) ),
|
|
|
27162f6 |
+ WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
|
|
|
27162f6 |
aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
|
|
|
27162f6 |
nCols ( 2 ),
|
|
|
27162f6 |
nLines ( 12 ),
|
|
|
27162f6 |
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
|
|
|
27162f6 |
index cb56fac..f9f25a8 100644
|
|
|
27162f6 |
--- a/svx/source/tbxctrls/tbcontrl.cxx
|
|
|
27162f6 |
+++ b/svx/source/tbxctrls/tbcontrl.cxx
|
|
|
27162f6 |
@@ -822,7 +822,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
|
|
|
27162f6 |
Window* pParentWindow,
|
|
|
27162f6 |
const ::Color rLastColor ) :
|
|
|
27162f6 |
|
|
|
27162f6 |
- SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
|
|
|
27162f6 |
+ SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
|
|
|
27162f6 |
|
|
|
27162f6 |
theSlotId( nSlotId ),
|
|
|
27162f6 |
aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ),
|
|
|
27162f6 |
@@ -1049,7 +1049,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
|
|
|
27162f6 |
|
|
|
27162f6 |
SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
|
|
|
27162f6 |
|
|
|
27162f6 |
- SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
|
|
|
27162f6 |
+ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
|
|
|
27162f6 |
aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
|
|
|
27162f6 |
bParagraphMode(sal_False)
|
|
|
27162f6 |
|
|
|
27162f6 |
@@ -1326,7 +1326,7 @@ Color lcl_mediumColor( Color aMain, Color /*aDefault*/ )
|
|
|
27162f6 |
|
|
|
27162f6 |
SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
|
|
|
27162f6 |
|
|
|
27162f6 |
- SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_AUTOSIZE ) ),
|
|
|
27162f6 |
+ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION | WB_AUTOSIZE ) ),
|
|
|
27162f6 |
m_aLineStyleLb( this )
|
|
|
27162f6 |
{
|
|
|
27162f6 |
try
|
|
|
27162f6 |
--
|
|
|
27162f6 |
1.7.7.6
|
|
|
27162f6 |
|