Tag: cws_src680_dba23 User: oj Date: 05/02/03 00:06:58 Modified: /dba/dbaccess/source/core/dataaccess/ datasource.cxx
Log: RESYNC: (1.52-1.53); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: datasource.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/datasource.cxx?r1=1.52.16.1&r2=1.52.16.2 Delta lines: +9 -23 -------------------- --- datasource.cxx 19 Jan 2005 09:10:25 -0000 1.52.16.1 +++ datasource.cxx 3 Feb 2005 08:06:56 -0000 1.52.16.2 @@ -678,12 +678,11 @@ *i = OWeakConnection(); try { - TStorages::iterator aFind = m_aStorages.find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("database"))); - if ( aFind != m_aStorages.end() ) - { - Reference<XTransactedObject> xTrans(aFind->second,UNO_QUERY); + Reference<XTransactedObject> xTrans(xCon,UNO_QUERY); if ( bStore = xTrans.is() ) + { xTrans->commit(); + bStore = commitEmbeddedStorage(); } } catch(Exception&) @@ -818,20 +817,7 @@ m_xCurrentController = NULL; m_xNumberFormatsSupplier = NULL; - try - { - TStorages::iterator aFind = m_aStorages.find(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("database"))); - if ( aFind != m_aStorages.end() ) - { - Reference<XTransactedObject> xTrans(aFind->second,UNO_QUERY); - if ( xTrans.is() ) - xTrans->commit(); - } - } - catch(Exception&) - { - OSL_ENSURE(0,"Exception Caught: Could not store embedded database!"); - } + try { TStorages::iterator aIter = m_aStorages.begin(); @@ -941,7 +927,7 @@ ::rtl::OUString sMessage = DBACORE_RESSTRING( nExceptionMessageId ); SQLContext aContext; - aContext.Details = m_sConnectURL; + aContext.Message = m_sConnectURL; throwGenericSQLException( sMessage, static_cast< XDataSource* >( this ), makeAny( aContext ) ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
