mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use SolarMutexGuard directly

Browse Source 
Change-Id: I3818b2972771dc934f524b2bf1ee1bddd8e7868b
This commit is contained in:
Stephan Bergmann
2014-03-18 16:23:59 +01:00
parent a395484051
commit 690b76aa27
3 changed files with 201 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/inc/services/layoutmanager.hxx
View File

@@ -20,7 +20,6 @@
#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX #ifndef INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX
#define INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX
#include <threadhelp/threadhelpbase.hxx>
#include <macros/xinterface.hxx> #include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx> #include <macros/xtypeprovider.hxx>
#include <properties.h> #include <properties.h>
@@ -48,6 +47,7 @@
#include <com/sun/star/frame/XMenuBarMergingAcceptor.hpp> #include <com/sun/star/frame/XMenuBarMergingAcceptor.hpp>
#include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp> #include <com/sun/star/frame/XLayoutManagerEventBroadcaster.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/propshlp.hxx> #include <cppuhelper/propshlp.hxx>
#include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase3.hxx>
#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/interfacecontainer.hxx>
@@ -73,9 +73,7 @@ namespace framework
> LayoutManager_Base; > LayoutManager_Base;
typedef ::comphelper::OPropertyContainer LayoutManager_PBase; typedef ::comphelper::OPropertyContainer LayoutManager_PBase;
class LayoutManager : public LayoutManager_Base , class LayoutManager : public LayoutManager_Base ,
// base classes private cppu::BaseMutex,
// Order is necessary for right initialization!
private ThreadHelpBase , // Struct for right initalization of mutex member! Must be first of baseclasses.
public ::cppu::OBroadcastHelper , public ::cppu::OBroadcastHelper ,
public ILayoutNotifications , public ILayoutNotifications ,
public LayoutManager_PBase public LayoutManager_PBase
@@ -183,7 +181,7 @@ namespace framework
/// Reading of settings - shared with ToolbarLayoutManager. /// Reading of settings - shared with ToolbarLayoutManager.
static sal_Bool readWindowStateData( const OUString& rName, UIElement& rElementData, 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, GlobalSettings* &rGlobalSettings, bool &bInGlobalSettings,
const css::uno::Reference< css::uno::XComponentContext > &rComponentContext ); const css::uno::Reference< css::uno::XComponentContext > &rComponentContext );

407
framework/source/layoutmanager/layoutmanager.cxx
View File

File diff suppressed because it is too large Load Diff

2
framework/source/layoutmanager/toolbarlayoutmanager.cxx
View File

@@ -1573,7 +1573,7 @@ void ToolbarLayoutManager::implts_destroyDockingAreaWindows()
sal_Bool ToolbarLayoutManager::implts_readWindowStateData( const OUString& aName, UIElement& rElementData ) sal_Bool ToolbarLayoutManager::implts_readWindowStateData( const OUString& aName, UIElement& rElementData )
{ {
return LayoutManager::readWindowStateData( aName, rElementData, m_aLock, m_xPersistentWindowState, return LayoutManager::readWindowStateData( aName, rElementData, m_xPersistentWindowState,
m_pGlobalSettings, m_bGlobalSettings, m_xContext ); m_pGlobalSettings, m_bGlobalSettings, m_xContext );
} }