summaryrefslogtreecommitdiff
authorCaolán McNamara <caolanm@redhat.com>2012-04-02 19:57:02 (GMT)
committer Caolán McNamara <caolanm@redhat.com>2012-04-02 20:00:21 (GMT)
commita482b89e4d9c41b6f7c1616d193ac6cde05a69a7 (patch) (side-by-side diff)
tree5de29e6277c351bf7b4c431a0e7b3a30fdcf6afa
parentb89e0c5b56e50ff62d0e5defdf9fe92620cc877a (diff)
downloadcore-a482b89e4d9c41b6f7c1616d193ac6cde05a69a7.zip
core-a482b89e4d9c41b6f7c1616d193ac6cde05a69a7.tar.gz
Resolves: fdo#48096 torn off popups trigger keyboard focus problems
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--svx/source/tbxctrls/linectrl.cxx4
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx6
2 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index c81177e..ccc047c4 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -379,7 +379,7 @@ SvxLineEndWindow::SvxLineEndWindow(
const String& rWndTitle ) :
SfxPopupWindow( nSlotId,
rFrame,
- WinBits( WB_STDPOPUP ) ),
+ WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
nCols ( 2 ),
nLines ( 12 ),
@@ -400,7 +400,7 @@ SvxLineEndWindow::SvxLineEndWindow(
SfxPopupWindow( nSlotId,
rFrame,
pParentWindow,
- WinBits( WB_STDPOPUP ) ),
+ WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
nCols ( 2 ),
nLines ( 12 ),
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index cb56fac..f9f25a8 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -822,7 +822,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
Window* pParentWindow,
const ::Color rLastColor ) :
- SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
+ SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
theSlotId( nSlotId ),
aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ),
@@ -1049,7 +1049,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
- SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
+ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
bParagraphMode(sal_False)
@@ -1326,7 +1326,7 @@ Color lcl_mediumColor( Color aMain, Color /*aDefault*/ )
SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
- SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_AUTOSIZE ) ),
+ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION | WB_AUTOSIZE ) ),
m_aLineStyleLb( this )
{
try