Tag: cws_dev300_odbmacros3 User: fs Date: 2008-05-07 08:27:30+0000 Modified: dba/dbaccess/source/core/dataaccess/ModelImpl.cxx
Log: #i49133# getOrCreateRootStorage: use m_sDocFileLocation instead of m_sDocumentURL File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: ModelImpl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.cxx?r1=1.25.6.2&r2=1.25.6.3 Delta lines: +7 -6 ------------------- --- ModelImpl.cxx 2008-04-15 13:11:22+0000 1.25.6.2 +++ ModelImpl.cxx 2008-05-07 08:27:27+0000 1.25.6.3 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ModelImpl.cxx,v $ - * $Revision: 1.25.6.2 $ + * $Revision: 1.25.6.3 $ * * This file is part of OpenOffice.org. * @@ -704,7 +704,7 @@ if ( !m_xDocumentStorage.is() ) { Reference< XSingleServiceFactory> xStorageFactory = createStorageFactory(); - if ( xStorageFactory.is() && m_sDocumentURL.getLength() ) + if ( xStorageFactory.is() ) { Any aSource; ::comphelper::NamedValueCollection aArgs( m_aArgs ); @@ -712,8 +712,9 @@ aSource = aArgs.get( "Stream" ); if ( !aSource.hasValue() ) aSource = aArgs.get( "InputStream" ); - if ( !aSource.hasValue() && m_sDocumentURL.getLength() ) - aSource <<= m_sDocumentURL; + if ( !aSource.hasValue() && m_sDocFileLocation.getLength() ) + aSource <<= m_sDocFileLocation; + // TODO: shouldn't we also check URL? OSL_ENSURE( aSource.hasValue(), "ODatabaseModelImpl::getOrCreateRootStorage: no source to create the storage from!" ); @@ -1219,7 +1220,7 @@ } // remember both - m_sDocFileLocation = _rDocumentLocation; + m_sDocFileLocation = _rDocumentLocation.getLength() ? _rDocumentLocation : _rDocumentURL; m_sDocumentURL = _rDocumentURL; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
