User: ihi     
Date: 2007-11-21 15:33:21+0000
Modified:
   dba/dbaccess/source/core/api/RowSetCache.hxx

Log:
 INTEGRATION: CWS dba24c (1.32.58); FILE MERGED
 2007/09/18 12:53:53 fs 1.32.58.1: during #i81095#: moved from 
XMultiServiceFactory to ::comphelper::ComponentContext

File Changes:

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

File [changed]: RowSetCache.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/RowSetCache.hxx?r1=1.32&r2=1.33
Delta lines:  +5 -2
-------------------
--- RowSetCache.hxx     2007-05-10 10:11:31+0000        1.32
+++ RowSetCache.hxx     2007-11-21 15:33:19+0000        1.33
@@ -92,6 +92,9 @@
 #ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_
 #include <comphelper/propertycontainer.hxx>
 #endif
+#ifndef COMPHELPER_COMPONENTCONTEXT_HXX
+#include <comphelper/componentcontext.hxx>
+#endif
 #ifndef _CPPUHELPER_IMPLBASE5_HXX_
 #include <cppuhelper/implbase5.hxx>
 #endif
@@ -127,7 +130,7 @@
                //the set can be static, bookmarkable or keyset
                ::com::sun::star::uno::WeakReference< 
::com::sun::star::sdbc::XResultSet>               m_xSet;
                ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XResultSetMetaData >  m_xMetaData; // must be before 
m_aInsertRow
-               ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory> m_xServiceFactory;
+        ::comphelper::ComponentContext                                         
         m_aContext;
 
                ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> 
                                m_xCacheSet;
 
@@ -191,7 +194,7 @@
        public:
                ORowSetCache(const ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XResultSet >&,
                                         const 
::com::sun::star::uno::Reference< 
::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xAnalyzer,
-                                        const 
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory 
>& _xServiceFactory,
+                                        const ::comphelper::ComponentContext& 
_rContext,
                                         const ::rtl::OUString& 
_rUpdateTableName,
                                         sal_Bool&      _bModified,
                                         sal_Bool&      _bNew);




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

Reply via email to