Tag: mws_cov680 User: rt Date: 05/09/12 09:02:27 Modified: /dba/dbaccess/source/core/dataaccess/ ModelImpl.cxx
Log: INTEGRATION: CWS c03v3 (1.6.48); FILE MERGED 2005/09/07 13:04:19 rt 1.6.48.1: Join CWS c03v2 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.6&r2=1.6.52.1 Delta lines: +16 -4 -------------------- --- ModelImpl.cxx 8 Jul 2005 10:35:03 -0000 1.6 +++ ModelImpl.cxx 12 Sep 2005 16:02:23 -0000 1.6.52.1 @@ -735,14 +735,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]
