From a9c5a8917feb5c96af181a03cc39c42211b27597 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed, 18 Oct 2006 14:07:38 +0000
Subject: [PATCH] INTEGRATION: CWS c06v4_SRC680 (1.52.2.1.10); FILE MERGED
 2006/10/05 15:41:14 rt 1.52.2.1.10.1: #141143# Joined from CWS c06v3.

---
 .../source/layoutmanager/layoutmanager.cxx    | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index b375217dcfaa..ded2c4e338e9 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: layoutmanager.cxx,v $
  *
- *  $Revision: 1.55 $
+ *  $Revision: 1.56 $
  *
- *  last change: $Author: obo $ $Date: 2006-10-13 09:42:52 $
+ *  last change: $Author: ihi $ $Date: 2006-10-18 15:07:38 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -1363,19 +1363,22 @@ sal_Bool LayoutManager::implts_readWindowStateData( const rtl::OUString& aName,
     sal_Bool bGetSettingsState( sal_False );
 
     WriteGuard aWriteLock( m_aLock );
-    sal_Bool bGlobalSettings( m_bGlobalSettings );
     Reference< XNameAccess > xPersistentWindowState( m_xPersistentWindowState );
-    GlobalSettings* pGlobalSettings( 0 );
-    if ( m_pGlobalSettings == 0 )
-    {
-        m_pGlobalSettings = new GlobalSettings( m_xSMGR );
-        bGetSettingsState = sal_True;
-    }
-    pGlobalSettings = m_pGlobalSettings;
     aWriteLock.unlock();
 
     if ( xPersistentWindowState.is() )
     {
+        aWriteLock.lock();
+        sal_Bool bGlobalSettings( m_bGlobalSettings );
+        GlobalSettings* pGlobalSettings( 0 );
+        if ( m_pGlobalSettings == 0 )
+        {
+            m_pGlobalSettings = new GlobalSettings( m_xSMGR );
+            bGetSettingsState = sal_True;
+        }
+        pGlobalSettings = m_pGlobalSettings;
+        aWriteLock.unlock();
+
         try
         {
             Any a;