MWS_SRX644: migrate branch mws_srx644 -> HEAD

12 files changed, 62 insertions, 141 deletions

diff --git a/connectivity/source/simpledbt/charset_s.cxx b/connectivity/source/simpledbt/charset_s.cxx
index 40fa8aec63dd..cafd4f626665 100644
--- a/connectivity/source/simpledbt/charset_s.cxx
+++ b/connectivity/source/simpledbt/charset_s.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: charset_s.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-13 14:55:29 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 16:38:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -105,10 +105,3 @@ namespace connectivity
 }   // namespace connectivity
 //........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 13.08.01 16:42:39  fs
- ************************************************************************/
-
diff --git a/connectivity/source/simpledbt/charset_s.hxx b/connectivity/source/simpledbt/charset_s.hxx
index b5e0dab8da25..13c115c4114f 100644
--- a/connectivity/source/simpledbt/charset_s.hxx
+++ b/connectivity/source/simpledbt/charset_s.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: charset_s.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-08-13 14:55:36 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 16:38:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,10 +106,3 @@ namespace connectivity
 
 #endif // CONNECTIVITY_DBTOOLS_CHARSET_S_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 13.08.01 16:40:10  fs
- ************************************************************************/
-
diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx
index 09dcd2863bd2..a10d8633afc9 100644
--- a/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/connectivity/source/simpledbt/dbtfactory.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbtfactory.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-27 11:14:15 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 16:38:48 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -143,16 +143,4 @@ namespace connectivity
 }   // namespace connectivity
 //........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2001/08/13 14:54:24  fs
- *  #90761# +createCharsetHelper
- *
- *  Revision 1.1  2001/07/25 13:28:12  fs
- *  initial checkin - main factory for load-on-demand usage of DBTOOLS
- *
- *
- *  Revision 1.0 24.07.01 16:32:42  fs
- ************************************************************************/
 
diff --git a/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx
index 21d56e64784c..8347450a04cd 100644
--- a/connectivity/source/simpledbt/dbtfactory.hxx
+++ b/connectivity/source/simpledbt/dbtfactory.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dbtfactory.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-27 11:14:16 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 16:38:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,16 +111,3 @@ namespace connectivity
 
 #endif // CONNECTIVITY_DBTOOLS_DBTFACTORY_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2001/08/13 14:54:24  fs
- *  #90761# +createCharsetHelper
- *
- *  Revision 1.1  2001/07/25 13:28:19  fs
- *  initial checkin - main factory for load-on-demand usage of DBTOOLS
- *
- *
- *  Revision 1.0 24.07.01 16:32:42  fs
- ************************************************************************/
-
diff --git a/connectivity/source/simpledbt/parsenode_s.cxx b/connectivity/source/simpledbt/parsenode_s.cxx
index a51d3f839d39..a1caeb9ae8ec 100644
--- a/connectivity/source/simpledbt/parsenode_s.cxx
+++ b/connectivity/source/simpledbt/parsenode_s.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: parsenode_s.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-27 11:14:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 16:38:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -128,13 +128,4 @@ namespace connectivity
 }   // namespace connectivity
 //........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2001/07/25 13:29:09  fs
- *  initial checkin - main factory for load-on-demand usage of OSQLParseNode
- *
- *
- *  Revision 1.0 24.07.01 16:32:42  fs
- ************************************************************************/
 
diff --git a/connectivity/source/simpledbt/parsenode_s.hxx b/connectivity/source/simpledbt/parsenode_s.hxx
index 938ca190b963..bf7ed2f4b9e2 100644
--- a/connectivity/source/simpledbt/parsenode_s.hxx
+++ b/connectivity/source/simpledbt/parsenode_s.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: parsenode_s.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-27 11:14:20 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 16:38:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,13 +116,4 @@ namespace connectivity
 
 #endif // CONNECTIVITY_PARSENODE_SIMPLE_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2001/07/25 13:29:15  fs
- *  initial checkin - main factory for load-on-demand usage of OSQLParseNode
- *
- *
- *  Revision 1.0 24.07.01 16:32:42  fs
- ************************************************************************/
 
diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx
index 3f793a198f42..ab041bb199dd 100644
--- a/connectivity/source/simpledbt/parser_s.cxx
+++ b/connectivity/source/simpledbt/parser_s.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: parser_s.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-27 11:14:18 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 16:38:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,16 +121,4 @@ namespace connectivity
 }   // namespace connectivity
 //........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2001/08/06 07:34:54  fs
- *  #90560# no OSimpleParseNode if we do not have a OSQLParseNode
- *
- *  Revision 1.1  2001/07/25 13:28:40  fs
- *  initial checkin - main factory for load-on-demand usage of OSQLParser
- *
- *
- *  Revision 1.0 24.07.01 16:32:42  fs
- ************************************************************************/
 
diff --git a/connectivity/source/simpledbt/parser_s.hxx b/connectivity/source/simpledbt/parser_s.hxx
index 2110884fd0c5..96083c5b53a9 100644
--- a/connectivity/source/simpledbt/parser_s.hxx
+++ b/connectivity/source/simpledbt/parser_s.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: parser_s.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: oj $ $Date: 2002-09-27 11:14:17 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 16:38:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,13 +111,4 @@ namespace connectivity
 
 #endif // CONNECTIVITY_DBTOOLS_PARSER_SIMPLE_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.1  2001/07/25 13:28:46  fs
- *  initial checkin - main factory for load-on-demand usage of OSQLParser
- *
- *
- *  Revision 1.0 24.07.01 16:32:42  fs
- ************************************************************************/
 
diff --git a/connectivity/source/simpledbt/refbase.cxx b/connectivity/source/simpledbt/refbase.cxx
index 2a67286879d0..4202e7295362 100644
--- a/connectivity/source/simpledbt/refbase.cxx
+++ b/connectivity/source/simpledbt/refbase.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: refbase.cxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-07-25 13:29:37 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 16:38:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,10 +96,3 @@ namespace connectivity
 }   // namespace connectivity
 //........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 24.07.01 16:32:42  fs
- ************************************************************************/
-
diff --git a/connectivity/source/simpledbt/refbase.hxx b/connectivity/source/simpledbt/refbase.hxx
index 2d4395654b79..769142514148 100644
--- a/connectivity/source/simpledbt/refbase.hxx
+++ b/connectivity/source/simpledbt/refbase.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: refbase.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: fs $ $Date: 2001-07-25 13:29:43 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 16:38:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,10 +94,4 @@ namespace connectivity
 
 #endif // CONNECTIVITY_DBTOOLS_REFBASE_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *
- *  Revision 1.0 24.07.01 16:32:42  fs
- ************************************************************************/
 
diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx
index c3df4bf8d7c4..b470f89aedf4 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: staticdbtools_s.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-07 12:48:49 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 16:38:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,6 +86,7 @@ namespace connectivity
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::sdbc;
     using namespace ::com::sun::star::beans;
+    using namespace ::com::sun::star::container;
 
     //================================================================
     //= ODataAccessStaticTools
@@ -224,20 +225,25 @@ namespace connectivity
         return ::dbtools::canDelete( _rxCursorSet );
     }
 
+    //----------------------------------------------------------------
+    Reference< XNameAccess > ODataAccessStaticTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection,
+        const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand,
+            Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
+    {
+        return ::dbtools::getFieldsByCommandDescriptor( _rxConnection, _nCommandType, _rCommand,
+            _rxKeepFieldsAlive, _pErrorInfo );
+    }
+
+    //----------------------------------------------------------------
+    Sequence< ::rtl::OUString > ODataAccessStaticTools::getFieldNamesByCommandDescriptor(
+        const Reference< XConnection >& _rxConnection, const sal_Int32 _nCommandType,
+        const ::rtl::OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
+    {
+        return ::dbtools::getFieldNamesByCommandDescriptor( _rxConnection, _nCommandType,
+            _rCommand, _pErrorInfo );
+    }
+
 //........................................................................
 }   // namespace connectivity
 //........................................................................
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2001/08/06 14:50:00  fs
- *  #87690# +connectRowset / some other methods needed later on (to make writer link-time independent og dbtools)
- *
- *  Revision 1.1  2001/07/25 13:30:10  fs
- *  initial checkin - class for load-on-demand usage of the statis DBTOOLS helper functions
- *
- *
- *  Revision 1.0 24.07.01 16:32:42  fs
- ************************************************************************/
-
diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx
index 2d25ebc56540..31c349efaa3b 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.hxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: staticdbtools_s.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: oj $ $Date: 2002-10-07 12:48:49 $
+ *  last change: $Author: hr $ $Date: 2003-03-19 16:38:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -202,6 +202,25 @@ namespace connectivity
         */
         virtual sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const;
 
+        // ------------------------------------------------
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
+            getFieldsByCommandDescriptor(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+                const sal_Int32 _nCommandType,
+                const ::rtl::OUString& _rCommand,
+                ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive,
+                ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
+            )   SAL_THROW( ( ) );
+
+        // ------------------------------------------------
+        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
+            getFieldNamesByCommandDescriptor(
+                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
+                const sal_Int32 _nCommandType,
+                const ::rtl::OUString& _rCommand,
+                ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
+            )   SAL_THROW( ( ) );
+
         // disambiguate IReference
         // ------------------------------------------------
         virtual oslInterlockedCount SAL_CALL acquire();
@@ -214,16 +233,3 @@ namespace connectivity
 
 #endif // CONNECTIVITY_STATIC_DBTOOLS_SIMPLE_HXX
 
-/*************************************************************************
- * history:
- *  $Log: not supported by cvs2svn $
- *  Revision 1.2  2001/08/06 14:50:00  fs
- *  #87690# +connectRowset / some other methods needed later on (to make writer link-time independent og dbtools)
- *
- *  Revision 1.1  2001/07/25 13:30:17  fs
- *  initial checkin - class for load-on-demand usage of the statis DBTOOLS helper functions
- *
- *
- *  Revision 1.0 24.07.01 16:32:42  fs
- ************************************************************************/
-