Tag: cws_src680_dba26
User: fs      
Date: 05/03/11 05:31:41

Modified:
 /dba/dbaccess/source/core/dataaccess/
  documentdefinition.cxx

Log:
 #i44786# don't rename if the new name is the same as the old one

File Changes:

Directory: /dba/dbaccess/source/core/dataaccess/
================================================

File [changed]: documentdefinition.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentdefinition.cxx?r1=1.20.12.1&r2=1.20.12.2
Delta lines:  +8 -4
-------------------
--- documentdefinition.cxx      10 Mar 2005 17:04:50 -0000      1.20.12.1
+++ documentdefinition.cxx      11 Mar 2005 13:31:38 -0000      1.20.12.2
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: documentdefinition.cxx,v $
  *
- *  $Revision: 1.20.12.1 $
+ *  $Revision: 1.20.12.2 $
  *
- *  last change: $Author: fs $ $Date: 2005/03/10 17:04:50 $
+ *  last change: $Author: fs $ $Date: 2005/03/11 13:31:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1219,8 +1219,11 @@
 {
        try
        {
-               sal_Int32 nHandle = PROPERTY_ID_NAME;
                osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex);
+        if ( newName.equals( m_pImpl->m_aProps.aTitle ) )
+            return;
+
+        sal_Int32 nHandle = PROPERTY_ID_NAME;
                Any aOld = makeAny(m_pImpl->m_aProps.aTitle);
                aGuard.clear();
                Any aNew = makeAny(newName);
@@ -1228,6 +1231,7 @@
                m_pImpl->m_aProps.aTitle = newName;
                fire(&nHandle, &aNew, &aOld, 1, sal_False );
 
+        ::osl::ClearableGuard< ::osl::Mutex > aGuard2( m_aMutex );
                if ( m_xEmbeddedObject.is() && 
m_xEmbeddedObject->getCurrentState() == EmbedStates::ACTIVE )
                        updateDocumentTitle();
        }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to