diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 16:23:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 17:37:54 +0100 |
| commit | 690b76aa2792ded47d944f11e175579b263afd19 (patch) | |
| tree | 7586bab995d2758df31b3539cae02e64014244bc /framework/inc/services | |
| parent | a395484051e6f85a52c5402fa4bd23830f30d1ed (diff) | |
Use SolarMutexGuard directly
Change-Id: I3818b2972771dc934f524b2bf1ee1bddd8e7868b
Diffstat (limited to 'framework/inc/services')
| -rw-r--r-- | framework/inc/services/layoutmanager.hxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 7f4d8e0d7d6b..cca40bc906fd 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX -#include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <properties.h> @@ -48,6 +47,7 @@ #include <com/sun/star/frame/XMenuBarMergingAcceptor.hpp> #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -73,9 +73,7 @@ namespace framework > LayoutManager_Base; typedef ::comphelper::OPropertyContainer LayoutManager_PBase; class LayoutManager : public LayoutManager_Base , - // base classes - // Order is necessary for right initialization! - private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses. + private cppu::BaseMutex, public ::cppu::OBroadcastHelper , public ILayoutNotifications , public LayoutManager_PBase @@ -183,7 +181,7 @@ namespace framework /// Reading of settings - shared with ToolbarLayoutManager. static sal_Bool readWindowStateData( const OUString& rName, UIElement& rElementData, - LockHelper &rLock, const css::uno::Reference< css::container::XNameAccess > &rPersistentWindowState, + const css::uno::Reference< css::container::XNameAccess > &rPersistentWindowState, GlobalSettings* &rGlobalSettings, bool &bInGlobalSettings, const css::uno::Reference< css::uno::XComponentContext > &rComponentContext ); |