summaryrefslogtreecommitdiff
path: root/sw/source/core/swg/SwXMLTextBlocks.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-09-15 11:54:51 +0000
committerOliver Bolte <obo@openoffice.org>2006-09-15 11:54:51 +0000
commit9a8afc7ccb2f7e73b8a2dfa32a11c2d4bab33953 (patch)
tree8ac77c693bafb96954b73dc3465fe6e48d462e09 /sw/source/core/swg/SwXMLTextBlocks.cxx
parentcaf5661f216a9899d57c9e91c4344036151199d2 (diff)
INTEGRATION: CWS os86 (1.31.28); FILE MERGED
2006/09/04 09:55:53 os 1.31.28.1: #i66164# call renameElement only if shortcut really changes
Diffstat (limited to 'sw/source/core/swg/SwXMLTextBlocks.cxx')
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 4a48ecab4ddd..e1451069c300 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: SwXMLTextBlocks.cxx,v $
*
- * $Revision: 1.31 $
+ * $Revision: 1.32 $
*
- * last change: $Author: hr $ $Date: 2006-08-14 16:32:15 $
+ * last change: $Author: obo $ $Date: 2006-09-15 12:54:51 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -273,7 +273,8 @@ ULONG SwXMLTextBlocks::Rename( USHORT nIdx, const String& rNewShort, const Strin
xRoot = 0;
}
- xBlkRoot->renameElement ( aOldName, aPackageName );
+ if(aOldName != aPackageName)
+ xBlkRoot->renameElement ( aOldName, aPackageName );
uno::Reference < embed::XTransactedObject > xTrans( xBlkRoot, uno::UNO_QUERY );
if ( xTrans.is() )
xTrans->commit();