From 6fbbb8504a879815547681f7494153d4c1c35783 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 6 Oct 2015 14:31:38 +0200
Subject: loplugin:mergeclasses

Change-Id: I45ccf880900f46a121c73152615ec3534a47d750
---
 .../source/layoutmanager/toolbarlayoutmanager.cxx    | 20 ++++++++++----------
 .../source/layoutmanager/toolbarlayoutmanager.hxx    |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'framework/source')

diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index a5bb7baa547a..56806fe2c35f 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -53,7 +53,7 @@ namespace framework
 ToolbarLayoutManager::ToolbarLayoutManager(
     const uno::Reference< uno::XComponentContext >& rxContext,
     const uno::Reference< ui::XUIElementFactory >& xUIElementFactory,
-    ILayoutNotifications* pParentLayouter ):
+    LayoutManager* pParentLayouter ):
     m_xContext( rxContext),
     m_xUIElementFactoryManager( xUIElementFactory ),
     m_pParentLayouter( pParentLayouter ),
@@ -980,7 +980,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent )
                         if ( aToolbar.m_xUIElement.is() && !aToolbar.m_bFloating )
                         {
                             implts_setLayoutDirty();
-                            m_pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED );
+                            m_pParentLayouter->requestLayout( LayoutManager::HINT_TOOLBARSPACE_HAS_CHANGED );
                         }
                     }
                 }
@@ -3231,7 +3231,7 @@ throw( uno::RuntimeException, std::exception )
         }
 
         if ( bNotify )
-            m_pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED );
+            m_pParentLayouter->requestLayout( LayoutManager::HINT_TOOLBARSPACE_HAS_CHANGED );
     }
 }
 
@@ -3572,7 +3572,7 @@ throw (uno::RuntimeException, std::exception)
     aWriteLock.clear();
 
     if ( bNotify )
-        m_pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED );
+        m_pParentLayouter->requestLayout( LayoutManager::HINT_TOOLBARSPACE_HAS_CHANGED );
 }
 
 sal_Bool SAL_CALL ToolbarLayoutManager::prepareToggleFloatingMode( const lang::EventObject& e )
@@ -3723,11 +3723,11 @@ throw (uno::RuntimeException, std::exception)
             implts_setLayoutDirty();
 
             aReadLock.reset();
-            ILayoutNotifications* pParentLayouter( m_pParentLayouter );
+            LayoutManager* pParentLayouter( m_pParentLayouter );
             aReadLock.clear();
 
             if ( pParentLayouter )
-                pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED );
+                pParentLayouter->requestLayout( LayoutManager::HINT_TOOLBARSPACE_HAS_CHANGED );
         }
     }
     else
@@ -3787,11 +3787,11 @@ throw (uno::RuntimeException, std::exception)
 
         SolarMutexClearableGuard aReadLock;
         bool bLayoutDirty = m_bLayoutDirty;
-        ILayoutNotifications* pParentLayouter( m_pParentLayouter );
+        LayoutManager* pParentLayouter( m_pParentLayouter );
         aWriteLock.clear();
 
         if ( bLayoutDirty && pParentLayouter )
-            pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED );
+            pParentLayouter->requestLayout( LayoutManager::HINT_TOOLBARSPACE_HAS_CHANGED );
     }
 }
 
@@ -3940,11 +3940,11 @@ throw (uno::RuntimeException, std::exception)
             SolarMutexClearableGuard aWriteLock;
             bool bNotify = !aUIElement.m_bFloating;
             m_bLayoutDirty = bNotify;
-            ILayoutNotifications* pParentLayouter( m_pParentLayouter );
+            LayoutManager* pParentLayouter( m_pParentLayouter );
             aWriteLock.clear();
 
             if ( bNotify && pParentLayouter )
-                pParentLayouter->requestLayout( ILayoutNotifications::HINT_TOOLBARSPACE_HAS_CHANGED );
+                pParentLayouter->requestLayout( LayoutManager::HINT_TOOLBARSPACE_HAS_CHANGED );
         }
     }
 }
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index c41aeee7bb51..9649016bf89d 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -34,7 +34,7 @@
 #include <uiconfiguration/globalsettings.hxx>
 #include <framework/addonsoptions.hxx>
 #include <uielement/uielement.hxx>
-#include <helper/ilayoutnotifications.hxx>
+#include <services/layoutmanager.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -74,7 +74,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< ::com::sun::star::aw
 
         ToolbarLayoutManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
                               const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElementFactory >& xUIElementFactory,
-                              ILayoutNotifications* pParentLayouter );
+                              LayoutManager* pParentLayouter );
         virtual ~ToolbarLayoutManager();
 
         void reset();
@@ -274,7 +274,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< ::com::sun::star::aw
         css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xModuleCfgMgr;
         css::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > m_xDocCfgMgr;
         css::uno::Reference< ::com::sun::star::container::XNameAccess >      m_xPersistentWindowState;
-        ILayoutNotifications*                                                m_pParentLayouter;
+        LayoutManager*                                                       m_pParentLayouter;
 
         UIElementVector                                                      m_aUIElements;
         UIElement                                                            m_aDockUIElement;
-- 
cgit