Tag: cws_src680_imprec01
User: as      
Date: 05/02/01 22:20:57

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

Log:
 resolve conflicts after resync

File Changes:

Directory: /dba/dbaccess/source/core/dataaccess/
================================================

File [changed]: databasedocument.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/databasedocument.cxx?r1=1.7.12.3&r2=1.7.12.4
Delta lines:  +24 -3
--------------------
--- databasedocument.cxx        12 Jan 2005 12:56:23 -0000      1.7.12.3
+++ databasedocument.cxx        2 Feb 2005 06:20:54 -0000       1.7.12.4
@@ -1096,6 +1096,27 @@
         m_xDocEventBroadcaster->notifyEvent(aEvent);
     }
 }
+// 
-----------------------------------------------------------------------------
+sal_Bool ODatabaseSource::commitEmbeddedStorage()
+{
+       sal_Bool bStore = sal_False;
+       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 ( bStore = xTrans.is() )
+                               xTrans->commit();
+               }
+       }
+       catch(Exception&)
+       {
+               OSL_ENSURE(0,"Exception Caught: Could not store embedded 
database!");
+       }
+       return bStore;
+}
+
 //........................................................................
 }      // namespace dbaccess
 //........................................................................




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to