dba33f: #i20615# new feature to allow server side column descrriptions to be visible and changeable in the table designer.

4 files changed, 24 insertions, 21 deletions

diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx
index 86da92997ab6..20e05a1cb453 100644
--- a/connectivity/inc/connectivity/PColumn.hxx
+++ b/connectivity/inc/connectivity/PColumn.hxx
@@ -67,6 +67,7 @@ namespace connectivity
             OParseColumn(const ::rtl::OUString& _Name,
                     const ::rtl::OUString& _TypeName,
                     const ::rtl::OUString& _DefaultValue,
+                    const ::rtl::OUString& _Description,
                     sal_Int32       _IsNullable,
                     sal_Int32       _Precision,
                     sal_Int32       _Scale,
@@ -128,17 +129,6 @@ namespace connectivity
             virtual ~OOrderColumn();
         public:
             OOrderColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,sal_Bool _bCase,sal_Bool _bAscending);
-            OOrderColumn(const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _TypeName,
-                    const ::rtl::OUString& _DefaultValue,
-                    sal_Int32       _IsNullable,
-                    sal_Int32       _Precision,
-                    sal_Int32       _Scale,
-                    sal_Int32       _Type,
-                    sal_Bool        _IsAutoIncrement,
-                    sal_Bool        _IsCurrency,
-                    sal_Bool        _bCase
-                    ,sal_Bool _bAscending);
 
             virtual void construct();
 
diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx
index f9384333930d..40fec446d098 100644
--- a/connectivity/inc/connectivity/TTableHelper.hxx
+++ b/connectivity/inc/connectivity/TTableHelper.hxx
@@ -48,6 +48,7 @@ namespace connectivity
     {
         ::rtl::OUString sName;
         ::rtl::OUString aField6;
+        ::rtl::OUString sField12; // REMARKS
         ::rtl::OUString sField13;
         sal_Int32       nField5
                     ,   nField7
@@ -63,10 +64,12 @@ namespace connectivity
             , sal_Int32     _nField7
             , sal_Int32     _nField9
             , sal_Int32     _nField11
+            , const ::rtl::OUString& _sField12
             , const ::rtl::OUString& _sField13
             ,OrdinalPosition _nPosition )
             :sName( _rName )
             ,aField6(_aField6)
+            ,sField12(_sField12)
             ,sField13(_sField13)
             ,nField5(_nField5)
             ,nField7(_nField7)
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx
index 29bb9d0641d8..3f09571287b5 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
@@ -90,6 +90,7 @@ namespace rtl
 //.........................................................................
 namespace dbtools
 {
+    class ISQLStatementHelper;
     typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection > SharedConnection;
 
     enum EComposeRule
@@ -664,6 +665,7 @@ namespace dbtools
     OOO_DLLPUBLIC_DBTOOLS
     ::rtl::OUString createStandardCreateStatement(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
+                                                    ISQLStatementHelper* _pHelper,
                                                     const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
 
     /** creates the standard sql statement for the key part of a create table statement.
@@ -677,32 +679,39 @@ namespace dbtools
                                                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection);
 
     /** creates the standard sql statement for the column part of a create table statement.
+        @param  _pHelper
+            Allow to add special SQL constructs.
         @param  descriptor
             The descriptor of the column.
         @param  _xConnection
             The connection.
-        @param  _bAddScale
-            The scale will also be added when the value is 0.
+        @param  _pHelper
+            Allow to add special SQL constructs.
     */
     OOO_DLLPUBLIC_DBTOOLS
-    ::rtl::OUString createStandardColumnPart(   const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,
-                                                const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
-                                                const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
+    ::rtl::OUString createStandardColumnPart(   const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor
+                                                ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection
+                                                ,ISQLStatementHelper* _pHelper = NULL
+                                                ,const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
 
     /** creates a SQL CREATE TABLE statement
+
         @param  descriptor
             The descriptor of the new table.
         @param  _xConnection
             The connection.
-        @param  _bAddScale
-            The scale will also be added when the value is 0.
+        @param  _pHelper
+            Allow to add special SQL constructs.
+        @param  _sCreatePattern
+
         @return
             The CREATE TABLE statement.
     */
     OOO_DLLPUBLIC_DBTOOLS
-    ::rtl::OUString createSqlCreateTableStatement(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,
-                                                    const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
-                                                    const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
+    ::rtl::OUString createSqlCreateTableStatement(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor
+                                                    ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection
+                                                    ,ISQLStatementHelper* _pHelper = NULL
+                                                    ,const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
 
     /** creates a SDBC column with the help of getColumns.
         @param  _xTable
diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
index 73be9e968c70..197ac09cb338 100644
--- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
@@ -87,6 +87,7 @@ namespace connectivity
             OColumn(    const ::rtl::OUString& _Name,
                                 const ::rtl::OUString& _TypeName,
                                 const ::rtl::OUString& _DefaultValue,
+                                const ::rtl::OUString& _Description,
                                 sal_Int32       _IsNullable,
                                 sal_Int32       _Precision,
                                 sal_Int32       _Scale,