diff options
Diffstat (limited to 'sfx2')
| -rw-r--r--[-rwxr-xr-x] | sfx2/source/doc/sfxacldetect.cxx | 0 | ||||
| -rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 7 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sfx2/source/doc/sfxacldetect.cxx b/sfx2/source/doc/sfxacldetect.cxx index b156d409c9be..b156d409c9be 100755..100644 --- a/sfx2/source/doc/sfxacldetect.cxx +++ b/sfx2/source/doc/sfxacldetect.cxx diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 29e6b85d67d2..ab682c604833 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -893,6 +893,7 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSub Window* pParentTbxWindow( pImpl->pBox ); Window* pTbxWindow = VCLUnoHelper::GetWindow( xSubToolBar ); + ToolBox* pToolBar( 0 ); if ( pTbxWindow && pTbxWindow->GetType() == WINDOW_TOOLBOX ) pToolBar = (ToolBox *)pTbxWindow; @@ -907,10 +908,10 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const ::rtl::OUString& rSub aSize = pToolBar->CalcPopupWindowSizePixel(); } pToolBar->SetSizePixel( aSize ); - - // open subtoolbox in popup mode - Window::GetDockingManager()->StartPopupMode( pImpl->pBox, pToolBar ); } + + // open subtoolbox in popup mode + Window::GetDockingManager()->StartPopupMode( pImpl->pBox, pTbxWindow ); } } } |