From 011f9c9c2d7d323e0eebfb57bc4af94d881eb653 Mon Sep 17 00:00:00 2001
From: Christian Lippka <christian.lippka@oracle.com>
Date: Mon, 4 Oct 2010 13:40:44 +0200
Subject: impress201: #i113805# removed limitation to allow change of style
 name and parent for not pre defined styles

---
 sd/source/core/stlsheet.cxx | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)
 mode change 100644 => 100755 sd/source/core/stlsheet.cxx

(limited to 'sd')

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
old mode 100644
new mode 100755
index 7e090d0e9a98..51d1375c9984
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -1003,13 +1003,11 @@ void SAL_CALL SdStyleSheet::setName( const OUString& rName  ) throw(RuntimeExcep
 {
     OGuard aGuard( Application::GetSolarMutex() );
     throwIfDisposed();
-    if( IsUserDefined() )
+
+    if( SetName( rName ) )
     {
-        if( SetName( rName ) )
-        {
-            msApiName = rName;
-            Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
-        }
+        msApiName = rName;
+        Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
     }
 }
 
@@ -1056,28 +1054,25 @@ void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName  ) throw
     OGuard aGuard( Application::GetSolarMutex() );
     throwIfDisposed();
 
-    if( IsUserDefined() )
+    if( rParentName.getLength() )
     {
-        if( rParentName.getLength() )
-        {
-            const SfxStyles& rStyles = mxPool->GetStyles();
+        const SfxStyles& rStyles = mxPool->GetStyles();
 
-            for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); iter++ )
+        for( SfxStyles::const_iterator iter( rStyles.begin() ); iter != rStyles.end(); iter++ )
+        {
+            SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
+            if( pStyle && (pStyle->nFamily == nFamily) && (pStyle->msApiName == rParentName) )
             {
-                SdStyleSheet* pStyle = static_cast< SdStyleSheet* >( (*iter).get() );
-                if( pStyle && (pStyle->nFamily == nFamily) && (pStyle->msApiName == rParentName) )
-                {
-                    if( pStyle != this )
-                        SetParent( pStyle->GetName() );
-                    return;
-                }
+                if( pStyle != this )
+                    SetParent( pStyle->GetName() );
+                return;
             }
-            throw NoSuchElementException();
-        }
-        else
-        {
-            SetParent( rParentName );
         }
+        throw NoSuchElementException();
+    }
+    else
+    {
+        SetParent( rParentName );
     }
 }
 
-- 
cgit