User: vg Date: 05/03/23 01:53:45 Modified: /dba/dbaccess/source/core/dataaccess/ documentdefinition.cxx
Log: INTEGRATION: CWS dba26 (1.20.12); FILE MERGED 2005/03/14 14:00:18 fs 1.20.12.3: RESYNC: (1.20-1.21); FILE MERGED 2005/03/11 13:31:38 fs 1.20.12.2: #i44786# don't rename if the new name is the same as the old one 2005/03/10 17:04:50 fs 1.20.12.1: #i44562# fillReportData: also pass a connection 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.24&r2=1.25 Delta lines: +8 -4 ------------------- --- documentdefinition.cxx 18 Mar 2005 16:32:48 -0000 1.24 +++ documentdefinition.cxx 23 Mar 2005 09:53:43 -0000 1.25 @@ -1287,16 +1287,20 @@ { 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); + + aGuard.clear(); fire(&nHandle, &aNew, &aOld, 1, sal_True ); 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]
