Tag: cws_src680_dba20blocker User: fs Date: 05/06/23 04:03:54 Modified: /dba/dbaccess/source/core/dataaccess/ databasedocument.cxx
Log: copying fix for #i49860# into this CWS 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.19&r2=1.19.32.1 Delta lines: +5 -12 -------------------- --- databasedocument.cxx 13 May 2005 15:43:10 -0000 1.19 +++ databasedocument.cxx 23 Jun 2005 11:03:52 -0000 1.19.32.1 @@ -2,9 +2,9 @@ * * $RCSfile: databasedocument.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.19.32.1 $ * - * last change: $Author: rt $ $Date: 2005/05/13 15:43:10 $ + * last change: $Author: fs $ $Date: 2005/06/23 11:03:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -528,7 +528,9 @@ if ( m_pImpl->m_bDocumentReadOnly ) throw IOException(); + m_bCommitMasterStorage = sal_False; m_pImpl->commitStorages(); + m_bCommitMasterStorage = sal_True; writeStorage(_rURL,_rArguments,m_pImpl->getStorage()); @@ -642,15 +644,6 @@ aError.Context = *this; throw IOException( aError ); } - - // storeTo - i.e. copying a copy of our document to another location - requires - // the embedded DB to shut down. To ensure this, we need to dispose all connections - // which are currently open. - // TODO: wouldn't an explicit XEmbeddedDatabase::shutdown be much better than this implicit, - // error-prone handling? - // #i45314# / 2005-03-23 / [EMAIL PROTECTED] - if ( m_pImpl->isEmbeddedDatabase() ) - m_pImpl->clearConnections(); m_bCommitMasterStorage = sal_False; m_pImpl->commitEmbeddedStorage(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
