diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-06 14:31:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-10-07 08:27:26 +0200 |
| commit | 6fbbb8504a879815547681f7494153d4c1c35783 (patch) | |
| tree | c09a63e700ee09e8fbba898e30f765b5d94869d8 /framework/inc/services | |
| parent | b981473658b4aecff544c1c1d9c25dc9b3a07b09 (diff) | |
loplugin:mergeclasses
Change-Id: I45ccf880900f46a121c73152615ec3534a47d750
Diffstat (limited to 'framework/inc/services')
| -rw-r--r-- | framework/inc/services/layoutmanager.hxx | 14 |
1 files changed, 9 insertions, 5 deletions
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 <uielement/menubarmanager.hxx> #include <framework/addonsoptions.hxx> #include <uielement/uielement.hxx> -#include <helper/ilayoutnotifications.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -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, |