From 6fbbb8504a879815547681f7494153d4c1c35783 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 6 Oct 2015 14:31:38 +0200 Subject: loplugin:mergeclasses Change-Id: I45ccf880900f46a121c73152615ec3534a47d750 --- compilerplugins/clang/mergeclasses.results | 1 - framework/inc/helper/ilayoutnotifications.hxx | 46 ---------------------- framework/inc/services/layoutmanager.hxx | 14 ++++--- .../source/layoutmanager/toolbarlayoutmanager.cxx | 20 +++++----- .../source/layoutmanager/toolbarlayoutmanager.hxx | 6 +-- 5 files changed, 22 insertions(+), 65 deletions(-) delete mode 100644 framework/inc/helper/ilayoutnotifications.hxx diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 22678bfe5323..f64322c106a7 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -163,7 +163,6 @@ merge dbp::OModuleResourceClient with dbp::OUnoAutoPilot merge dbtools::ISQLStatementHelper with connectivity::mysql::OTables merge formula::ExternalReferenceHelper with ScExternalRefManager merge formula::IStructHelper with formula::StructPage -merge framework::ILayoutNotifications with framework::LayoutManager merge framework::IListBoxListener with framework::DropdownToolbarController merge framework::ISpinfieldListener with framework::SpinfieldToolbarController merge framework::IStorageListener with framework::XMLBasedAcceleratorConfiguration diff --git a/framework/inc/helper/ilayoutnotifications.hxx b/framework/inc/helper/ilayoutnotifications.hxx deleted file mode 100644 index 0063386db2cc..000000000000 --- a/framework/inc/helper/ilayoutnotifications.hxx +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_FRAMEWORK_INC_HELPER_ILAYOUTNOTIFICATIONS_HXX -#define INCLUDED_FRAMEWORK_INC_HELPER_ILAYOUTNOTIFICATIONS_HXX - -namespace framework -{ - -class ILayoutNotifications -{ - public: - enum Hint - { - HINT_NOT_SPECIFIED, - HINT_TOOLBARSPACE_HAS_CHANGED, - HINT_COUNT - }; - - virtual void requestLayout( Hint eHint = HINT_NOT_SPECIFIED ) = 0; - - protected: - ~ILayoutNotifications() {} -}; - -} - -#endif // INCLUDED_FRAMEWORK_INC_HELPER_ILAYOUTNOTIFICATIONS_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 76d958e97cde..bb018b473c3d 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -27,7 +27,6 @@ #include #include #include -#include #include #include @@ -61,6 +60,7 @@ class MenuBar; namespace framework { + class ToolbarLayoutManager; class GlobalSettings; namespace detail @@ -75,10 +75,15 @@ namespace framework class LayoutManager : public LayoutManager_Base , private cppu::BaseMutex, public ::cppu::OBroadcastHelper , - public ILayoutNotifications , public LayoutManager_PBase { public: + enum Hint + { + HINT_NOT_SPECIFIED, + HINT_TOOLBARSPACE_HAS_CHANGED, + HINT_COUNT + }; enum { DOCKINGAREAS_COUNT = 4 }; LayoutManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ); @@ -171,9 +176,8 @@ namespace framework DECL_LINK_TYPED( MenuBarClose, void *, void); DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); - // ILayoutNotifications - - virtual void requestLayout( Hint eHint ) SAL_OVERRIDE; + // called from ToolbarLayoutManager + void requestLayout( Hint eHint = HINT_NOT_SPECIFIED ); /// Reading of settings - shared with ToolbarLayoutManager. static bool readWindowStateData( const OUString& rName, UIElement& rElementData, 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 #include #include -#include +#include #include #include @@ -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