dba33f: #i108038# (re-)add Selection support to the Copy Table Wizard

3 files changed, 33 insertions, 71 deletions

diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx
index c0b5e77cc403..6261286b6d06 100644
--- a/dbaccess/source/ui/inc/TableCopyHelper.hxx
+++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx
@@ -194,30 +194,17 @@ namespace dbaui
         );
 
         /** insert a table into the data source. The source can eihter be a table or a query
-            @param  _nCommandType
-                The command type.
-            @param  _xSrcConnection
-                The connection of the source.
-            @param  _aSelection
-                The selection of the rows to copy.
-            @param  _bBookmarkSelection
-                If <TRUE/> the selection is bookmark selection.
-            @param  _sCommand
-                The name of the query or table.
-            @param  _sSrcDataSourceName
-                The name of the source data source.
-            @param  _sDestDataSourceName
-                The name of the dest data source.
         */
         void insertTable(
-            sal_Int32 _nCommandType,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xSrcConnection,
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _aSelection,
-            sal_Bool _bBookmarkSelection,
-            const ::rtl::OUString& _sCommand,
-            const ::rtl::OUString& _sSrcDataSourceName,
-            const ::rtl::OUString& _sDestDataSourceName,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xDestConnection
+            const ::rtl::OUString& i_rSourceDataSource,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& i_rSourceConnection,
+            const ::rtl::OUString& i_rCommand,
+            const sal_Int32 i_nCommandType,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& i_rSourceRows,
+            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& i_rSelection,
+            const sal_Bool i_bBookmarkSelection,
+            const ::rtl::OUString& i_rDestDataSource,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& i_rDestConnection
         );
 
     };
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 27a103e1af8a..90bbb4c37862 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -30,51 +30,25 @@
 #ifndef DBAUI_TOKENWRITER_HXX
 #define DBAUI_TOKENWRITER_HXX
 
-#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
-#ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_
+#include "commontypes.hxx"
+
 #include <com/sun/star/awt/FontDescriptor.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
 #include <com/sun/star/sdbc/XRow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HPP_
 #include <com/sun/star/lang/XEventListener.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_
 #include <com/sun/star/frame/XModel.hpp>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
-#include <cppuhelper/implbase1.hxx>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
 #include <com/sun/star/beans/PropertyValue.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_COMMANDTYPE_HPP_
 #include <com/sun/star/sdb/CommandType.hpp>
-#endif
-#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_
+#include <com/sun/star/sdbcx/XRowLocate.hpp>
+
+#include <cppuhelper/implbase1.hxx>
+#include <tools/stream.hxx>
 #include <svx/dataaccessdescriptor.hxx>
-#endif
-#ifndef _DBAUI_COMMON_TYPES_HXX_
-#include "commontypes.hxx"
-#endif
+
 #include <memory>
 
 namespace com { namespace sun { namespace star {
@@ -98,13 +72,15 @@ namespace dbaui
     protected:
         ::com::sun::star::lang::Locale                                                  m_aLocale;
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>                    m_aSelection;
+        sal_Bool                                                                        m_bBookmarkSelection;
         SvStream*                                                                       m_pStream;
         ::com::sun::star::awt::FontDescriptor                                           m_aFont;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >       m_xObject;      // table/query
-        SharedConnection                                                                m_xConnection;  //
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >          m_xResultSet;   //
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >                m_xRow; //
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData >  m_xResultSetMetaData;   //
+        SharedConnection                                                                m_xConnection;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >          m_xResultSet;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >                m_xRow;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate >         m_xRowLocate;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData >  m_xResultSetMetaData;
         ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >   m_xRowSetColumns;
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >    m_xFormatter;   // a number formatter working with the connection's NumberFormatsSupplier
         ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xFactory;
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx
index 6627e3b2af1d..ea2fc3494221 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.hxx
@@ -56,20 +56,19 @@
 #endif
 #include <vector>
 
+#include <rtl/ref.hxx>
+
 namespace dbaui
 {
 
     class ORTFImportExport;
     class OHTMLImportExport;
-    typedef ::cppu::ImplHelper1< ::com::sun::star::lang::XEventListener > TDataClipboard_BASE;
 
-    class ODataClipboard :      public ::svx::ODataAccessObjectTransferable
-                            ,   public TDataClipboard_BASE
+    class ODataClipboard : public ::svx::ODataAccessObjectTransferable
 
     {
-        ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener> > m_aEventListeners;
-        OHTMLImportExport*      m_pHtml;
-        ORTFImportExport*       m_pRtf;
+        ::rtl::Reference< OHTMLImportExport >   m_pHtml;
+        ::rtl::Reference< ORTFImportExport >    m_pRtf;
 
     public:
         ODataClipboard(
@@ -90,15 +89,15 @@ namespace dbaui
         );
 
         ODataClipboard(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxLivingForm,
-            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rSelectedRows,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _rxResultSet,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB
+            const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& i_rAliveForm,
+            const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& i_rSelectedRows,
+            const sal_Bool i_bBookmarkSelection,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& i_rORB
         );
 
-        DECLARE_XINTERFACE( )
-
+        // XEventListener
         virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
+
     protected:
         virtual void        AddSupportedFormats();
         virtual sal_Bool    GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor );