Tag: cws_dev300_odbmacros3 User: fs Date: 2008-09-09 11:02:07+0000 Modified: dba/dbaccess/source/core/dataaccess/databasedocument.cxx
Log: #i49133# getLocation is used for the title nowadays, so do not return the location from which the document was salvaged, but the actual URL File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: databasedocument.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.40.6.19&r2=1.40.6.20 Delta lines: +5 -6 ------------------- --- databasedocument.cxx 2008-08-03 21:17:20+0000 1.40.6.19 +++ databasedocument.cxx 2008-09-09 11:02:04+0000 1.40.6.20 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: databasedocument.cxx,v $ - * $Revision: 1.40.6.19 $ + * $Revision: 1.40.6.20 $ * * This file is part of OpenOffice.org. * @@ -602,14 +602,13 @@ // XStorable sal_Bool SAL_CALL ODatabaseDocument::hasLocation( ) throw (RuntimeException) { - DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit ); - return m_pImpl->getLocation().getLength() > 0; + return getLocation().getLength() > 0; } // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODatabaseDocument::getLocation( ) throw (RuntimeException) { DocumentGuard aGuard( *this, DocumentGuard::MethodWithoutInit ); - return m_pImpl->getLocation(); + return m_pImpl->getURL(); } // ----------------------------------------------------------------------------- sal_Bool SAL_CALL ODatabaseDocument::isReadonly( ) throw (RuntimeException) @@ -622,7 +621,7 @@ { DocumentGuard aGuard( *this ); - if ( m_pImpl->getLocation() == m_pImpl->getURL() ) + if ( m_pImpl->getDocFileLocation() == m_pImpl->getURL() ) if ( m_pImpl->m_bDocumentReadOnly ) throw IOException(); @@ -656,7 +655,7 @@ ModifyLock aLock( *this ); // ignore all changes of our "modified" state during storing - sal_Bool bLocationChanged = ( _rURL != m_pImpl->getLocation() ); + sal_Bool bLocationChanged = ( _rURL != m_pImpl->getDocFileLocation() ); if ( bLocationChanged ) { // create storage for target URL --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
