Tag: cws_src680_c03v3
User: rt      
Date: 05/09/07 06:04:23

Modified:
 /dba/dbaccess/source/core/dataaccess/
  ModelImpl.cxx

Log:
 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.48.1
Delta lines:  +19 -7
--------------------
--- ModelImpl.cxx       8 Jul 2005 10:35:03 -0000       1.6
+++ ModelImpl.cxx       7 Sep 2005 13:04:19 -0000       1.6.48.1
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ModelImpl.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.6.48.1 $
  *
- *  last change: $Author: obo $ $Date: 2005/07/08 10:35:03 $
+ *  last change: $Author: rt $ $Date: 2005/09/07 13:04:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -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]

Reply via email to