Tag: cws_dev300_dba30d
User: fs      
Date: 2008-05-22 11:27:19+0000
Modified:
   dba/dbaccess/source/core/dataaccess/ModelImpl.hxx

Log:
 slight refactoring during #i88576#

File Changes:

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

File [changed]: ModelImpl.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/ModelImpl.hxx?r1=1.22&r2=1.22.10.1
Delta lines:  +10 -9
--------------------
--- ModelImpl.hxx       2008-05-05 15:49:46+0000        1.22
+++ ModelImpl.hxx       2008-05-22 11:27:16+0000        1.22.10.1
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ModelImpl.hxx,v $
- * $Revision: 1.22 $
+ * $Revision: 1.22.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -65,6 +65,7 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
+#include <com/sun/star/sdb/XDocumentDataSource.hpp>
 /** === end UNO includes === **/
 
 #include <comphelper/broadcasthelper.hxx>
@@ -166,6 +167,7 @@
 
     SharedStorage                                                              
 m_xDocumentStorage;
     ::rtl::Reference< ::sfx2::DocumentStorageModifyListener >                  
 m_pStorageModifyListener;
+       ODatabaseContext*                                                       
                                        m_pDBContext;
 
     /// the URL the document was loaded from
        ::rtl::OUString                                                         
                m_sDocFileLocation;
@@ -216,7 +218,6 @@
        ::com::sun::star::uno::Sequence< ::rtl::OUString >      
m_aTableTypeFilter;
        ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue 
>
                                                                                
                                m_aArgs;
-       ODatabaseContext*                                                       
                m_pDBContext;
        OSharedConnectionManager*                                               
        m_pSharedConnectionManager;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >
                                                         
m_xSharedConnectionManager;
@@ -246,15 +247,15 @@
             SAL_THROW(( ::com::sun::star::io::IOException, 
::com::sun::star::uno::RuntimeException ));
 
        ODatabaseModelImpl(
-               const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxFactory
-        , const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XModel>& _xModel = ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XModel>()
+               const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,
+               ODatabaseContext& _pDBContext
                );
        virtual ~ODatabaseModelImpl();
 
        ODatabaseModelImpl(
-               const ::rtl::OUString& _rRegistrationName
-               ,const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxFactory
-               ,ODatabaseContext* _pDBContext = NULL
+               const ::rtl::OUString& _rRegistrationName,
+               const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& _rxFactory,
+               ODatabaseContext& _rDBContext
                );
 
        // XEventListener




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

Reply via email to