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 @@ -376,13 +376,13 @@ Window* SvxLineColorToolBoxControl::CreateItemWindow( Window *pParent ) SvxLineEndWindow::SvxLineEndWindow( sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, 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 ), nLineEndWidth ( 400 ), bPopupMode ( sal_True ), mbInResize ( false ), @@ -397,13 +397,13 @@ SvxLineEndWindow::SvxLineEndWindow( const Reference< XFrame >& rFrame, Window* pParentWindow, const String& rWndTitle ) : 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 ), nLineEndWidth ( 400 ), bPopupMode ( sal_True ), mbInResize ( false ), 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 @@ -819,13 +819,13 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, const String& rWndTitle, 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) ), maCommand( rCommand ), mLastColor( rLastColor ) @@ -1046,13 +1046,13 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co //======================================================================== // class SvxFrameWindow_Impl -------------------------------------------------- //======================================================================== 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) { BindListener(); String sCommand(String::CreateFromAscii( ".uno:BorderReducedMode" )); @@ -1323,13 +1323,13 @@ Color lcl_mediumColor( Color aMain, Color /*aDefault*/ ) { return SvxBorderLine::threeDMediumColor( aMain ); } 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 { Reference< lang::XServiceInfo > xServices( rFrame->getController()->getModel(), UNO_QUERY_THROW ); m_bIsWriter = xServices->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument"))); |