Tag: cws_src680_dba30 User: fs Date: 05/11/23 02:14:43 Modified: /dba/dbaccess/source/core/dataaccess/ ModelImpl.cxx
Log: RESYNC: (1.7-1.9); FILE MERGED 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.3.2.4&r2=1.3.2.5 Delta lines: +34 -5 -------------------- --- ModelImpl.cxx 30 Sep 2005 06:09:52 -0000 1.3.2.4 +++ ModelImpl.cxx 23 Nov 2005 10:14:40 -0000 1.3.2.5 @@ -343,6 +343,16 @@ ODatabaseModelImpl* pImpl = m_pModelImplementation; if ( pImpl ) pImpl->disposing( Source ); + + for ( NamedStorages::iterator find = m_aExposedStorages.begin(); + find != m_aExposedStorages.end(); + ++find + ) + if ( find->second == Source.Source ) + { + m_aExposedStorages.erase( find ); + break; + } } //============================================================ @@ -577,6 +587,13 @@ { } m_xStorage = NULL; + + if ( m_pStorageAccess ) + { + m_pStorageAccess->dispose(); + m_pStorageAccess->release(); + m_pStorageAccess = NULL; + } } // ----------------------------------------------------------------------------- const Reference< XNumberFormatsSupplier > & ODatabaseModelImpl::getNumberFormatsSupplier() @@ -755,14 +772,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]
