Tag: cws_dev300_odbmacros3 User: fs Date: 2008-04-21 10:40:26+0000 Modified: dba/dbaccess/source/ext/macromigration/migrationengine.cxx
Log: calling order when committing/storing sub document changed File Changes: Directory: /dba/dbaccess/source/ext/macromigration/ =================================================== File [changed]: migrationengine.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/migrationengine.cxx?r1=1.4.2.1&r2=1.4.2.2 Delta lines: +4 -5 ------------------- --- migrationengine.cxx 2008-04-21 10:29:06+0000 1.4.2.1 +++ migrationengine.cxx 2008-04-21 10:40:24+0000 1.4.2.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: migrationengine.cxx,v $ - * $Revision: 1.4.2.1 $ + * $Revision: 1.4.2.2 $ * * This file is part of OpenOffice.org. * @@ -762,10 +762,9 @@ // ----------------- // clean up if ( bSuccess ) - bSuccess = /*lcl_commitDocumentStorage_nothrow( xSubDocument ) - && */lcl_storeEmbeddedDocument_nothrow( _rDocument ) - && ScriptsStorage::removeFromDocument( xSubDocument ) - && lcl_commitDocumentStorage_nothrow( xSubDocument ); + bSuccess = ScriptsStorage::removeFromDocument( xSubDocument ) + && lcl_commitDocumentStorage_nothrow( xSubDocument ) + && lcl_storeEmbeddedDocument_nothrow( _rDocument ); lcl_disposeComponent_nothrow( _rDocument.xCommandProcessor ); pStatusIndicator->dispose(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
