CWS-TOOLING: integrate CWS dba31b

3 files changed, 12 insertions, 5 deletions

diff --git a/connectivity/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx
index fa07c98ab2ba..fa4bb0a19897 100644
--- a/connectivity/source/inc/dbase/DCode.hxx
+++ b/connectivity/source/inc/dbase/DCode.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DCode.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -37,12 +37,16 @@
 
 namespace connectivity
 {
+    namespace file
+    {
+        class OConnection;
+    }
     namespace dbase
     {
         class OFILEAnalyzer : public file::OSQLAnalyzer
         {
         public:
-            OFILEAnalyzer() : file::OSQLAnalyzer(){}
+            OFILEAnalyzer(file::OConnection* _pConnection) : file::OSQLAnalyzer(_pConnection){}
             virtual file::OOperandAttr* createOperandAttr(sal_Int32 _nPos,
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol,
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xIndexes=NULL);
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
index 606595aed7ec..da6007df56ac 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DDatabaseMetaData.hxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.10.56.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -57,6 +57,9 @@ namespace connectivity
 
             virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+
+            virtual sal_Bool        impl_storesMixedCaseQuotedIdentifiers_throw(  );
+            virtual sal_Bool        impl_supportsMixedCaseQuotedIdentifiers_throw(  );
         protected:
             virtual ~ODbaseDatabaseMetaData();
         public:
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index 3c1ccfaa6516..80aa1a10fdf5 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: DTable.hxx,v $
- * $Revision: 1.41 $
+ * $Revision: 1.41.30.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -122,7 +122,7 @@ namespace connectivity
 
             void throwInvalidDbaseFormat();
             void SAL_CALL renameImpl( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
-            void throwInvalidColumnType(const ::rtl::OUString& _sError,const ::rtl::OUString& _sColumnName);
+            void throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl::OUString& _sColumnName);
 
         protected:
             virtual void FileClose();