Tag: cws_dev300_odbmacros3
User: fs      
Date: 2008-07-23 11:44:09+0000
Modified:
   dba/dbaccess/source/core/dataaccess/datasource.cxx

Log:
 #i76128# getDatabaseDocument is allowed to be called without initialization of 
the DBDoc

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.79.4.1&r2=1.79.4.2
Delta lines:  +3 -3
-------------------
--- datasource.cxx      2008-07-23 10:04:46+0000        1.79.4.1
+++ datasource.cxx      2008-07-23 11:44:07+0000        1.79.4.2
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: datasource.cxx,v $
- * $Revision: 1.79.4.1 $
+ * $Revision: 1.79.4.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1487,11 +1487,11 @@
 // XDocumentDataSource
 Reference< XOfficeDatabaseDocument > SAL_CALL 
ODatabaseSource::getDatabaseDocument() throw (RuntimeException)
 {
-    ModelMethodGuard aGuard( *this, ModelMethodGuard::MethodUsedDuringInit );
+    ModelMethodGuard aGuard( *this, ModelMethodGuard::MethodWithoutInit );
 
     Reference< XModel > xModel( m_pImpl->getModel_noCreate() );
     if ( !xModel.is() )
-        xModel = m_pImpl->createNewModel_deliverOwnership( true );
+        xModel = m_pImpl->createNewModel_deliverOwnership( false );
 
     return Reference< XOfficeDatabaseDocument >( xModel, UNO_QUERY_THROW );
 }




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

Reply via email to