diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-04-02 20:57:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-02 21:00:21 +0100 |
| commit | a482b89e4d9c41b6f7c1616d193ac6cde05a69a7 (patch) | |
| tree | 5de29e6277c351bf7b4c431a0e7b3a30fdcf6afa | |
| parent | b89e0c5b56e50ff62d0e5defdf9fe92620cc877a (diff) | |
Resolves: fdo#48096 torn off popups trigger keyboard focus problems
| -rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 4 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index c81177ea4620..ccc047c45adc 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -381,3 +381,3 @@ SvxLineEndWindow::SvxLineEndWindow( rFrame, - WinBits( WB_STDPOPUP ) ), + WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), @@ -402,3 +402,3 @@ SvxLineEndWindow::SvxLineEndWindow( pParentWindow, - WinBits( WB_STDPOPUP ) ), + WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index cb56facafa6a..f9f25a8a3075 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -824,3 +824,3 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, - SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ), + SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ), @@ -1051,3 +1051,3 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFram - 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 ) ), @@ -1328,3 +1328,3 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame - SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_AUTOSIZE ) ), + SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION | WB_AUTOSIZE ) ), m_aLineStyleLb( this ) |