INTEGRATION: CWS oj14 (1.15.4); FILE MERGED

2006/11/07 09:27:53 oj 1.15.4.5: RESYNC: (1.17-1.18); FILE MERGED
2006/07/04 08:06:26 oj 1.15.4.4: RESYNC: (1.15-1.17); FILE MERGED
2006/04/25 13:03:07 oj 1.15.4.3: new include
2006/03/20 07:48:38 oj 1.15.4.2: use of module client helper
2006/01/03 07:49:14 oj 1.15.4.1: changed module client

dbaccess/source/ui/inc/TokenWriter.hxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: TokenWriter.hxx,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: obo $ $Date: 2006-10-12 13:38:31 $
+ *  last change: $Author: rt $ $Date: 2007-07-06 08:25:44 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,6 +38,9 @@
 #ifndef DBAUI_DATABASEEXPORT_HXX
 #include "DExport.hxx"
 #endif
+#ifndef _DBAUI_MODULE_DBU_HXX_
+#include "moduledbu.hxx"
+#endif
 #ifndef _STREAM_HXX //autogen
 #include <tools/stream.hxx>
 #endif
@@ -74,9 +77,6 @@
 #ifndef _SVX_DATACCESSDESCRIPTOR_HXX_
 #include <svx/dataaccessdescriptor.hxx>
 #endif
-#ifndef _DBAUI_MODULE_DBU_HXX_
-#include "moduledbu.hxx"
-#endif
 #ifndef _DBAUI_COMMON_TYPES_HXX_
 #include "commontypes.hxx"
 #endif
@@ -238,9 +238,9 @@ namespace dbaui
     // normal RowSet Im- und Export
     // =========================================================================
 
-    class ORowSetImportExport : public ODatabaseImportExport,
-                                public OModuleClient
+    class ORowSetImportExport : public ODatabaseImportExport
     {
+        OModuleClient       m_aModuleClient;
         ::std::vector<sal_Int32>    m_aColumnMapping;
         ::std::vector<sal_Int32>    m_aColumnTypes;
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >    m_xTargetResultSetUpdate;   //
@@ -265,9 +265,7 @@ namespace dbaui
         ORowSetImportExport(const SharedConnection& _rxConnection,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM)
                         : ODatabaseImportExport(_rxConnection,NULL,_rM)
-        {
-        }
-
+        {}
 
         virtual BOOL Write();
         virtual BOOL Read();