From fd3cb8d8222113cbc7bf472060ac77233706ea1f Mon Sep 17 00:00:00 2001 From: Arnold Dumas Date: Mon, 15 Feb 2016 22:32:15 +0100 Subject: tdf#39440: reduce scope of local variables Change-Id: I6ba411d2e07240821518281996d543f71acf3259 Reviewed-on: https://gerrit.libreoffice.org/22378 Tested-by: Jenkins Reviewed-by: Noel Grandin --- framework/source/layoutmanager/layoutmanager.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'framework') diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 163bbbfc69cc..c89a5775460e 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -485,14 +485,14 @@ bool LayoutManager::readWindowStateData( const OUString& aName, UIElement& rElem GlobalSettings* &rGlobalSettings, bool &bInGlobalSettings, const Reference< XComponentContext > &rComponentContext ) { - bool bGetSettingsState( false ); - SolarMutexResettableGuard aWriteLock; Reference< XNameAccess > xPersistentWindowState( rPersistentWindowState ); aWriteLock.clear(); if ( xPersistentWindowState.is() ) { + bool bGetSettingsState( false ); + aWriteLock.reset(); bool bGlobalSettings( bInGlobalSettings ); GlobalSettings* pGlobalSettings( nullptr ); -- cgit