User: rt Date: 05/10/19 05:13:33 Modified: /dba/dbaccess/source/core/dataaccess/ ModelImpl.cxx
Log: INTEGRATION: CWS cov2src (1.7.26); FILE MERGED 2005/10/18 08:28:45 rt 1.7.26.1: #126234# Join MWS COV680 m4 into SRC680 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.7&r2=1.8 Delta lines: +16 -4 -------------------- --- ModelImpl.cxx 8 Sep 2005 10:14:25 -0000 1.7 +++ ModelImpl.cxx 19 Oct 2005 12:13:31 -0000 1.8 @@ -709,14 +709,26 @@ m_pStorageAccess->suspendCommitPropagation(); sal_Bool bStore = sal_False; + try + { TStorages::iterator aFind = m_aStorages.find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("database"))); if ( aFind != m_aStorages.end() ) - bStore = commitStorageIfWriteable_ignoreErrors( aFind->second ); + { + Reference<XTransactedObject> xTrans(aFind->second,UNO_QUERY); + if ( bStore = xTrans.is() ) + xTrans->commit(); + } + } + catch(Exception&) + { + OSL_ENSURE(0,"Exception Caught: Could not store embedded database!"); + } if ( _bPreventRootCommits && m_pStorageAccess ) m_pStorageAccess->resumeCommitPropagation(); return bStore; + } // ----------------------------------------------------------------------------- bool ODatabaseModelImpl::commitStorageIfWriteable( const Reference< XStorage >& _rxStorage ) SAL_THROW(( IOException, WrappedTargetException, RuntimeException )) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
