[Libreoffice-commits] core.git: Branch 'feature/vclref' - framework/source

[Michael Meeks]

 framework/source/layoutmanager/toolbarlayoutmanager.cxx |   14 +++++++-------
 framework/source/uielement/popuptoolbarcontroller.cxx   |    6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit d999fa979139c34d050560dfb99978ce427471be
Author: Michael Meeks <michael.me...@collabora.com>
Date:   Mon Mar 16 13:25:26 2015 +0000

    framework: fix for toolkit updates.
    
    Change-Id: I1629cb6574361d6dd855140d61f38229ab593ed7

diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx 
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index b044bad..356d5de 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -1031,14 +1031,14 @@ void ToolbarLayoutManager::setParentWindow(
     if ( xParentWindow.is() )
     {
         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 );
-        pWindow = dynamic_cast< ::DockingAreaWindow* 
>(VCLUnoHelper::GetWindow( xBottomDockWindow ) );
-            if( pWindow ) pWindow->SetAlign( WINDOWALIGN_BOTTOM );
-        pWindow = dynamic_cast< ::DockingAreaWindow* 
>(VCLUnoHelper::GetWindow( xLeftDockWindow ) );
-            if( pWindow ) pWindow->SetAlign( WINDOWALIGN_LEFT );
-        pWindow = dynamic_cast< ::DockingAreaWindow* 
>(VCLUnoHelper::GetWindow( xRightDockWindow ) );
-            if( pWindow ) pWindow->SetAlign( WINDOWALIGN_RIGHT );
+        pWindow = dynamic_cast< ::DockingAreaWindow* 
>(VCLUnoHelper::GetWindow( xBottomDockWindow ).get() );
+        if( pWindow ) pWindow->SetAlign( WINDOWALIGN_BOTTOM );
+        pWindow = dynamic_cast< ::DockingAreaWindow* 
>(VCLUnoHelper::GetWindow( xLeftDockWindow ).get() );
+        if( pWindow ) pWindow->SetAlign( WINDOWALIGN_LEFT );
+        pWindow = dynamic_cast< ::DockingAreaWindow* 
>(VCLUnoHelper::GetWindow( xRightDockWindow ).get() );
+        if( pWindow ) pWindow->SetAlign( WINDOWALIGN_RIGHT );
         implts_reparentToolbars();
     }
     else
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index fbb2808..625ee1b 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -146,7 +146,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException, 
std::exception )
     }
 
     SolarMutexGuard aSolarLock;
-    ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( 
getParent() ) );
+    VclPtr< ToolBox > pToolBox = static_cast< ToolBox* >( 
VCLUnoHelper::GetWindow( getParent() ).get() );
     if ( pToolBox )
     {
         ToolBoxItemBits nCurStyle( pToolBox->GetItemBits( m_nToolBoxId ) );
@@ -181,7 +181,7 @@ PopupMenuToolbarController::createPopupWindow()
     createPopupMenuController();
 
     SolarMutexGuard aSolarLock;
-    ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( 
getParent() ) );
+    VclPtr< ToolBox > pToolBox = static_cast< ToolBox* >( 
VCLUnoHelper::GetWindow( getParent() ).get() );
     if ( !pToolBox )
         return xRet;
 
@@ -539,7 +539,7 @@ static bool Impl_ExistURLInMenu(
 void NewToolbarController::setItemImage( const OUString &rCommand )
 {
     SolarMutexGuard aSolarLock;
-    ToolBox* pToolBox = static_cast< ToolBox* >( VCLUnoHelper::GetWindow( 
getParent() ) );
+    VclPtr< ToolBox> pToolBox = static_cast< ToolBox* >( 
VCLUnoHelper::GetWindow( getParent() ).get() );
     if ( !pToolBox )
         return;
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits