Skip to content

C
core
Kaydet (Commit) 122577ba authored tarafından Michael Meeks's avatar Michael Meeks
Dosyalara gözat
Seçenekler

framework: fix for toolkit updates. 

Change-Id: I1629cb6574361d6dd855140d61f38229ab593ed7
üst 3b416a7f
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
framework/source/layoutmanager/toolbarlayoutmanager.cxx
Dosyayı görüntüle @ 122577ba
...@@ -1031,14 +1031,14 @@ void ToolbarLayoutManager::setParentWindow( ...@@ -1031,14 +1031,14 @@ void ToolbarLayoutManager::setParentWindow(
if ( xParentWindow.is() ) if ( xParentWindow.is() )
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
::DockingAreaWindow* pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xTopDockWindow ) ); VclPtr< ::DockingAreaWindow > pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xTopDockWindow ).get() );
if( pWindow ) pWindow->SetAlign( WINDOWALIGN_TOP ); if( pWindow ) pWindow->SetAlign( WINDOWALIGN_TOP );
pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xBottomDockWindow ) ); pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xBottomDockWindow ).get() );
if( pWindow ) pWindow->SetAlign( WINDOWALIGN_BOTTOM ); if( pWindow ) pWindow->SetAlign( WINDOWALIGN_BOTTOM );
pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xLeftDockWindow ) ); pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xLeftDockWindow ).get() );
if( pWindow ) pWindow->SetAlign( WINDOWALIGN_LEFT ); if( pWindow ) pWindow->SetAlign( WINDOWALIGN_LEFT );
pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xRightDockWindow ) ); pWindow = dynamic_cast< ::DockingAreaWindow* >(VCLUnoHelper::GetWindow( xRightDockWindow ).get() );
if( pWindow ) pWindow->SetAlign( WINDOWALIGN_RIGHT ); if( pWindow ) pWindow->SetAlign( WINDOWALIGN_RIGHT );
implts_reparentToolbars(); implts_reparentToolbars();
} }
else else
......
framework/source/uielement/popuptoolbarcontroller.cxx
Dosyayı görüntüle @ 122577ba
...@@ -146,7 +146,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) ...@@ -146,7 +146,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
} }
SolarMutexGuard aSolarLock; SolarMutexGuard aSolarLock;
ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) ); VclPtr< ToolBox > pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ).get() );
if ( pToolBox ) if ( pToolBox )
{ {
ToolBoxItemBits nCurStyle( pToolBox->GetItemBits( m_nToolBoxId ) ); ToolBoxItemBits nCurStyle( pToolBox->GetItemBits( m_nToolBoxId ) );
...@@ -181,7 +181,7 @@ PopupMenuToolbarController::createPopupWindow() ...@@ -181,7 +181,7 @@ PopupMenuToolbarController::createPopupWindow()
createPopupMenuController(); createPopupMenuController();
SolarMutexGuard aSolarLock; SolarMutexGuard aSolarLock;
ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) ); VclPtr< ToolBox > pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ).get() );
if ( !pToolBox ) if ( !pToolBox )
return xRet; return xRet;
...@@ -540,7 +540,7 @@ static bool Impl_ExistURLInMenu( ...@@ -540,7 +540,7 @@ static bool Impl_ExistURLInMenu(
void NewToolbarController::setItemImage( const OUString &rCommand ) void NewToolbarController::setItemImage( const OUString &rCommand )
{ {
SolarMutexGuard aSolarLock; SolarMutexGuard aSolarLock;
ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ) ); VclPtr< ToolBox> pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( getParent() ).get() );
if ( !pToolBox ) if ( !pToolBox )
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment