#87728# drag&drop of table row and tableinformation repaired

3 files changed, 72 insertions, 18 deletions

diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index dc93252cdc1a..faffd18c4790 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TokenWriter.hxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2001-07-05 12:46:54 $
+ *  last change: $Author: oj $ $Date: 2001-10-02 07:55:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,6 +91,12 @@
 #ifndef _COM_SUN_STAR_SDB_COMMANDTYPE_HPP_
 #include <com/sun/star/sdb/CommandType.hpp>
 #endif
+#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_
+#include <svx/dataaccessdescriptor.hxx>
+#endif
+#ifndef _DBAUI_MODULE_DBU_HXX_
+#include "moduledbu.hxx"
+#endif
 
 namespace dbaui
 {
@@ -102,8 +108,9 @@ namespace dbaui
     {
         void disposing();
     protected:
-        SvStream*                               m_pStream;
-        ::com::sun::star::awt::FontDescriptor   m_aFont;
+        ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>                    m_aSelection;
+        SvStream*                                                                       m_pStream;
+        ::com::sun::star::awt::FontDescriptor                                           m_aFont;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >       m_xObject;      // table/query
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >         m_xConnection;  //
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >          m_xResultSet;   //
@@ -126,7 +133,7 @@ namespace dbaui
         sal_Int32*          m_pRowMarker; // wenn gesetzt, dann nur diese Rows kopieren
 
         // export data
-        ODatabaseImportExport(  const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aSeq,
+        ODatabaseImportExport(  const ::svx::ODataAccessDescriptor& _aDataDescriptor,
                                 const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM,
                                 const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF,
                                 const String& rExchange = String());
@@ -143,7 +150,7 @@ namespace dbaui
         virtual BOOL Write()    = 0; // Export
         virtual BOOL Read()     = 0; // Import
 
-        void initialize();
+        virtual void initialize();
         virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
     };
 
@@ -156,11 +163,11 @@ namespace dbaui
 
     public:
         // export data
-        ORTFImportExport(   const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aSeq,
+        ORTFImportExport(   const ::svx::ODataAccessDescriptor& _aDataDescriptor,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF,
                             const String& rExchange = String())
-                            : ODatabaseImportExport(_aSeq,_rM,_rxNumberF,rExchange) {};
+                            : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,rExchange) {};
 
         // import data
         ORTFImportExport(   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
@@ -202,7 +209,7 @@ namespace dbaui
 
     public:
         // export data
-        OHTMLImportExport(  const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aSeq,
+        OHTMLImportExport(  const ::svx::ODataAccessDescriptor& _aDataDescriptor,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF,
                             const String& rExchange = String());
@@ -217,6 +224,41 @@ namespace dbaui
         virtual BOOL Read();
 
     };
+    // =========================================================================
+    // normal RowSet Im- und Export
+    // =========================================================================
+
+    class ORowSetImportExport : public ODatabaseImportExport,
+                                public OModuleClient
+    {
+        ::std::vector<sal_Int32>    m_aColumnMapping;
+        ::std::vector<sal_Int32>    m_aColumnTypes;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >    m_xTargetResultSetUpdate;   //
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate >          m_xTargetRowUpdate;         //
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData >  m_xTargetResultSetMetaData; //
+        Window*                     m_pParent;
+        sal_Bool                    m_bAlreadyAsked;
+
+        sal_Bool insertNewRow();
+    public:
+        // export data
+        ORowSetImportExport(Window* _pParent,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate >& _xResultSetUpdate,
+                            const ::svx::ODataAccessDescriptor& _aDataDescriptor,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM,
+                            const String& rExchange = String());
+
+        // import data
+        ORowSetImportExport(    const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+                            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM,
+                            const String& rExchange = String())
+                        : ODatabaseImportExport(_rxConnection,NULL,_rM)
+        {}
+
+        virtual void initialize();
+        virtual BOOL Write();
+        virtual BOOL Read();
+    };
 
 }
 #endif // DBAUI_TOKENWRITER_HXX
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index fd45aa79e2ba..fa49da170b25 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbu_resource.hrc,v $
  *
- *  $Revision: 1.62 $
+ *  $Revision: 1.63 $
  *
- *  last change: $Author: oj $ $Date: 2001-09-25 13:24:37 $
+ *  last change: $Author: oj $ $Date: 2001-10-02 07:55:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -452,6 +452,9 @@
 #define STR_HINT_READONLY_CONNECTION        RID_STRING_START + 189
 #define STR_HINT_CONNECTION_NOT_CAPABLE     RID_STRING_START + 190
 #define STR_OBJECT_ALREADY_EXISTS           RID_STRING_START + 191
+#define STR_NO_COLUMNNAME_MATCHING          RID_STRING_START + 192
+#define STR_ERROR_OCCURED_WHILE_COPYING     RID_STRING_START + 193
+
 
 //========================================================================
 // untyped resources
@@ -466,6 +469,9 @@
 /*************************************************************************
  * history:
  *  $Log: not supported by cvs2svn $
+ *  Revision 1.62  2001/09/25 13:24:37  oj
+ *  #91719# implementing the XRename handling
+ *
  *  Revision 1.61  2001/08/28 08:19:41  fs
  *  #91573# STR_HINT_READONLY_CONNECTION / STR_HINT_CONNECTION_NOT_CAPABL
  *
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 7cf0684b5b9e..bd0f8f6163f9 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: sbagrid.hxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: hr $ $Date: 2001-09-13 14:14:47 $
+ *  last change: $Author: oj $ $Date: 2001-10-02 07:55:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,6 +90,9 @@
 #ifndef _SBA_MULTIPLEX_HXX
 #include "sbamultiplex.hxx"
 #endif
+#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_
+#include <svx/dataaccessdescriptor.hxx>
+#endif
 
 class SvNumberFormatter;
 
@@ -120,7 +123,6 @@ namespace dbaui
     {
         DECLARE_STL_MAP(::com::sun::star::util::URL, SbaXStatusMultiplexer*, SbaURLCompare,StatusMultiplexerArray);
         StatusMultiplexerArray      m_aStatusMultiplexer;
-        //  ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_MultiServiceFacatory;
 
     public:
         SbaXGridControl(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
@@ -266,13 +268,15 @@ namespace dbaui
 
     // Attributes
     protected:
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer >        m_xComposer;    // for DnD we need a composed query ...
+        ::svx::ODataAccessDescriptor                                                    m_aDataDescriptor;
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer >    m_xComposer;    // for DnD we need a composed query ...
         long        m_nCurrentSelectedColumn;   // this is the column model (not the view) posisition ...
         SbaGridListener*    m_pMasterListener;
-        sal_uInt16  m_nLastColId;
-        sal_uInt16  m_nLastRowId;
+        sal_Int32           m_nAsyncDropEvent;
+        sal_uInt16          m_nLastColId;
+        sal_uInt16          m_nLastRowId;
 
-        sal_uInt16  m_nCurrentActionColId;
+        sal_uInt16          m_nCurrentActionColId;
             // ui actions (e.g. a context menu) may be performed on columns which aren't the current one
             // and aren't selected, so we have to track this column id
 
@@ -348,6 +352,8 @@ namespace dbaui
 
         SvNumberFormatter* GetDatasourceFormatter();
 
+        DECL_LINK(AsynchDropEvent, void*);
+
     private:
         sal_Bool    IsReadOnlyDB() const;
     };