Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts: avmedia/source/framework/mediacontrol.cxx connectivity/source/commontools/DateConversion.cxx desktop/source/deployment/registry/component/dp_component.cxx editeng/inc/editeng/numitem.hxx editeng/inc/editeng/txtrange.hxx editeng/source/editeng/editobj.cxx editeng/source/editeng/editview.cxx editeng/source/editeng/eehtml.cxx editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit4.cxx editeng/source/misc/txtrange.cxx editeng/source/outliner/outlin2.cxx editeng/source/outliner/outlvw.cxx framework/source/layoutmanager/layoutmanager.cxx linguistic/source/lngsvcmgr.hxx sfx2/source/appl/app.cxx sfx2/source/appl/app.src sfx2/source/appl/appbas.cxx sfx2/source/appl/appcfg.cxx sfx2/source/appl/appdde.cxx sfx2/source/appl/appmain.cxx sfx2/source/appl/appopen.cxx sfx2/source/appl/appquit.cxx sfx2/source/appl/appserv.cxx sfx2/source/appl/childwin.cxx sfx2/source/appl/fileobj.cxx sfx2/source/appl/fileobj.hxx sfx2/source/appl/workwin.cxx sfx2/source/control/dispatch.cxx sfx2/source/control/macro.cxx sfx2/source/control/objface.cxx sfx2/source/control/request.cxx sfx2/source/control/shell.cxx sfx2/source/control/statcach.cxx sfx2/source/dialog/dinfdlg.cxx sfx2/source/dialog/dockwin.cxx sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mailmodelapi.cxx sfx2/source/dialog/mgetempl.cxx sfx2/source/dialog/splitwin.cxx sfx2/source/dialog/styledlg.cxx sfx2/source/dialog/tabdlg.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/dialog/tplcitem.cxx sfx2/source/dialog/tplpitem.cxx sfx2/source/doc/doctempl.cxx sfx2/source/doc/docvor.cxx sfx2/source/doc/new.cxx sfx2/source/doc/objcont.cxx sfx2/source/doc/objserv.cxx sfx2/source/doc/objxtor.cxx sfx2/source/inc/appdata.hxx sfx2/source/inc/helpid.hrc sfx2/source/inc/sfxlocal.hrc sfx2/source/inc/statcach.hxx sfx2/source/inc/templdgi.hxx sfx2/source/inc/virtmenu.hxx sfx2/source/inc/workwin.hxx sfx2/source/menu/mnumgr.cxx sfx2/source/menu/virtmenu.cxx sfx2/source/statbar/stbitem.cxx sfx2/source/view/frame.cxx sfx2/source/view/frame2.cxx sfx2/source/view/orgmgr.cxx sfx2/source/view/printer.cxx sfx2/source/view/prnmon.cxx sfx2/source/view/sfxbasecontroller.cxx sfx2/source/view/viewfrm.cxx sfx2/source/view/viewfrm2.cxx sfx2/source/view/viewprn.cxx sfx2/source/view/viewsh.cxx svx/inc/svx/svditer.hxx svx/source/dialog/sdstring.src svx/source/form/fmpage.cxx svx/source/form/formcontroller.cxx svx/source/svdraw/svdcrtv.cxx svx/source/svdraw/svditer.cxx svx/source/svdraw/svdview.cxx xmloff/source/forms/elementimport.cxx
author: Jan Holesovsky <kendy@suse.cz> 2011-03-18 15:49:47 +0100
committer: Jan Holesovsky <kendy@suse.cz> 2011-03-18 15:49:47 +0100
commit: 091e4aee3386f3bfee081dc8646494e0eb97f88a (patch)
tree: dd79298b4e8729ca7dc874274d4a33ea88fe107d /connectivity/source
parent: f0681adbf092e2b455db52535f2df882bc87343a (diff)
parent: 224bd63b3fa459baa0a6bb5cd03f5dc2ca475d82 (diff)
790 files changed, 1799 insertions, 1693 deletions
diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx
index 99bdeee12131..99bdeee12131 100644..100755
--- a/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/connectivity/source/commontools/AutoRetrievingBase.cxx
diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx
index 48681b61e1f9..48681b61e1f9 100644..100755
--- a/connectivity/source/commontools/BlobHelper.cxx
+++ b/connectivity/source/commontools/BlobHelper.cxx
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index 43c89fb56cfd..43c89fb56cfd 100644..100755
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index dc354c24eb9b..dc354c24eb9b 100644..100755
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index e02dd44c0e53..7170ee48a501 100644..100755
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -44,6 +44,7 @@
 #include "diagnose_ex.h"
 #include <comphelper/numbers.hxx>
 #include <rtl/ustrbuf.hxx>
+#include <tools/diagnose_ex.h>
 
 
 using namespace ::connectivity;
@@ -364,56 +365,59 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
 }
 
 //------------------------------------------------------------------------------
-double DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
-                                  const Date& rNullDate,
-                                  sal_Int16 nKeyType)
+double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const Date& i_relativeToNullDate )
 {
     try
     {
-        switch (nKeyType & ~NumberFormat::DEFINED)
+        const Reference< XPropertySet > xProp( i_column, UNO_QUERY_THROW );
+
+        const sal_Int32 nColumnType = ::comphelper::getINT32( xProp->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_TYPE ) ) );
+        switch ( nColumnType )
         {
-            case NumberFormat::DATE:
-                return toDouble( xVariant->getDate(), rNullDate);
-            case NumberFormat::DATETIME:
-                return toDouble(xVariant->getTimestamp(),rNullDate);
-            case NumberFormat::TIME:
-                return toDouble(xVariant->getTime());
-            default:
+        case DataType::DATE:
+            return toDouble( i_column->getDate(), i_relativeToNullDate );
+
+        case DataType::TIME:
+            return toDouble( i_column->getTime() );
+
+        case DataType::TIMESTAMP:
+            return toDouble( i_column->getTimestamp(), i_relativeToNullDate );
+
+        default:
             {
-                Reference<XPropertySet> xProp(xVariant,UNO_QUERY);
-                if (    xProp.is()
-                    &&  xProp->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED))
-                    && !::comphelper::getBOOL(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSIGNED))) )
+                sal_Bool bIsSigned = sal_True;
+                OSL_VERIFY( xProp->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_ISSIGNED ) ) >>= bIsSigned );
+                if ( !bIsSigned )
                 {
-                    switch (::comphelper::getINT32(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
+                    switch ( nColumnType)
                     {
                         case DataType::TINYINT:
-                            return static_cast<double>(static_cast<sal_uInt8>(xVariant->getByte()));
+                            return static_cast<double>(static_cast<sal_uInt8>(i_column->getByte()));
                         case DataType::SMALLINT:
-                            return static_cast<double>(static_cast<sal_uInt16>(xVariant->getShort()));
+                            return static_cast<double>(static_cast<sal_uInt16>(i_column->getShort()));
                         case DataType::INTEGER:
-                            return static_cast<double>(static_cast<sal_uInt32>(xVariant->getInt()));
+                            return static_cast<double>(static_cast<sal_uInt32>(i_column->getInt()));
                         case DataType::BIGINT:
-                            return static_cast<double>(static_cast<sal_uInt64>(xVariant->getLong()));
+                            return static_cast<double>(static_cast<sal_uInt64>(i_column->getLong()));
                     }
                 }
-
-                return xVariant->getDouble();
             }
+            return i_column->getDouble();
         }
     }
-    catch(const Exception& )
+    catch( const Exception& )
     {
+        DBG_UNHANDLED_EXCEPTION();
         return 0.0;
     }
 }
 //------------------------------------------------------------------------------
-::rtl::OUString DBTypeConversion::getValue(const Reference< XPropertySet>& _xColumn,
+::rtl::OUString DBTypeConversion::getFormattedValue(const Reference< XPropertySet>& _xColumn,
                                            const Reference<XNumberFormatter>& _xFormatter,
                                            const ::com::sun::star::lang::Locale& _rLocale,
                                            const Date& _rNullDate)
 {
-    OSL_ENSURE(_xColumn.is() && _xFormatter.is(), "DBTypeConversion::getValue: invalid arg !");
+    OSL_ENSURE(_xColumn.is() && _xFormatter.is(), "DBTypeConversion::getFormattedValue: invalid arg !");
     if (!_xColumn.is() || !_xFormatter.is())
         return ::rtl::OUString();
 
@@ -440,11 +444,11 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
 
     sal_Int16 nKeyType = getNumberFormatType(_xFormatter, nKey) & ~NumberFormat::DEFINED;
 
-    return DBTypeConversion::getValue(Reference< XColumn > (_xColumn, UNO_QUERY), _xFormatter, _rNullDate, nKey, nKeyType);
+    return DBTypeConversion::getFormattedValue(Reference< XColumn > (_xColumn, UNO_QUERY), _xFormatter, _rNullDate, nKey, nKeyType);
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
+::rtl::OUString DBTypeConversion::getFormattedValue(const Reference<XColumn>& xVariant,
                                    const Reference<XNumberFormatter>& xFormatter,
                                    const Date& rNullDate,
                                    sal_Int32 nKey,
@@ -461,23 +465,20 @@ double DBTypeConversion::getValue(const Reference<XColumn>& xVariant,
                 case NumberFormat::DATETIME:
                 {
                     // get a value which represents the given date, relative to the given null date
-                    double fValue = getValue(xVariant, rNullDate, nKeyType);
+                    double fValue = getValue( xVariant, rNullDate );
                     if ( !xVariant->wasNull() )
                     {
                          // get the null date of the formatter
                          Date aFormatterNullDate( rNullDate );
                          try
                          {
-                             Reference< XPropertySet > xFormatterSettings;
-                             Reference< XNumberFormatsSupplier > xSupplier( xFormatter->getNumberFormatsSupplier( ) );
-                             if ( xSupplier.is() )
-                                 xFormatterSettings = xSupplier->getNumberFormatSettings();
-                             if ( xFormatterSettings.is() )
-                                 xFormatterSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ) ) ) >>= aFormatterNullDate;
+                             Reference< XNumberFormatsSupplier > xSupplier( xFormatter->getNumberFormatsSupplier(), UNO_SET_THROW );
+                             Reference< XPropertySet > xFormatterSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW );
+                             OSL_VERIFY( xFormatterSettings->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NullDate" ) ) ) >>= aFormatterNullDate );
                          }
                          catch( const Exception& )
                          {
-                            OSL_ENSURE( sal_False, "DBTypeConversion::getValue: caught an exception while retrieving the formatter's NullDate!" );
+                            DBG_UNHANDLED_EXCEPTION();
                          }
                          // get a value which represents the given date, relative to the null date of the formatter
                          fValue -= toDays( rNullDate, aFormatterNullDate );
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index cc19bce60abb..cc19bce60abb 100644..100755
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 9aa8d14fd8c4..231ebb75fcc1 100644..100755
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -901,11 +901,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const
 }
 
 //---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* serviceManager, com::sun::star::registry::XRegistryKey* registryKey)
-{
-    return cppu::component_writeInfoHelper(serviceManager, registryKey, entries);
-}
-//---------------------------------------------------------------------------------------
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* implName, ::com::sun::star::lang::XMultiServiceFactory* serviceManager, void* registryKey)
 {
     return cppu::component_getFactoryHelper(implName, serviceManager, registryKey, entries);
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index 0ec2d579337b..0ec2d579337b 100644..100755
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 88add8593e30..797cad9de343 100644..100755
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -33,7 +33,7 @@
 #include "connectivity/FValue.hxx"
 #include "connectivity/CommonTools.hxx"
 #include <connectivity/dbconversion.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/logfile.hxx>
@@ -1754,7 +1754,7 @@ Sequence<sal_Int8>  ORowSetValue::getSequence() const
 
 }
 // -----------------------------------------------------------------------------
-::com::sun::star::util::Date ORowSetValue::getDate()        const
+::com::sun::star::util::Date ORowSetValue::getDate() const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getDate" );
     ::com::sun::star::util::Date aValue;
@@ -1769,8 +1769,6 @@ Sequence<sal_Int8>  ORowSetValue::getSequence() const
                 break;
             case DataType::DECIMAL:
             case DataType::NUMERIC:
-                aValue = DBTypeConversion::toDate((double)*this);
-                break;
             case DataType::FLOAT:
             case DataType::DOUBLE:
             case DataType::REAL:
@@ -1788,12 +1786,28 @@ Sequence<sal_Int8>  ORowSetValue::getSequence() const
                     aValue.Year     = pDateTime->Year;
                 }
                 break;
+            case DataType::BIT:
+            case DataType::BOOLEAN:
+            case DataType::TINYINT:
+            case DataType::SMALLINT:
+            case DataType::INTEGER:
+            case DataType::BIGINT:
+                aValue = DBTypeConversion::toDate( double( sal_Int64( *this ) ) );
+                break;
+
+            case DataType::BLOB:
+            case DataType::CLOB:
+            case DataType::OBJECT:
             default:
-                {
-                    Any aAnyValue = getAny();
-                    aAnyValue >>= aValue;
-                    break;
-                }
+                OSL_ENSURE( false, "ORowSetValue::getDate: cannot retrieve the data!" );
+                // NO break!
+
+            case DataType::BINARY:
+            case DataType::VARBINARY:
+            case DataType::LONGVARBINARY:
+            case DataType::TIME:
+                aValue = DBTypeConversion::toDate( (double)0 );
+                break;
         }
     }
     return aValue;
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index 294c44dc9c23..294c44dc9c23 100644..100755
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index 40e119419f2d..40e119419f2d 100644..100755
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index f6b61ffe80a6..f6b61ffe80a6 100644..100755
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index a0808ae5e852..a0808ae5e852 100644..100755
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 86d89d8698b7..86d89d8698b7 100644..100755
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index 87ed49f030ae..87ed49f030ae 100644..100755
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 2580e6d493f8..2580e6d493f8 100644..100755
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 796310d36039..796310d36039 100644..100755
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index fa67a745f2bb..fa67a745f2bb 100644..100755
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 791b735dc652..791b735dc652 100644..100755
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 01d2be6d087f..01d2be6d087f 100644..100755
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index a9e21fb27ec3..a9e21fb27ec3 100644..100755
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index ab4b1c6f4071..15f30a592d24 100644..100755
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -155,10 +155,15 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio
             bDone = sal_False;
     }
 
-    if(bDataFound && bDone )
+    if(bDataFound && bDone)
     {
         const sal_Int32 nDriverPos = m_pHelper->getDriverPos();
-        if ( ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),nDriverPos) == m_aBookmarksPositions.end() )
+        if ( m_bDeletedVisible )
+        {
+            if ( nDriverPos > (sal_Int32)m_aBookmarksPositions.size() )
+                m_aBookmarksPositions.push_back(nDriverPos);
+        }
+        else if ( ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),nDriverPos) == m_aBookmarksPositions.end() )
             m_aBookmarksPositions.push_back(nDriverPos);
         /*sal_Int32 nDriverPos = m_pHelper->getDriverPos();
         if(m_aBookmarks.find(nDriverPos) == m_aBookmarks.end())
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index 8c88dabd7099..8c88dabd7099 100644..100755
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 5d3027a627b1..5d3027a627b1 100644..100755
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index acf6324a10f4..acf6324a10f4 100644..100755
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx
index a51cc0eeef02..a51cc0eeef02 100644..100755
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index 5b759e170f68..5b759e170f68 100644..100755
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index e79f0dda4d49..e79f0dda4d49 100644..100755
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index acb995978f5a..acb995978f5a 100644..100755
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 393a3db5b051..37d1fa51a440 100644..100755
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -260,7 +260,7 @@ Reference< XDataSource> getDataSource_allowException(
             const ::rtl::OUString& _rsTitleOrPath,
             const Reference< XMultiServiceFactory >& _rxFactory )
 {
-    OSL_ENSURE( _rsTitleOrPath.getLength(), "getDataSource_allowException: invalid arg !" );
+    ENSURE_OR_RETURN( _rsTitleOrPath.getLength(), "getDataSource_allowException: invalid arg !", NULL );
 
     Reference< XNameAccess> xDatabaseContext(
         _rxFactory->createInstance(
@@ -280,8 +280,9 @@ Reference< XDataSource > getDataSource(
     {
         xDS = getDataSource_allowException( _rsTitleOrPath, _rxFactory );
     }
-    catch(Exception)
+    catch( const Exception& )
     {
+        DBG_UNHANDLED_EXCEPTION();
     }
 
     return xDS;
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index 5306e37a7673..d955ef225c03 100644..100755
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -586,7 +586,6 @@ bool getDataSourceSetting( const Reference< XInterface >& _xChild, const ::rtl::
     try
     {
         const Reference< XPropertySet> xDataSourceProperties( findDataSource( _xChild ), UNO_QUERY );
-        OSL_ENSURE( xDataSourceProperties.is(), "getDataSourceSetting: invalid data source object!" );
         if ( !xDataSourceProperties.is() )
             return false;
 
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 8c3153a8b974..5e06062b1846 100644..100755
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -36,6 +36,8 @@
 #include "TConnection.hxx"
 #include <osl/diagnose.h>
 #include "connectivity/dbtools.hxx"
+#include <tools/diagnose_ex.h>
+#include <rtl/ustrbuf.hxx>
 
 //........................................................................
 namespace dbtools
@@ -93,7 +95,7 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FilterManager::setFilterComponent: setting the filter failed!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
@@ -114,44 +116,30 @@ namespace dbtools
         }
         catch( const Exception& )
         {
-            OSL_ENSURE( sal_False, "FilterManager::setApplyPublicFilter: setting the filter failed!" );
+            DBG_UNHANDLED_EXCEPTION();
         }
     }
 
     //--------------------------------------------------------------------
-    namespace
+    void FilterManager::appendFilterComponent( ::rtl::OUStringBuffer& io_appendTo, const ::rtl::OUString& i_component ) const
     {
-        void    lcl_ensureBracketed( ::rtl::OUString& /* [inout] */ _rExpression )
+        if ( io_appendTo.getLength() > 0 )
         {
-            OSL_ENSURE( _rExpression.getLength(), "lcl_ensureBracketed: expression is empty!" );
-            if ( _rExpression.getLength() )
-            {
-                if ( ( _rExpression.getStr()[0] != '(' ) || ( _rExpression.getStr()[ _rExpression.getLength() - 1 ] != ')' ) )
-                {
-                    ::rtl::OUString sComposed( RTL_CONSTASCII_USTRINGPARAM( "(" ) );
-                    sComposed += _rExpression;
-                    sComposed += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
-                    _rExpression = sComposed;
-                }
-            }
+            io_appendTo.insert( 0, sal_Unicode( '(' ) );
+            io_appendTo.insert( 1, sal_Unicode( ' ' ) );
+            io_appendTo.appendAscii( " ) AND " );
         }
-    }
-    //--------------------------------------------------------------------
-    void FilterManager::appendFilterComponent( ::rtl::OUString& /* [inout] */ _rAppendTo, const ::rtl::OUString& _rComponent ) const
-    {
-        if ( _rAppendTo.getLength() )
-            _rAppendTo += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " AND " ) );
 
-        ::rtl::OUString sComponent( _rComponent );
-        lcl_ensureBracketed( sComponent );
-        _rAppendTo += sComponent;
+        io_appendTo.appendAscii( "( " );
+        io_appendTo.append( i_component );
+        io_appendTo.appendAscii( " )" );
     }
 
     //--------------------------------------------------------------------
-    bool FilterManager::isThereAtMostOneComponent( ::rtl::OUString& _rOnlyComponent ) const
+    bool FilterManager::isThereAtMostOneComponent( ::rtl::OUStringBuffer& o_singleComponent ) const
     {
         sal_Int32 nOnlyNonEmpty = -1;
-    sal_Int32 i;
+        sal_Int32 i;
         for ( i = getFirstApplicableFilterIndex(); i < FC_COMPONENT_COUNT; ++i )
         {
             if ( m_aFilterComponents[ i ].getLength() )
@@ -165,14 +153,14 @@ namespace dbtools
         }
         if ( nOnlyNonEmpty == -1 )
         {
-            _rOnlyComponent = ::rtl::OUString();
+            o_singleComponent.makeStringAndClear();
             return true;
         }
 
         if ( i == FC_COMPONENT_COUNT )
         {
             // we found only one non-empty filter component
-            _rOnlyComponent = m_aFilterComponents[ nOnlyNonEmpty ];
+            o_singleComponent = m_aFilterComponents[ nOnlyNonEmpty ];
             return true;
         }
         return false;
@@ -181,17 +169,17 @@ namespace dbtools
     //--------------------------------------------------------------------
     ::rtl::OUString FilterManager::getComposedFilter( ) const
     {
-        ::rtl::OUString sComposedFilter;
+        ::rtl::OUStringBuffer aComposedFilter;
 
         // if we have only one non-empty component, then there's no need to compose anything
-        if ( isThereAtMostOneComponent( sComposedFilter ) )
-            return sComposedFilter;
-
-        // append the single components
-        for ( sal_Int32 i = getFirstApplicableFilterIndex(); i < FC_COMPONENT_COUNT; ++i )
-            appendFilterComponent( sComposedFilter, m_aFilterComponents[ i ] );
+        if ( !isThereAtMostOneComponent( aComposedFilter ) )
+        {
+            // append the single components
+            for ( sal_Int32 i = getFirstApplicableFilterIndex(); i < FC_COMPONENT_COUNT; ++i )
+                appendFilterComponent( aComposedFilter, m_aFilterComponents[ i ] );
+        }
 
-        return sComposedFilter;
+        return aComposedFilter.makeStringAndClear();
     }
 
 //........................................................................
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index feb45e5d38b4..ef7a06abe2c7 100644..100755
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -328,7 +328,7 @@ namespace dbtools
         {
             if ( m_pData->m_bNumericField )
             {
-                sStringValue = DBTypeConversion::getValue(
+                sStringValue = DBTypeConversion::getFormattedValue(
                     m_pData->m_xColumn, m_pData->m_xFormatter, m_pData->m_aNullDate, m_pData->m_nFormatKey, m_pData->m_nKeyType
                 );
             }
diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk
index cab216092241..cab216092241 100644..100755
--- a/connectivity/source/commontools/makefile.mk
+++ b/connectivity/source/commontools/makefile.mk
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 09ebd2096b9c..09ebd2096b9c 100644..100755
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index b652f2662cf9..b652f2662cf9 100644..100755
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index 2a95477918c7..2a95477918c7 100644..100755
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index 09f7328be01f..09f7328be01f 100644..100755
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 59abac1d1016..59abac1d1016 100644..100755
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index ba8ba3819e47..ba8ba3819e47 100644..100755
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index f0ed7b0aa7b3..f0ed7b0aa7b3 100644..100755
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 3e63d401a735..3e63d401a735 100644..100755
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 8c3de660c8a3..8c3de660c8a3 100644..100755
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx
index fe3af73de4aa..fe3af73de4aa 100644..100755
--- a/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.cxx
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index afc2e19aeb5f..afc2e19aeb5f 100644..100755
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index 3d577d86deb5..3d577d86deb5 100644..100755
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index 1681f117f5ec..1681f117f5ec 100644..100755
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 97f3eeee6a0c..97f3eeee6a0c 100644..100755
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index ec318a530fd6..ec318a530fd6 100644..100755
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx
index 67cdace1a525..67cdace1a525 100644..100755
--- a/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/connectivity/source/cpool/ZPooledConnection.cxx
diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx
index ccfffa870b9a..ccfffa870b9a 100644..100755
--- a/connectivity/source/cpool/ZPooledConnection.hxx
+++ b/connectivity/source/cpool/ZPooledConnection.hxx
diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx
index 738096bca750..1377704a0a2c 100644..100755
--- a/connectivity/source/cpool/Zregistration.cxx
+++ b/connectivity/source/cpool/Zregistration.cxx
@@ -51,35 +51,6 @@ extern "C"
 }
 
 //---------------------------------------------------------------------------------------
-sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey)
-{
-    ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
-    sMainKeyName += OPoolCollection::getImplementationName_Static();
-    sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    try
-    {
-        Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName);
-        if (!xMainKey.is())
-            return sal_False;
-
-        Sequence< ::rtl::OUString > sServices = OPoolCollection::getSupportedServiceNames_Static();
-        const ::rtl::OUString* pServices = sServices.getConstArray();
-        for (sal_Int32 i=0; i<sServices.getLength(); ++i, ++pServices)
-            xMainKey->createKey(*pServices);
-    }
-    catch(InvalidRegistryException&)
-    {
-        return sal_False;
-    }
-    catch(InvalidValueException&)
-    {
-        return sal_False;
-    }
-    return sal_True;
-}
-
-//---------------------------------------------------------------------------------------
 void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
 {
     void* pRet = NULL;
diff --git a/connectivity/source/cpool/dbpool.xml b/connectivity/source/cpool/dbpool.xml
index 271423222641..271423222641 100644..100755
--- a/connectivity/source/cpool/dbpool.xml
+++ b/connectivity/source/cpool/dbpool.xml
diff --git a/connectivity/source/cpool/dbpool2.component b/connectivity/source/cpool/dbpool2.component
new file mode 100755
index 000000000000..2fa8a144959c
--- /dev/null
+++ b/connectivity/source/cpool/dbpool2.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.sdbc.OConnectionPool">
+    <service name="com.sun.star.sdbc.ConnectionPool"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/cpool/exports.dxp b/connectivity/source/cpool/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/cpool/exports.dxp
+++ b/connectivity/source/cpool/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk
index 393a797d2c66..45ec3727ea3b 100644..100755
--- a/connectivity/source/cpool/makefile.mk
+++ b/connectivity/source/cpool/makefile.mk
@@ -78,4 +78,10 @@ DEF1EXPORTFILE=	exports.dxp
 
 .INCLUDE : target.mk
 
+ALLTAR : $(MISC)/dbpool2.component
 
+$(MISC)/dbpool2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dbpool2.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dbpool2.component
diff --git a/connectivity/source/dbtools/dbt.xml b/connectivity/source/dbtools/dbt.xml
index e2f8c8921c18..e2f8c8921c18 100644..100755
--- a/connectivity/source/dbtools/dbt.xml
+++ b/connectivity/source/dbtools/dbt.xml
diff --git a/connectivity/source/dbtools/dbtools.component b/connectivity/source/dbtools/dbtools.component
new file mode 100755
index 000000000000..08be953bb9d4
--- /dev/null
+++ b/connectivity/source/dbtools/dbtools.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="org.openoffice.comp.helper.DatabaseMetaDataResultSet">
+    <service name="com.sun.star.sdbc.ResultSet"/>
+  </implementation>
+  <implementation name="org.openoffice.comp.helper.ParameterSubstitution">
+    <service name="com.sun.star.sdb.ParameterSubstitution"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/dbtools/exports.dxp b/connectivity/source/dbtools/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/dbtools/exports.dxp
+++ b/connectivity/source/dbtools/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk
index 294c9a02f37f..90237153de77 100644..100755
--- a/connectivity/source/dbtools/makefile.mk
+++ b/connectivity/source/dbtools/makefile.mk
@@ -94,3 +94,11 @@ $(MISC)$/$(SHL1TARGET).flt: makefile.mk
     @echo _TI				>$@
     @echo _real				>>$@
 
+
+ALLTAR : $(MISC)/dbtools.component
+
+$(MISC)/dbtools.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dbtools.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dbtools.component
diff --git a/connectivity/source/drivers/adabas/BCatalog.cxx b/connectivity/source/drivers/adabas/BCatalog.cxx
index e04f4d3a9373..e04f4d3a9373 100644..100755
--- a/connectivity/source/drivers/adabas/BCatalog.cxx
+++ b/connectivity/source/drivers/adabas/BCatalog.cxx
diff --git a/connectivity/source/drivers/adabas/BColumns.cxx b/connectivity/source/drivers/adabas/BColumns.cxx
index 227646beeb9b..227646beeb9b 100644..100755
--- a/connectivity/source/drivers/adabas/BColumns.cxx
+++ b/connectivity/source/drivers/adabas/BColumns.cxx
diff --git a/connectivity/source/drivers/adabas/BConnection.cxx b/connectivity/source/drivers/adabas/BConnection.cxx
index 33923c56a69d..33923c56a69d 100644..100755
--- a/connectivity/source/drivers/adabas/BConnection.cxx
+++ b/connectivity/source/drivers/adabas/BConnection.cxx
diff --git a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
index 2dbd6b22266b..2dbd6b22266b 100644..100755
--- a/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 490add2af720..bb72894d621c 100644..100755
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -66,9 +66,7 @@
 #include <memory>
 #include <sys/stat.h>
 
-#if defined(MAC)
-const char sNewLine = '\015';
-#elif defined(UNX)
+#if defined(UNX)
 const char sNewLine = '\012';
 #else
 const char sNewLine[] = "\015\012"; // \015\012 and not \n
@@ -873,7 +871,7 @@ void ODriver::createNeededDirs(const ::rtl::OUString& sDBName)
         if(UCBContentHelper::Exists(sTemp))
             UCBContentHelper::Kill(sTemp);
 
-#if !(defined(WIN) || defined(WNT))
+#if !(defined(WNT))
         sTemp = sDBConfig;
         sTemp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("diag"));
         if(!UCBContentHelper::IsFolder(sTemp))
@@ -895,7 +893,7 @@ void ODriver::createNeededDirs(const ::rtl::OUString& sDBName)
 void ODriver::clearDatabase(const ::rtl::OUString& sDBName)
 { // stop the database
     ::rtl::OUString sCommand;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     ::rtl::OUString sStop = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("stop"));
     const sal_uInt32 nArgsCount = 2;
     rtl_uString *pArgs[nArgsCount] = { sDBName.pData, sStop.pData };
@@ -944,7 +942,7 @@ void ODriver::createDb( const TDatabaseStruct& _aInfo)
     PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KERNELTRACESIZE")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("100")));
     PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LOG_QUEUE_PAGES")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10")));
 
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
     PutParam(_aInfo.sDBName,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OPMSG1")),::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/dev/null")));
 #endif
 
@@ -1012,7 +1010,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME,
         ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
         pFileStream->Seek(STREAM_SEEK_TO_END);
         (*pFileStream)  << "x_param"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " -d "
@@ -1023,7 +1021,7 @@ int ODriver::X_PARAM(const ::rtl::OUString& _DBNAME,
                         << ::rtl::OString(_PWD,_PWD.getLength(),gsl_getSystemTextEncoding())
                         << " "
                         << ::rtl::OString(_CMD,_CMD.getLength(),gsl_getSystemTextEncoding())
-#if (defined(WIN) || defined(WNT))
+#if defined(WNT)
 #if (OSL_DEBUG_LEVEL > 1) || defined(DBG_UTIL)
                         << " >> %DBWORK%\\create.log 2>&1"
 #endif
@@ -1079,7 +1077,7 @@ void ODriver::PutParam(const ::rtl::OUString& sDBName,
     rtl_uString* pArgs[nArgsCount] = { sDBName.pData, rWhat.pData, rHow.pData  };
 
     ::rtl::OUString sCommand = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("putparam"));
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     sCommand += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".exe"));
 #endif
 
@@ -1146,7 +1144,7 @@ OSL_TRACE("CreateFile %d",_nSize);
 int ODriver::X_START(const ::rtl::OUString& sDBName)
 {
     ::rtl::OUString sCommand;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 
     ::rtl::OUString sArg1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-d"));
     ::rtl::OUString sArg3 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService"));
@@ -1191,7 +1189,7 @@ int ODriver::X_START(const ::rtl::OUString& sDBName)
 int ODriver::X_STOP(const ::rtl::OUString& sDBName)
 {
     ::rtl::OUString sCommand;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 
     ::rtl::OUString sArg1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-d"));
     ::rtl::OUString sArg2 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-NoDBService"));
@@ -1243,7 +1241,7 @@ void ODriver::XUTIL(const ::rtl::OUString& _rParam,
         ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
         pFileStream->Seek(STREAM_SEEK_TO_END);
         (*pFileStream)  <<
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                             "xutil.exe"
 #else
                             "utility"
@@ -1301,7 +1299,7 @@ void ODriver::LoadBatch(const ::rtl::OUString& sDBName,
         ::std::auto_ptr<SvStream> pFileStream( UcbStreamHelper::CreateStream(sCommandFile,STREAM_STD_READWRITE));
         pFileStream->Seek(STREAM_SEEK_TO_END);
         (*pFileStream)  << "xload"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " -d "
@@ -1375,7 +1373,7 @@ void ODriver::fillEnvironmentVariables()
 ::rtl::OUString ODriver::generateInitFile() const
 {
     String sExt;
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
     sExt = String::CreateFromAscii(".sh");
 #else
     sExt = String::CreateFromAscii(".bat");
@@ -1383,13 +1381,13 @@ void ODriver::fillEnvironmentVariables()
 
     String sWorkUrl(m_sDbWorkURL);
     ::utl::TempFile aCmdFile(String::CreateFromAscii("Init"),&sExt,&sWorkUrl);
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
     String sPhysicalPath;
     LocalFileHelper::ConvertURLToPhysicalName(aCmdFile.GetURL(),sPhysicalPath);
     chmod(ByteString(sPhysicalPath,gsl_getSystemTextEncoding()).GetBuffer(),S_IRUSR|S_IWUSR|S_IXUSR);
 #endif
 
-#if !(defined(WIN) || defined(WNT))
+#if !defined(WNT)
     SvStream* pFileStream = aCmdFile.GetStream(STREAM_WRITE);
     (*pFileStream)  << "#!/bin/sh"
                     << sNewLine
@@ -1499,7 +1497,7 @@ void ODriver::X_CONS(const ::rtl::OUString& sDBName,const ::rtl::OString& _ACTIO
         pFileStream->Seek(STREAM_SEEK_TO_END);
 
         (*pFileStream)  << "x_cons"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " "
@@ -1586,7 +1584,7 @@ sal_Bool ODriver::isVersion(const ::rtl::OUString& sDBName, const char* _pVersio
         pFileStream->Seek(STREAM_SEEK_TO_END);
 
         (*pFileStream)  << "getparam"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " "
@@ -1640,7 +1638,7 @@ void ODriver::checkAndInsertNewDevSpace(const ::rtl::OUString& sDBName,
         pFileStream->Seek(STREAM_SEEK_TO_END);
 
         (*pFileStream)  << "getparam"
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
                         << ".exe"
 #endif
                         << " "
@@ -1726,7 +1724,7 @@ sal_Bool ODriver::isKernelVersion(const char* _pVersion)
 // -----------------------------------------------------------------------------
 void ODriver::installSystemTables(  const TDatabaseStruct& _aInfo)
 {
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     //  xutil -d %_DBNAME% -u %_CONTROL_USER%,%_CONTROL_PWD% -b %m_sDbRoot%\env\TERMCHAR.ind
     ::rtl::OUString aBatch =  ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-b "));
     ::rtl::OUString sTemp2 = m_sDbRootURL   + m_sDelimit
diff --git a/connectivity/source/drivers/adabas/BFunctions.cxx b/connectivity/source/drivers/adabas/BFunctions.cxx
index 9834a9b63bed..0a10de3f6f55 100644..100755
--- a/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -130,7 +130,7 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath)
     }
     const sal_Char* pLibraryAsciiName = NULL;
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
     pLibraryAsciiName = "SQLOD32.DLL";
 #elif ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX)
     pLibraryAsciiName = "odbclib.so";
diff --git a/connectivity/source/drivers/adabas/BGroup.cxx b/connectivity/source/drivers/adabas/BGroup.cxx
index 64582b42432b..64582b42432b 100644..100755
--- a/connectivity/source/drivers/adabas/BGroup.cxx
+++ b/connectivity/source/drivers/adabas/BGroup.cxx
diff --git a/connectivity/source/drivers/adabas/BGroups.cxx b/connectivity/source/drivers/adabas/BGroups.cxx
index 0211a0a7f5aa..0211a0a7f5aa 100644..100755
--- a/connectivity/source/drivers/adabas/BGroups.cxx
+++ b/connectivity/source/drivers/adabas/BGroups.cxx
diff --git a/connectivity/source/drivers/adabas/BIndex.cxx b/connectivity/source/drivers/adabas/BIndex.cxx
index 7374aded7c5f..7374aded7c5f 100644..100755
--- a/connectivity/source/drivers/adabas/BIndex.cxx
+++ b/connectivity/source/drivers/adabas/BIndex.cxx
diff --git a/connectivity/source/drivers/adabas/BIndexColumns.cxx b/connectivity/source/drivers/adabas/BIndexColumns.cxx
index 7365d4c66581..7365d4c66581 100644..100755
--- a/connectivity/source/drivers/adabas/BIndexColumns.cxx
+++ b/connectivity/source/drivers/adabas/BIndexColumns.cxx
diff --git a/connectivity/source/drivers/adabas/BIndexes.cxx b/connectivity/source/drivers/adabas/BIndexes.cxx
index b338dfa8c435..b338dfa8c435 100644..100755
--- a/connectivity/source/drivers/adabas/BIndexes.cxx
+++ b/connectivity/source/drivers/adabas/BIndexes.cxx
diff --git a/connectivity/source/drivers/adabas/BKeys.cxx b/connectivity/source/drivers/adabas/BKeys.cxx
index 97c38d818efa..97c38d818efa 100644..100755
--- a/connectivity/source/drivers/adabas/BKeys.cxx
+++ b/connectivity/source/drivers/adabas/BKeys.cxx
diff --git a/connectivity/source/drivers/adabas/BPreparedStatement.cxx b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
index c217f660d67b..c217f660d67b 100644..100755
--- a/connectivity/source/drivers/adabas/BPreparedStatement.cxx
+++ b/connectivity/source/drivers/adabas/BPreparedStatement.cxx
diff --git a/connectivity/source/drivers/adabas/BResultSet.cxx b/connectivity/source/drivers/adabas/BResultSet.cxx
index 4ce890994092..4ce890994092 100644..100755
--- a/connectivity/source/drivers/adabas/BResultSet.cxx
+++ b/connectivity/source/drivers/adabas/BResultSet.cxx
diff --git a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
index 18605f519549..18605f519549 100644..100755
--- a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
+++ b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/adabas/BStatement.cxx b/connectivity/source/drivers/adabas/BStatement.cxx
index 6f5cf4028b90..6f5cf4028b90 100644..100755
--- a/connectivity/source/drivers/adabas/BStatement.cxx
+++ b/connectivity/source/drivers/adabas/BStatement.cxx
diff --git a/connectivity/source/drivers/adabas/BTable.cxx b/connectivity/source/drivers/adabas/BTable.cxx
index 512bfbd5ec11..512bfbd5ec11 100644..100755
--- a/connectivity/source/drivers/adabas/BTable.cxx
+++ b/connectivity/source/drivers/adabas/BTable.cxx
diff --git a/connectivity/source/drivers/adabas/BTables.cxx b/connectivity/source/drivers/adabas/BTables.cxx
index 8689ef8b87f7..8689ef8b87f7 100644..100755
--- a/connectivity/source/drivers/adabas/BTables.cxx
+++ b/connectivity/source/drivers/adabas/BTables.cxx
diff --git a/connectivity/source/drivers/adabas/BUser.cxx b/connectivity/source/drivers/adabas/BUser.cxx
index 42b72be0138d..42b72be0138d 100644..100755
--- a/connectivity/source/drivers/adabas/BUser.cxx
+++ b/connectivity/source/drivers/adabas/BUser.cxx
diff --git a/connectivity/source/drivers/adabas/BUsers.cxx b/connectivity/source/drivers/adabas/BUsers.cxx
index 5ca28331d904..5ca28331d904 100644..100755
--- a/connectivity/source/drivers/adabas/BUsers.cxx
+++ b/connectivity/source/drivers/adabas/BUsers.cxx
diff --git a/connectivity/source/drivers/adabas/BViews.cxx b/connectivity/source/drivers/adabas/BViews.cxx
index 4914c08f2902..4914c08f2902 100644..100755
--- a/connectivity/source/drivers/adabas/BViews.cxx
+++ b/connectivity/source/drivers/adabas/BViews.cxx
diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx
index f18c5a65ec8f..082cddca89f5 100644..100755
--- a/connectivity/source/drivers/adabas/Bservices.cxx
+++ b/connectivity/source/drivers/adabas/Bservices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "adabas/BDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::adabas;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriver::getImplementationName_Static(),
-            ODriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/adabas/adabas.component b/connectivity/source/drivers/adabas/adabas.component
new file mode 100755
index 000000000000..3c359c3d0217
--- /dev/null
+++ b/connectivity/source/drivers/adabas/adabas.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbcx.adabas.ODriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/adabas/adabas.mxp.map b/connectivity/source/drivers/adabas/adabas.mxp.map
index 2ce9f111412b..f64c44c13fce 100644..100755
--- a/connectivity/source/drivers/adabas/adabas.mxp.map
+++ b/connectivity/source/drivers/adabas/adabas.mxp.map
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/drivers/adabas/adabas.xml b/connectivity/source/drivers/adabas/adabas.xml
index a8740023988b..a8740023988b 100644..100755
--- a/connectivity/source/drivers/adabas/adabas.xml
+++ b/connectivity/source/drivers/adabas/adabas.xml
diff --git a/connectivity/source/drivers/adabas/exports.dxp b/connectivity/source/drivers/adabas/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/adabas/exports.dxp
+++ b/connectivity/source/drivers/adabas/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk
index b5d9903f2737..bfc6a3dcfaac 100644..100755
--- a/connectivity/source/drivers/adabas/makefile.mk
+++ b/connectivity/source/drivers/adabas/makefile.mk
@@ -104,3 +104,11 @@ DEF1EXPORTFILE=	exports.dxp
 
 
 .INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/adabas.component
+
+$(MISC)/adabas.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        adabas.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt adabas.component
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 1d1cdabf656a..1d1cdabf656a 100644..100755
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx
index aa38e4b5123c..e4cbfbaa788c 100644..100755
--- a/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/connectivity/source/drivers/ado/ACatalog.cxx
@@ -80,7 +80,7 @@ void OCatalog::refreshTables()
     if(m_pTables)
         m_pTables->reFill(aVector);
     else
-        m_pTables = new OTables(this,m_aMutex,aVector,aTables,m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
+        m_pTables = new OTables(this,m_aMutex,aVector,aTables,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 // -------------------------------------------------------------------------
 void OCatalog::refreshViews()
@@ -93,7 +93,7 @@ void OCatalog::refreshViews()
     if(m_pViews)
         m_pViews->reFill(aVector);
     else
-        m_pViews = new OViews(this,m_aMutex,aVector,aViews,m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
+        m_pViews = new OViews(this,m_aMutex,aVector,aViews,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 // -------------------------------------------------------------------------
 void OCatalog::refreshGroups()
@@ -106,7 +106,7 @@ void OCatalog::refreshGroups()
     if(m_pGroups)
         m_pGroups->reFill(aVector);
     else
-        m_pGroups = new OGroups(this,m_aMutex,aVector,aGroups,m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
+        m_pGroups = new OGroups(this,m_aMutex,aVector,aGroups,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 // -------------------------------------------------------------------------
 void OCatalog::refreshUsers()
@@ -119,7 +119,7 @@ void OCatalog::refreshUsers()
     if(m_pUsers)
         m_pUsers->reFill(aVector);
     else
-        m_pUsers = new OUsers(this,m_aMutex,aVector,aUsers,m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
+        m_pUsers = new OUsers(this,m_aMutex,aVector,aUsers,m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 // -------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 7ac506d99cae..7ac506d99cae 100644..100755
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index e095ed963462..a8e20c09d6bc 100644..100755
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -73,8 +73,14 @@ Reference< XPropertySet > OColumns::createDescriptor()
 sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Reference< XPropertySet >& descriptor )
 {
     OAdoColumn* pColumn = NULL;
+    Reference< XPropertySet > xColumn;
     if ( !getImplementation( pColumn, descriptor ) || pColumn == NULL )
-        m_pConnection->throwGenericSQLException( STR_INVALID_COLUMN_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
+    {
+        // m_pConnection->throwGenericSQLException( STR_INVALID_COLUMN_DESCRIPTOR_ERROR,static_cast<XTypeProvider*>(this) );
+        pColumn = new OAdoColumn(isCaseSensitive(),m_pConnection);
+        xColumn = pColumn;
+        ::comphelper::copyProperties(descriptor,xColumn);
+    }
 
     WpADOColumn aColumn = pColumn->getColumnImpl();
 
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index a5bb2c190186..a5bb2c190186 100644..100755
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index c5dd3927311c..c5dd3927311c 100644..100755
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index e8acf0ad3613..e8acf0ad3613 100644..100755
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 0290e29cbfef..0290e29cbfef 100644..100755
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
index 12c250564113..12c250564113 100644..100755
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index c683dbdf5ad3..ca0f6acc970a 100644..100755
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -166,6 +166,37 @@ void ODriver::impl_checkURL_throw(const ::rtl::OUString& _sUrl)
 Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     impl_checkURL_throw(url);
+    if ( acceptsURL(url) )
+    {
+        ::std::vector< DriverPropertyInfo > aDriverInfo;
+
+        Sequence< ::rtl::OUString > aBooleanValues(2);
+        aBooleanValues[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) );
+        aBooleanValues[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) );
+
+        aDriverInfo.push_back(DriverPropertyInfo(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IgnoreDriverPrivileges"))
+                ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Ignore the privileges from the database driver."))
+                ,sal_False
+                ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "false" ) )
+                ,aBooleanValues)
+        );
+        aDriverInfo.push_back(DriverPropertyInfo(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EscapeDateTime"))
+                ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Escape date time format."))
+                ,sal_False
+                ,::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "true" ) )
+                ,aBooleanValues)
+        );
+        aDriverInfo.push_back(DriverPropertyInfo(
+                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TypeInfoSettings"))
+                ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Defines how the type info of the database metadata should be manipulated."))
+                ,sal_False
+                ,::rtl::OUString( )
+                ,Sequence< ::rtl::OUString > ())
+        );
+        return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size());
+    }
     return Sequence< DriverPropertyInfo >();
 }
 // --------------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx
index 05267df5ced2..05267df5ced2 100644..100755
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx
index 8efca9efef7e..8efca9efef7e 100644..100755
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index 468c1e9ba943..468c1e9ba943 100644..100755
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx
index 8969747eb192..8969747eb192 100644..100755
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index 43c8fd3dc419..43c8fd3dc419 100644..100755
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
diff --git a/connectivity/source/drivers/ado/AKeyColumn.cxx b/connectivity/source/drivers/ado/AKeyColumn.cxx
index 00da790fee89..00da790fee89 100644..100755
--- a/connectivity/source/drivers/ado/AKeyColumn.cxx
+++ b/connectivity/source/drivers/ado/AKeyColumn.cxx
diff --git a/connectivity/source/drivers/ado/AKeyColumns.cxx b/connectivity/source/drivers/ado/AKeyColumns.cxx
index 2dd66136a211..2dd66136a211 100644..100755
--- a/connectivity/source/drivers/ado/AKeyColumns.cxx
+++ b/connectivity/source/drivers/ado/AKeyColumns.cxx
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index b31d882244ba..b31d882244ba 100644..100755
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 3d6168116212..3d6168116212 100644..100755
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index feb6074eff61..feb6074eff61 100644..100755
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
index 859d261ebfe6..859d261ebfe6 100644..100755
--- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index efb6735c318d..efb6735c318d 100644..100755
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index d3f74f6c777a..d3f74f6c777a 100644..100755
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
index acb096545101..acb096545101 100644..100755
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index 7dc882050145..7dc882050145 100644..100755
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx
index 4e4cce3ce14a..4e4cce3ce14a 100644..100755
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx
index ac4fef472b65..ac4fef472b65 100644..100755
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index dee7d4ac6a64..dee7d4ac6a64 100644..100755
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index 47b98aa23cbb..47b98aa23cbb 100644..100755
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index 5bded2d19fc2..181181cd94fd 100644..100755
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "ado/ADriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::ado;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,26 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, that must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "ADO::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -117,31 +95,6 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriver::getImplementationName_Static(),
-            ODriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "ADO::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 35f16c778fe0..35f16c778fe0 100644..100755
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
diff --git a/connectivity/source/drivers/ado/ado.component b/connectivity/source/drivers/ado/ado.component
new file mode 100755
index 000000000000..1962a6b710a7
--- /dev/null
+++ b/connectivity/source/drivers/ado/ado.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.ado.ODriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/ado/ado.xcu b/connectivity/source/drivers/ado/ado.xcu
index 50c29cf7ba2e..e95e1a676c12 100755
--- a/connectivity/source/drivers/ado/ado.xcu
+++ b/connectivity/source/drivers/ado/ado.xcu
@@ -164,6 +164,11 @@
             <value>false</value>
           </prop>
         </node>
+        <node oor:name="TypeInfoSettings" oor:op="replace">
+          <prop oor:name="Value" oor:type="oor:string-list">
+            <value oor:separator=",">Column(2) = 16,Column(3) = 1</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="Features">
         <node oor:name="UseSQL92NamingConstraints" oor:op="replace">
diff --git a/connectivity/source/drivers/ado/ado.xml b/connectivity/source/drivers/ado/ado.xml
index e60318939d1f..e60318939d1f 100644..100755
--- a/connectivity/source/drivers/ado/ado.xml
+++ b/connectivity/source/drivers/ado/ado.xml
diff --git a/connectivity/source/drivers/ado/ado_post_sys_include.h b/connectivity/source/drivers/ado/ado_post_sys_include.h
index c3110010b04d..c3110010b04d 100644..100755
--- a/connectivity/source/drivers/ado/ado_post_sys_include.h
+++ b/connectivity/source/drivers/ado/ado_post_sys_include.h
diff --git a/connectivity/source/drivers/ado/ado_pre_sys_include.h b/connectivity/source/drivers/ado/ado_pre_sys_include.h
index 0393e96d285c..0393e96d285c 100644..100755
--- a/connectivity/source/drivers/ado/ado_pre_sys_include.h
+++ b/connectivity/source/drivers/ado/ado_pre_sys_include.h
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index 0ccb8916ecb8..73b00faefe01 100644..100755
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -106,7 +106,7 @@ sal_Int32 ADOS::MapADOType2Jdbc(DataTypeEnum eType)
         case adDBTime:              nType = DataType::TIME;         break;
         case adDate:
         case adDBTimeStamp:         nType = DataType::TIMESTAMP;    break;
-        case adBoolean:             nType = DataType::BIT;          break;
+        case adBoolean:             nType = DataType::BOOLEAN;      break;
 //      case adArray:               nType = DataType::ARRAY;        break;
         case adBinary:              nType = DataType::BINARY;       break;
         case adGUID:                nType = DataType::OBJECT;       break;
@@ -152,6 +152,7 @@ DataTypeEnum ADOS::MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine)
         case DataType::DATE:            return isJetEngine(_nJetEngine) ? adDate : adDBDate;            break;
         case DataType::TIME:            return adDBTime;            break;
         case DataType::TIMESTAMP:       return isJetEngine(_nJetEngine) ? adDate : adDBTimeStamp;       break;
+        case DataType::BOOLEAN:
         case DataType::BIT:             return adBoolean;           break;
         case DataType::BINARY:          return adBinary;            break;
         case DataType::VARCHAR:         return adVarWChar;          break;
diff --git a/connectivity/source/drivers/ado/exports.dxp b/connectivity/source/drivers/ado/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/ado/exports.dxp
+++ b/connectivity/source/drivers/ado/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index 77a3147d549b..02b72a7e7ab5 100644..100755
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -110,3 +110,11 @@ dummy:
 # --- Targets ----------------------------------
 .INCLUDE : $(PRJ)$/target.pmk
 
+
+ALLTAR : $(MISC)/ado.component
+
+$(MISC)/ado.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        ado.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt ado.component
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index 96345a020f30..96345a020f30 100644..100755
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx
index 019361e3d12f..019361e3d12f 100644..100755
--- a/connectivity/source/drivers/calc/CColumns.cxx
+++ b/connectivity/source/drivers/calc/CColumns.cxx
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 4fdb00bd52cc..4fdb00bd52cc 100644..100755
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index ca361392498d..ca361392498d 100644..100755
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index ecfd79a736c1..ecfd79a736c1 100644..100755
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
diff --git a/connectivity/source/drivers/calc/CPreparedStatement.cxx b/connectivity/source/drivers/calc/CPreparedStatement.cxx
index b80353dc151a..b80353dc151a 100644..100755
--- a/connectivity/source/drivers/calc/CPreparedStatement.cxx
+++ b/connectivity/source/drivers/calc/CPreparedStatement.cxx
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index 3085e135cd0f..3085e135cd0f 100644..100755
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
diff --git a/connectivity/source/drivers/calc/CStatement.cxx b/connectivity/source/drivers/calc/CStatement.cxx
index 1005d0c8af90..1005d0c8af90 100644..100755
--- a/connectivity/source/drivers/calc/CStatement.cxx
+++ b/connectivity/source/drivers/calc/CStatement.cxx
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 9ef399a8f443..cbfb9f976ba1 100644..100755
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -467,8 +467,8 @@ void OCalcTable::fillColumns()
     String aStrFieldName;
     aStrFieldName.AssignAscii("Column");
     ::rtl::OUString aTypeName;
-    ::comphelper::UStringMixEqual aCase(m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers());
-    const sal_Bool bStoresMixedCaseQuotedIdentifiers = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+    ::comphelper::UStringMixEqual aCase(m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
+    const sal_Bool bStoresMixedCaseQuotedIdentifiers = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
 
     for (sal_Int32 i = 0; i < m_nDataCols; i++)
     {
@@ -826,12 +826,12 @@ sal_Bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::fetchRow" );
     // read the bookmark
 
-    BOOL bIsCurRecordDeleted = sal_False;
+    sal_Bool bIsCurRecordDeleted = sal_False;
     _rRow->setDeleted(bIsCurRecordDeleted);
     *(_rRow->get())[0] = m_nFilePos;
 
     if (!bRetrieveData)
-        return TRUE;
+        return sal_True;
 
     // fields
 
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index edc9bc1bdd8c..edc9bc1bdd8c 100644..100755
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
diff --git a/connectivity/source/drivers/calc/CalcDriver.xml b/connectivity/source/drivers/calc/CalcDriver.xml
index c6ff0d00fe55..c6ff0d00fe55 100644..100755
--- a/connectivity/source/drivers/calc/CalcDriver.xml
+++ b/connectivity/source/drivers/calc/CalcDriver.xml
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 97936db1a376..3a4e4f0745d8 100644..100755
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "calc/CDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::calc;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriver::getImplementationName_Static(),
-            ODriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/calc/calc.component b/connectivity/source/drivers/calc/calc.component
new file mode 100755
index 000000000000..be949f70de14
--- /dev/null
+++ b/connectivity/source/drivers/calc/calc.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.calc.ODriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/calc/exports.dxp b/connectivity/source/drivers/calc/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/calc/exports.dxp
+++ b/connectivity/source/drivers/calc/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk
index 8b5958f30778..d36438a277b8 100644..100755
--- a/connectivity/source/drivers/calc/makefile.mk
+++ b/connectivity/source/drivers/calc/makefile.mk
@@ -87,3 +87,13 @@ DEF1EXPORTFILE=	exports.dxp
 # --- Targets ----------------------------------
 
 .INCLUDE : $(PRJ)$/target.pmk
+
+
+
+ALLTAR : $(MISC)/calc.component
+
+$(MISC)/calc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        calc.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt calc.component
diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx
index 4d524103e7e3..4d524103e7e3 100644..100755
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
diff --git a/connectivity/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx
index 3c7edbf4ca55..721e31a75f1c 100644..100755
--- a/connectivity/source/drivers/dbase/DCode.cxx
+++ b/connectivity/source/drivers/dbase/DCode.cxx
@@ -115,7 +115,7 @@ OEvaluateSet* OFILEOperandAttr::preProcess(OBoolOperator* pOp, OOperand* pRight)
                 if (pIter)
                 {
                     pEvaluateSet = new OEvaluateSet();
-                    ULONG nRec = pIter->First();
+                    sal_uIntPtr nRec = pIter->First();
                     while (nRec != NODE_NOTFOUND)
                     {
                         (*pEvaluateSet)[nRec] = nRec;
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx
index c3221c69b04c..c3221c69b04c 100644..100755
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx
index b30eb3cca0c9..b30eb3cca0c9 100644..100755
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index d1710f90dd6f..d1710f90dd6f 100644..100755
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 56f62e6c2325..56f62e6c2325 100644..100755
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 8a3c319c7ed9..c8a800d1eb37 100644..100755
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -68,7 +68,7 @@ using namespace com::sun::star::lang;
 
 IMPLEMENT_SERVICE_INFO(ODbaseIndex,"com.sun.star.sdbcx.driver.dbase.Index","com.sun.star.sdbcx.Index");
 // -------------------------------------------------------------------------
-ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable) : OIndex(sal_True/*_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers()*/)
+ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable) : OIndex(sal_True/*_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers()*/)
     ,m_pFileStream(NULL)
     ,m_nCurNode(NODE_NOTFOUND)
     ,m_pTable(_pTable)
@@ -144,7 +144,7 @@ ONDXPagePtr ODbaseIndex::getRoot()
     {
         m_nRootPage = m_aHeader.db_rootpage;
         m_nPageCount = m_aHeader.db_pagecount;
-        m_aRoot = CreatePage(m_nRootPage,NULL,TRUE);
+        m_aRoot = CreatePage(m_nRootPage,NULL,sal_True);
     }
     return m_aRoot;
 }
@@ -186,7 +186,7 @@ OIndexIterator* ODbaseIndex::createIterator(OBoolOperator* pOp,
     return new OIndexIterator(this, pOp, pOperand);
 }
 //------------------------------------------------------------------
-BOOL ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
     // Search a specific value in Index
@@ -208,13 +208,13 @@ BOOL ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValu
     catch (Exception&)
     {
         OSL_ASSERT(0);
-        return FALSE;
+        return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     openIndexFile();
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -225,7 +225,7 @@ BOOL ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     openIndexFile();
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -234,35 +234,35 @@ BOOL ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
     // Does the value already exist
     // Use Find() always to determine the actual leaf
     if (!ConvertToKey(&aKey, nRec, rValue) || (getRoot()->Find(aKey) && isUnique()))
-        return FALSE;
+        return sal_False;
 
     ONDXNode aNewNode(aKey);
 
     // insert in the current leaf
     if (!m_aCurLeaf.Is())
-        return FALSE;
+        return sal_False;
 
-    BOOL bResult = m_aCurLeaf->Insert(aNewNode);
+    sal_Bool bResult = m_aCurLeaf->Insert(aNewNode);
     Release(bResult);
 
     return bResult;
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseIndex::Update(sal_uInt32 nRec, const ORowSetValue& rOldValue,
+sal_Bool ODbaseIndex::Update(sal_uInt32 nRec, const ORowSetValue& rOldValue,
                          const ORowSetValue& rNewValue)
 {
     openIndexFile();
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
     ONDXKey aKey;
     if (!ConvertToKey(&aKey, nRec, rNewValue) || (isUnique() && getRoot()->Find(aKey)))
-        return FALSE;
+        return sal_False;
     else
         return Delete(nRec, rOldValue) && Insert(nRec,rNewValue);
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
+sal_Bool ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     openIndexFile();
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -270,13 +270,13 @@ BOOL ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
     // Always use Find() to determine the actual leaf
     ONDXKey aKey;
     if (!ConvertToKey(&aKey, nRec, rValue) || !getRoot()->Find(aKey))
-        return FALSE;
+        return sal_False;
 
     ONDXNode aNewNode(aKey);
 
     // insert in the current leaf
     if (!m_aCurLeaf.Is())
-        return FALSE;
+        return sal_False;
 #if OSL_DEBUG_LEVEL > 1
     m_aRoot->PrintPage();
 #endif
@@ -290,10 +290,10 @@ void ODbaseIndex::Collect(ONDXPage* pPage)
         m_aCollector.push_back(pPage);
 }
 //------------------------------------------------------------------
-void ODbaseIndex::Release(BOOL bSave)
+void ODbaseIndex::Release(sal_Bool bSave)
 {
     // Release the Index-recources
-    m_bUseCollector = FALSE;
+    m_bUseCollector = sal_False;
 
     if (m_aCurLeaf.Is())
     {
@@ -308,7 +308,7 @@ void ODbaseIndex::Release(BOOL bSave)
         m_aRoot.Clear();
     }
     // Release all references, before the FileStream will be closed
-    for (ULONG i = 0; i < m_aCollector.size(); i++)
+    for (sal_uIntPtr i = 0; i < m_aCollector.size(); i++)
         m_aCollector[i]->QueryDelete();
 
     m_aCollector.clear();
@@ -336,7 +336,7 @@ void ODbaseIndex::closeImpl()
     }
 }
 //------------------------------------------------------------------
-ONDXPage* ODbaseIndex::CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent, BOOL bLoad)
+ONDXPage* ODbaseIndex::CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent, sal_Bool bLoad)
 {
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
 
@@ -401,14 +401,14 @@ void ODbaseIndex::createINFEntry()
     Config aInfFile(sPhysicalPath);
     aInfFile.SetGroup(dBASE_III_GROUP);
 
-    USHORT nSuffix = aInfFile.GetKeyCount();
+    sal_uInt16 nSuffix = aInfFile.GetKeyCount();
     ByteString aNewEntry,aKeyName;
-    BOOL bCase = isCaseSensitive();
+    sal_Bool bCase = isCaseSensitive();
     while (!aNewEntry.Len())
     {
         aNewEntry = "NDX";
         aNewEntry += ByteString::CreateFromInt32(++nSuffix);
-        for (USHORT i = 0; i < aInfFile.GetKeyCount(); i++)
+        for (sal_uInt16 i = 0; i < aInfFile.GetKeyCount(); i++)
         {
             aKeyName = aInfFile.GetKeyName(i);
             if (bCase ? aKeyName == aNewEntry : aKeyName.EqualsIgnoreCaseAscii(aNewEntry))
@@ -421,7 +421,7 @@ void ODbaseIndex::createINFEntry()
     aInfFile.WriteKey(aNewEntry,ByteString(sEntry,m_pTable->getConnection()->getTextEncoding()));
 }
 // -------------------------------------------------------------------------
-BOOL ODbaseIndex::DropImpl()
+sal_Bool ODbaseIndex::DropImpl()
 {
     closeImpl();
 
@@ -444,13 +444,13 @@ BOOL ODbaseIndex::DropImpl()
 
     Config aInfFile(sPhysicalPath);
     aInfFile.SetGroup(dBASE_III_GROUP);
-    USHORT nKeyCnt = aInfFile.GetKeyCount();
+    sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
     ByteString aKeyName;
     String sEntry = m_Name;
     sEntry += String::CreateFromAscii(".ndx");
 
     // delete entries from the inf file
-    for (USHORT nKey = 0; nKey < nKeyCnt; nKey++)
+    for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
     {
         // References the Key to an Index-file?
         aKeyName = aInfFile.GetKeyName( nKey );
@@ -463,7 +463,7 @@ BOOL ODbaseIndex::DropImpl()
             }
         }
     }
-    return TRUE;
+    return sal_True;
 }
 // -------------------------------------------------------------------------
 void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::rtl::OUString& _sFile)
@@ -474,7 +474,7 @@ void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::
     m_pTable->getConnection()->throwGenericSQLException(_nErrorId,*this);
 }
 //------------------------------------------------------------------
-BOOL ODbaseIndex::CreateImpl()
+sal_Bool ODbaseIndex::CreateImpl()
 {
     // Create the Index
     const ::rtl::OUString sFile = getCompletePath();
@@ -556,7 +556,7 @@ BOOL ODbaseIndex::CreateImpl()
     xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType;
 
     m_aHeader.db_keytype = (nType == DataType::VARCHAR || nType == DataType::CHAR) ? 0 : 1;
-    m_aHeader.db_keylen  = (m_aHeader.db_keytype) ? 8 : (USHORT)getINT32(xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
+    m_aHeader.db_keylen  = (m_aHeader.db_keytype) ? 8 : (sal_uInt16)getINT32(xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
     m_aHeader.db_keylen = (( m_aHeader.db_keylen - 1) / 4 + 1) * 4;
     m_aHeader.db_maxkeys = (PAGE_SIZE - 4) / (8 + m_aHeader.db_keylen);
     if ( m_aHeader.db_maxkeys < 3 )
@@ -567,7 +567,7 @@ BOOL ODbaseIndex::CreateImpl()
     m_pFileStream->SetStreamSize(PAGE_SIZE);
 
     ByteString aCol(aName,m_pTable->getConnection()->getTextEncoding());
-    strncpy(m_aHeader.db_name,aCol.GetBuffer(),std::min((USHORT)sizeof(m_aHeader.db_name), aCol.Len()));
+    strncpy(m_aHeader.db_name,aCol.GetBuffer(),std::min((sal_uInt16)sizeof(m_aHeader.db_name), aCol.Len()));
     m_aHeader.db_unique  = m_IsUnique ? 1: 0;
     m_aHeader.db_keyrec  = m_aHeader.db_keylen + 8;
 
@@ -577,9 +577,9 @@ BOOL ODbaseIndex::CreateImpl()
     m_nPageCount = 2;
 
     m_aCurLeaf = m_aRoot = CreatePage(m_nRootPage);
-    m_aRoot->SetModified(TRUE);
+    m_aRoot->SetModified(sal_True);
 
-    m_bUseCollector = TRUE;
+    m_bUseCollector = sal_True;
 
     sal_Int32 nRowsLeft = 0;
     Reference<XRow> xRow(xSet,UNO_QUERY);
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 3b9d1302e86b..36268b7b30d1 100644..100755
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -70,7 +70,7 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName
                                                     ,sal_False
                                                     ,sal_False
                                                     ,sal_False
-                                                    ,pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+                                                    ,pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 
     return xRet;
 }
@@ -83,7 +83,7 @@ void ODbaseIndexColumns::impl_refresh() throw(RuntimeException)
 // -------------------------------------------------------------------------
 Reference< XPropertySet > ODbaseIndexColumns::createDescriptor()
 {
-    return new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+    return new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 // -------------------------------------------------------------------------
 sdbcx::ObjectType ODbaseIndexColumns::appendObject( const ::rtl::OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor )
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index f1335c7c0531..22bcd43da980 100644..100755
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -46,20 +46,20 @@ OIndexIterator::~OIndexIterator()
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::First()
+sal_uIntPtr OIndexIterator::First()
 {
-    return Find(TRUE);
+    return Find(sal_True);
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::Next()
+sal_uIntPtr OIndexIterator::Next()
 {
-    return Find(FALSE);
+    return Find(sal_False);
 }
 //------------------------------------------------------------------
-ULONG OIndexIterator::Find(BOOL bFirst)
+sal_uIntPtr OIndexIterator::Find(sal_Bool bFirst)
 {
-    ULONG nRes = STRING_NOTFOUND;
+    sal_uIntPtr nRes = STRING_NOTFOUND;
 
     if (bFirst)
     {
@@ -103,7 +103,7 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
     // '<='-condition are saved. this is considered for inserts.
     //  ONDXIndex* m_pIndex = GetNDXIndex();
     OOp_COMPARE aTempOp(SQLFilterOperator::GREATER);
-    USHORT i = 0;
+    sal_uInt16 i = 0;
 
     if (pPage->IsLeaf())
     {
@@ -141,7 +141,7 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::GetCompare(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetCompare(sal_Bool bFirst)
 {
     ONDXKey* pKey = NULL;
     sal_Int32 ePredicateType = PTR_CAST(file::OOp_COMPARE,m_pOperator)->getPredicateType();
@@ -211,7 +211,7 @@ ULONG OIndexIterator::GetCompare(BOOL bFirst)
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::GetLike(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetLike(sal_Bool bFirst)
 {
     if (bFirst)
     {
@@ -231,7 +231,7 @@ ULONG OIndexIterator::GetLike(BOOL bFirst)
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::GetNull(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetNull(sal_Bool bFirst)
 {
     if (bFirst)
     {
@@ -253,15 +253,15 @@ ULONG OIndexIterator::GetNull(BOOL bFirst)
 }
 
 //------------------------------------------------------------------
-ULONG OIndexIterator::GetNotNull(BOOL bFirst)
+sal_uIntPtr OIndexIterator::GetNotNull(sal_Bool bFirst)
 {
     ONDXKey* pKey;
     if (bFirst)
     {
         // erst alle NULL werte abklappern
-        for (ULONG nRec = GetNull(bFirst);
+        for (sal_uIntPtr nRec = GetNull(bFirst);
              nRec != STRING_NOTFOUND;
-             nRec = GetNull(FALSE))
+             nRec = GetNull(sal_False))
                  ;
         pKey = m_aCurLeaf.Is() ? &(*m_aCurLeaf)[m_nCurNode].GetKey() : NULL;
     }
@@ -283,7 +283,7 @@ ONDXKey* OIndexIterator::GetNextKey()
             ONDXPage* pParentPage = pPage->GetParent();
             if (pParentPage)
             {
-                USHORT nPos = pParentPage->Search(pPage);
+                sal_uInt16 nPos = pParentPage->Search(pPage);
                 if (nPos != pParentPage->Count() - 1)
                 {   // page found
                     pPage = (*pParentPage)[nPos+1].GetChild(m_pIndex,pParentPage);
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index b65e2158aa43..b65e2158aa43 100644..100755
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
diff --git a/connectivity/source/drivers/dbase/DNoException.cxx b/connectivity/source/drivers/dbase/DNoException.cxx
index 7a0c7af5228f..b130547e9265 100644..100755
--- a/connectivity/source/drivers/dbase/DNoException.cxx
+++ b/connectivity/source/drivers/dbase/DNoException.cxx
@@ -91,7 +91,7 @@ sal_Bool ODbaseTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_In
         OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
         sal_Int32 nPos = m_aHeader.db_kopf + (sal_Int32)(m_nFilePos-1) * nEntryLen;
 
-        ULONG nLen = m_pFileStream->Seek(nPos);
+        sal_uIntPtr nLen = m_pFileStream->Seek(nPos);
         if (m_pFileStream->GetError() != ERRCODE_NONE)
             goto Error;
 
@@ -127,10 +127,10 @@ End:
     return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
+sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemo" );
-    BOOL bIsText = TRUE;
+    bool bIsText = true;
 
     m_pMemoStream->Seek(nBlockNo * m_aMemoHeader.db_size);
     switch (m_aMemoHeader.db_typ)
@@ -141,13 +141,13 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
             ByteString aBStr;
             static char aBuf[514];
             aBuf[512] = 0;          // to prevent a random value
-            BOOL bReady = sal_False;
+            bool bReady = false;
 
             do
             {
                 m_pMemoStream->Read(&aBuf,512);
 
-                USHORT i = 0;
+                sal_uInt16 i = 0;
                 while (aBuf[i] != cEOF && ++i < 512)
                     ;
                 bReady = aBuf[i] == cEOF;
@@ -169,14 +169,14 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
             // Foxpro stores text and binary data
             if (m_aMemoHeader.db_typ == MemoFoxPro)
             {
-                if (((BYTE)sHeader[0]) != 0 || ((BYTE)sHeader[1]) != 0 || ((BYTE)sHeader[2]) != 0)
+                if (((sal_uInt8)sHeader[0]) != 0 || ((sal_uInt8)sHeader[1]) != 0 || ((sal_uInt8)sHeader[2]) != 0)
                 {
                     return sal_False;
                 }
 
                 bIsText = sHeader[3] != 0;
             }
-            else if (((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+            else if (((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
             {
                 return sal_False;
             }
@@ -215,7 +215,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
 void ODbaseTable::AllocBuffer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::AllocBuffer" );
-    UINT16 nSize = m_aHeader.db_slng;
+    sal_uInt16 nSize = m_aHeader.db_slng;
     OSL_ENSURE(nSize > 0, "Size too small");
 
     if (m_nBufferSize != nSize)
@@ -228,11 +228,11 @@ void ODbaseTable::AllocBuffer()
     if (m_pBuffer == NULL && nSize)
     {
         m_nBufferSize = nSize;
-        m_pBuffer       = new BYTE[m_nBufferSize+1];
+        m_pBuffer       = new sal_uInt8[m_nBufferSize+1];
     }
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteBuffer()
+sal_Bool ODbaseTable::WriteBuffer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteBuffer" );
     OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
@@ -268,7 +268,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
     else
     {
         ByteString aBuf;
-        USHORT nLen = rIndex.getHeader().db_keylen;
+        sal_uInt16 nLen = rIndex.getHeader().db_keylen;
         char* pStr = aBuf.AllocBuffer(nLen+1);
 
         rStream.Read(pStr,nLen);
@@ -301,7 +301,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
         if (aKey.getValue().isNull())
         {
             memset(aNodeData.aData,0,rIndex.getHeader().db_keylen);
-            rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+            rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
         }
         else
             rStream << (double) aKey.getValue();
@@ -315,7 +315,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
             ByteString aText(sValue.getStr(), rIndex.m_pTable->getConnection()->getTextEncoding());
             strncpy(aNodeData.aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen, aText.Len()));
         }
-        rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+        rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
     }
     rStream << aChild;
 }
@@ -336,7 +336,7 @@ ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent)
 // ONDXKey
 //==================================================================
 //------------------------------------------------------------------
-BOOL ONDXKey::IsText(sal_Int32 eType)
+sal_Bool ONDXKey::IsText(sal_Int32 eType)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXKey::IsText" );
     return eType == DataType::VARCHAR || eType == DataType::CHAR;
@@ -364,7 +364,7 @@ StringCompare ONDXKey::Compare(const ONDXKey& rKey) const
     }
     else if (IsText(getDBType()))
     {
-        INT32 nRes = getValue().getString().compareTo(rKey.getValue());
+        sal_Int32 nRes = getValue().getString().compareTo(rKey.getValue());
         eResult = (nRes > 0) ? COMPARE_GREATER : (nRes == 0) ? COMPARE_EQUAL : COMPARE_LESS;
     }
     else
@@ -441,15 +441,15 @@ ONDXPagePtr& ONDXPagePtr::operator= (ONDXPage* pRef)
     return *this;
 }
 // -----------------------------------------------------------------------------
-static UINT32 nValue;
+static sal_uInt32 nValue;
 //------------------------------------------------------------------
 SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 {
     rStream.Seek(rPage.GetPagePos() * 512);
     rStream >> nValue >> rPage.aChild;
-    rPage.nCount = USHORT(nValue);
+    rPage.nCount = sal_uInt16(nValue);
 
-    for (USHORT i = 0; i < rPage.nCount; i++)
+    for (sal_uInt16 i = 0; i < rPage.nCount; i++)
         rPage[i].Read(rStream, rPage.GetIndex());
     return rStream;
 }
@@ -458,7 +458,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& rPage)
 {
     // Page does not yet exist
-    ULONG nSize = (rPage.GetPagePos() + 1) * 512;
+    sal_uIntPtr nSize = (rPage.GetPagePos() + 1) * 512;
     if (nSize > rStream.Seek(STREAM_SEEK_TO_END))
     {
         rStream.SetStreamSize(nSize);
@@ -466,27 +466,27 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r
 
         char aEmptyData[512];
         memset(aEmptyData,0x00,512);
-        rStream.Write((BYTE*)aEmptyData,512);
+        rStream.Write((sal_uInt8*)aEmptyData,512);
     }
-    ULONG nCurrentPos = rStream.Seek(rPage.GetPagePos() * 512);
+    sal_uIntPtr nCurrentPos = rStream.Seek(rPage.GetPagePos() * 512);
     OSL_UNUSED( nCurrentPos );
 
     nValue = rPage.nCount;
     rStream << nValue << rPage.aChild;
 
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     for (; i < rPage.nCount; i++)
         rPage[i].Write(rStream, rPage);
 
     // check if we have to fill the stream with '\0'
     if(i < rPage.rIndex.getHeader().db_maxkeys)
     {
-        ULONG nTell = rStream.Tell() % 512;
-        USHORT nBufferSize = rStream.GetBufferSize();
-        ULONG nSize = nBufferSize - nTell;
+        sal_uIntPtr nTell = rStream.Tell() % 512;
+        sal_uInt16 nBufferSize = rStream.GetBufferSize();
+        sal_uIntPtr nSize = nBufferSize - nTell;
         char* pEmptyData = new char[nSize];
         memset(pEmptyData,0x00,nSize);
-        rStream.Write((BYTE*)pEmptyData,nSize);
+        rStream.Write((sal_uInt8*)pEmptyData,nSize);
         rStream.Seek(nTell);
         delete [] pEmptyData;
     }
@@ -501,7 +501,7 @@ void ONDXPage::PrintPage()
     OSL_TRACE("\nSDB: -----------Page: %d  Parent: %d  Count: %d  Child: %d-----",
         nPagePos, HasParent() ? aParent->GetPagePos() : 0 ,nCount, aChild.GetPagePos());
 
-    for (USHORT i = 0; i < nCount; i++)
+    for (sal_uInt16 i = 0; i < nCount; i++)
     {
         ONDXNode rNode = (*this)[i];
         ONDXKey&  rKey = rNode.GetKey();
@@ -526,7 +526,7 @@ void ONDXPage::PrintPage()
     {
 #if OSL_DEBUG_LEVEL > 1
         GetChild(&rIndex)->PrintPage();
-        for (USHORT i = 0; i < nCount; i++)
+        for (sal_uInt16 i = 0; i < nCount; i++)
         {
             ONDXNode rNode = (*this)[i];
             rNode.GetChild(&rIndex,this)->PrintPage();
@@ -537,18 +537,18 @@ void ONDXPage::PrintPage()
 }
 #endif
 // -----------------------------------------------------------------------------
-BOOL ONDXPage::IsFull() const
+sal_Bool ONDXPage::IsFull() const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::IsFull" );
     return Count() == rIndex.getHeader().db_maxkeys;
 }
 // -----------------------------------------------------------------------------
 //------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXKey& rSearch)
+sal_uInt16 ONDXPage::Search(const ONDXKey& rSearch)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Search" );
     // binary search afterwards
-    USHORT i = 0xFFFF;
+    sal_uInt16 i = 0xFFFF;
     while (++i < Count())
         if ((*this)[i].GetKey() == rSearch)
             break;
@@ -557,10 +557,10 @@ USHORT ONDXPage::Search(const ONDXKey& rSearch)
 }
 
 //------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXPage* pPage)
+sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Search" );
-    USHORT i = 0xFFFF;
+    sal_uInt16 i = 0xFFFF;
     while (++i < Count())
         if (((*this)[i]).GetChild() == pPage)
             break;
@@ -577,7 +577,7 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
     OSL_ENSURE(rSearch != rReplace,"Invalid here:rSearch == rReplace");
     if (rSearch != rReplace)
     {
-        USHORT nPos = NODE_NOTFOUND;
+        sal_uInt16 nPos = NODE_NOTFOUND;
         ONDXPage* pPage = this;
 
         while (pPage && (nPos = pPage->Search(rSearch)) == NODE_NOTFOUND)
@@ -586,34 +586,34 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
         if (pPage)
         {
             (*pPage)[nPos].GetKey() = rReplace;
-            pPage->SetModified(TRUE);
+            pPage->SetModified(sal_True);
         }
     }
 }
 // -----------------------------------------------------------------------------
-ONDXNode& ONDXPage::operator[] (USHORT nPos)
+ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos)
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 
 //------------------------------------------------------------------
-const ONDXNode& ONDXPage::operator[] (USHORT nPos) const
+const ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos) const
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 // -----------------------------------------------------------------------------
-void ONDXPage::Remove(USHORT nPos)
+void ONDXPage::Remove(sal_uInt16 nPos)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ONDXPage::Remove" );
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
 
-    for (USHORT i = nPos; i < (nCount-1); i++)
+    for (sal_uInt16 i = nPos; i < (nCount-1); i++)
         (*this)[i] = (*this)[i+1];
 
     nCount--;
-    bModified = TRUE;
+    bModified = sal_True;
 }
 // -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/dbase/DPreparedStatement.cxx b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
index d67b477e3385..d67b477e3385 100644..100755
--- a/connectivity/source/drivers/dbase/DPreparedStatement.cxx
+++ b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 2d908607a324..2d908607a324 100644..100755
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
diff --git a/connectivity/source/drivers/dbase/DStatement.cxx b/connectivity/source/drivers/dbase/DStatement.cxx
index a6038aea6825..a6038aea6825 100644..100755
--- a/connectivity/source/drivers/dbase/DStatement.cxx
+++ b/connectivity/source/drivers/dbase/DStatement.cxx
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 123e68330715..5630800b47f2 100644..100755
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -208,12 +208,12 @@ void ODbaseTable::readHeader()
     m_pFileStream->RefreshBuffer(); // Make sure, that the header information actually is read again
     m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
 
-    BYTE nType=0;
+    sal_uInt8 nType=0;
     (*m_pFileStream) >> nType;
     if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
         throwInvalidDbaseFormat();
 
-    m_pFileStream->Read((char*)(&m_aHeader.db_aedat), 3*sizeof(BYTE));
+    m_pFileStream->Read((char*)(&m_aHeader.db_aedat), 3*sizeof(sal_uInt8));
     if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
         throwInvalidDbaseFormat();
     (*m_pFileStream) >> m_aHeader.db_anz;
@@ -225,7 +225,7 @@ void ODbaseTable::readHeader()
     (*m_pFileStream) >> m_aHeader.db_slng;
     if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
         throwInvalidDbaseFormat();
-    m_pFileStream->Read((char*)(&m_aHeader.db_frei), 20*sizeof(BYTE));
+    m_pFileStream->Read((char*)(&m_aHeader.db_frei), 20*sizeof(sal_uInt8));
     if(ERRCODE_NONE != m_pFileStream->GetErrorCode())
         throwInvalidDbaseFormat();
 
@@ -319,7 +319,7 @@ void ODbaseTable::fillColumns()
     aStrFieldName.AssignAscii("Column");
     ::rtl::OUString aTypeName;
     static const ::rtl::OUString sVARCHAR(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
-    const sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+    const sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
     const bool bFoxPro = m_aHeader.db_typ == VisualFoxPro || m_aHeader.db_typ == VisualFoxProAuto || m_aHeader.db_typ == FoxProMemo;
 
     sal_Int32 i = 0;
@@ -528,7 +528,7 @@ void ODbaseTable::construct()
         }
         fillColumns();
 
-        UINT32 nFileSize = lcl_getFileSize(*m_pFileStream);
+        sal_uInt32 nFileSize = lcl_getFileSize(*m_pFileStream);
         m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
         if ( m_aHeader.db_anz == 0 && ((nFileSize-m_aHeader.db_kopf)/m_aHeader.db_slng) > 0) // seems to be empty or someone wrote bullshit into the dbase file
             m_aHeader.db_anz = ((nFileSize-m_aHeader.db_kopf)/m_aHeader.db_slng);
@@ -556,7 +556,7 @@ void ODbaseTable::construct()
     }
 }
 //------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemoHeader()
+sal_Bool ODbaseTable::ReadMemoHeader()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemoHeader" );
     m_pMemoStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
@@ -580,7 +580,7 @@ BOOL ODbaseTable::ReadMemoHeader()
                 m_pMemoStream->Seek(m_aMemoHeader.db_size);
                 m_pMemoStream->Read(sHeader,4);
 
-                if ((m_pMemoStream->GetErrorCode() != ERRCODE_NONE) || ((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+                if ((m_pMemoStream->GetErrorCode() != ERRCODE_NONE) || ((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
                     m_aMemoHeader.db_typ  = MemodBaseIII;
                 else
                     m_aMemoHeader.db_typ  = MemodBaseIV;
@@ -603,7 +603,7 @@ BOOL ODbaseTable::ReadMemoHeader()
             OSL_FAIL( "ODbaseTable::ReadMemoHeader: unsupported memo type!" );
             break;
     }
-    return TRUE;
+    return sal_True;
 }
 // -------------------------------------------------------------------------
 String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _sName )
@@ -679,11 +679,11 @@ void ODbaseTable::refreshIndexes()
         aURL.setExtension(String::CreateFromAscii("inf"));
         Config aInfFile(aURL.getFSysPath(INetURLObject::FSYS_DETECT));
         aInfFile.SetGroup(dBASE_III_GROUP);
-        USHORT nKeyCnt = aInfFile.GetKeyCount();
+        sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
         ByteString aKeyName;
         ByteString aIndexName;
 
-        for (USHORT nKey = 0; nKey < nKeyCnt; nKey++)
+        for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
         {
             // Refences the key an index-file?
             aKeyName = aInfFile.GetKeyName( nKey );
@@ -786,7 +786,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::fetchRow" );
     // Read the data
-    BOOL bIsCurRecordDeleted = ((char)m_pBuffer[0] == '*') ? TRUE : sal_False;
+    bool bIsCurRecordDeleted = (char)m_pBuffer[0] == '*';
 
     // only read the bookmark
 
@@ -795,7 +795,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
     *(_rRow->get())[0] = m_nFilePos;
 
     if (!bRetrieveData)
-        return TRUE;
+        return sal_True;
 
     sal_Size nByteOffset = 1;
     // Fields:
@@ -968,13 +968,13 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
                 break;
                 case DataType::BIT:
                 {
-                    BOOL b;
+                    sal_Bool b;
                     switch (* ((const char *)pData))
                     {
                         case 'T':
                         case 'Y':
-                        case 'J':   b = TRUE; break;
-                        default:    b = FALSE; break;
+                        case 'J':   b = sal_True; break;
+                        default:    b = sal_False; break;
                     }
                     *(_rRow->get())[i] = b;
                 }
@@ -1019,7 +1019,7 @@ void ODbaseTable::FileClose()
     ODbaseTable_BASE::FileClose();
 }
 // -------------------------------------------------------------------------
-BOOL ODbaseTable::CreateImpl()
+sal_Bool ODbaseTable::CreateImpl()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateImpl" );
     OSL_ENSURE(!m_pFileStream, "SequenceError");
@@ -1068,7 +1068,7 @@ BOOL ODbaseTable::CreateImpl()
     {
     }
 
-    BOOL bMemoFile = sal_False;
+    sal_Bool bMemoFile = sal_False;
 
     sal_Bool bOk = CreateFile(aURL, bMemoFile);
 
@@ -1131,7 +1131,7 @@ BOOL ODbaseTable::CreateImpl()
     else
         m_aHeader.db_typ = dBaseIII;
 
-    return TRUE;
+    return sal_True;
 }
 // -----------------------------------------------------------------------------
 void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl::OUString& _sColumnName)
@@ -1154,7 +1154,7 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl:
 }
 //------------------------------------------------------------------
 // creates in principle dBase IV file format
-BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
+sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateFile" );
     bCreateMemo = sal_False;
@@ -1165,7 +1165,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
     if (!m_pFileStream)
         return sal_False;
 
-    BYTE nDbaseType = dBaseIII;
+    sal_uInt8 nDbaseType = dBaseIII;
     Reference<XIndexAccess> xColumns(getColumns(),UNO_QUERY);
     Reference<XPropertySet> xCol;
     const ::rtl::OUString sPropType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
@@ -1207,19 +1207,19 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
     memset(aBuffer,0,sizeof(aBuffer));
 
     m_pFileStream->Seek(0L);
-    (*m_pFileStream) << (BYTE) nDbaseType;                              // dBase format
-    (*m_pFileStream) << (BYTE) (aDate.GetYear() % 100);                 // current date
+    (*m_pFileStream) << (sal_uInt8) nDbaseType;                              // dBase format
+    (*m_pFileStream) << (sal_uInt8) (aDate.GetYear() % 100);                 // current date
 
 
-    (*m_pFileStream) << (BYTE) aDate.GetMonth();
-    (*m_pFileStream) << (BYTE) aDate.GetDay();
+    (*m_pFileStream) << (sal_uInt8) aDate.GetMonth();
+    (*m_pFileStream) << (sal_uInt8) aDate.GetDay();
     (*m_pFileStream) << 0L;                                             // number of data records
-    (*m_pFileStream) << (USHORT)((m_pColumns->getCount()+1) * 32 + 1);  // header information,
+    (*m_pFileStream) << (sal_uInt16)((m_pColumns->getCount()+1) * 32 + 1);  // header information,
                                                                         // pColumns contains always an additional column
-    (*m_pFileStream) << (USHORT) 0;                                     // record length will be determined later
+    (*m_pFileStream) << (sal_uInt16) 0;                                     // record length will be determined later
     m_pFileStream->Write(aBuffer, 20);
 
-    USHORT nRecLength = 1;                                              // Length 1 for deleted flag
+    sal_uInt16 nRecLength = 1;                                              // Length 1 for deleted flag
     sal_Int32  nMaxFieldLength = m_pConnection->getMetaData()->getMaxColumnNameLength();
     ::rtl::OUString aName;
     const ::rtl::OUString sPropName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
@@ -1312,9 +1312,9 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
                     {
                         throwInvalidColumnType(STR_INVALID_COLUMN_PRECISION, aName);
                     }
-                    (*m_pFileStream) << (BYTE) Min((unsigned)nPrecision, 255U);      // field length
-                    nRecLength = nRecLength + (USHORT)::std::min((USHORT)nPrecision, (USHORT)255UL);
-                    (*m_pFileStream) << (BYTE)0;                                                                // decimals
+                    (*m_pFileStream) << (sal_uInt8) Min((unsigned)nPrecision, 255U);      // field length
+                    nRecLength = nRecLength + (sal_uInt16)::std::min((sal_uInt16)nPrecision, (sal_uInt16)255UL);
+                    (*m_pFileStream) << (sal_uInt8)0;                                                                // decimals
                     break;
                 case 'F':
                 case 'N':
@@ -1326,41 +1326,41 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
                     }
                     if (getBOOL(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))) // Currency will be treated separately
                     {
-                        (*m_pFileStream) << (BYTE)10;          // standard length
-                        (*m_pFileStream) << (BYTE)4;
+                        (*m_pFileStream) << (sal_uInt8)10;          // standard length
+                        (*m_pFileStream) << (sal_uInt8)4;
                         nRecLength += 10;
                     }
                     else
                     {
                         sal_Int32 nPrec = SvDbaseConverter::ConvertPrecisionToDbase(nPrecision,nScale);
 
-                        (*m_pFileStream) << (BYTE)( nPrec);
-                        (*m_pFileStream) << (BYTE)nScale;
-                        nRecLength += (USHORT)nPrec;
+                        (*m_pFileStream) << (sal_uInt8)( nPrec);
+                        (*m_pFileStream) << (sal_uInt8)nScale;
+                        nRecLength += (sal_uInt16)nPrec;
                     }
                     break;
                 case 'L':
-                    (*m_pFileStream) << (BYTE)1;
-                    (*m_pFileStream) << (BYTE)0;
+                    (*m_pFileStream) << (sal_uInt8)1;
+                    (*m_pFileStream) << (sal_uInt8)0;
                     ++nRecLength;
                     break;
                 case 'I':
-                    (*m_pFileStream) << (BYTE)4;
-                    (*m_pFileStream) << (BYTE)0;
+                    (*m_pFileStream) << (sal_uInt8)4;
+                    (*m_pFileStream) << (sal_uInt8)0;
                     nRecLength += 4;
                     break;
                 case 'Y':
                 case 'B':
                 case 'T':
                 case 'D':
-                    (*m_pFileStream) << (BYTE)8;
-                    (*m_pFileStream) << (BYTE)0;
+                    (*m_pFileStream) << (sal_uInt8)8;
+                    (*m_pFileStream) << (sal_uInt8)0;
                     nRecLength += 8;
                     break;
                 case 'M':
-                    bCreateMemo = TRUE;
-                    (*m_pFileStream) << (BYTE)10;
-                    (*m_pFileStream) << (BYTE)0;
+                    bCreateMemo = sal_True;
+                    (*m_pFileStream) << (sal_uInt8)10;
+                    (*m_pFileStream) << (sal_uInt8)0;
                     nRecLength += 10;
                     if ( bBinary )
                         aBuffer[0] = 0x06;
@@ -1372,7 +1372,7 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
             aBuffer[0] = 0x00;
         }
 
-        (*m_pFileStream) << (BYTE)FIELD_DESCRIPTOR_TERMINATOR;              // end of header
+        (*m_pFileStream) << (sal_uInt8)FIELD_DESCRIPTOR_TERMINATOR;              // end of header
         (*m_pFileStream) << (char)DBF_EOL;
         m_pFileStream->Seek(10L);
         (*m_pFileStream) << nRecLength;                                     // set record length afterwards
@@ -1381,9 +1381,9 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
         {
             m_pFileStream->Seek(0L);
             if (nDbaseType == VisualFoxPro)
-                (*m_pFileStream) << (BYTE) FoxProMemo;
+                (*m_pFileStream) << (sal_uInt8) FoxProMemo;
             else
-                (*m_pFileStream) << (BYTE) dBaseIIIMemo;
+                (*m_pFileStream) << (sal_uInt8) dBaseIIIMemo;
         } // if (bCreateMemo)
     }
     catch ( const Exception& e )
@@ -1398,12 +1398,12 @@ BOOL ODbaseTable::CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo)
         catch(const Exception&) { }
         throw;
     }
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------
 // creates in principle dBase III file format
-BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
+sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateMemoFile" );
     // filehandling macro for table creation
@@ -1415,16 +1415,8 @@ BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
     char aBuffer[512];              // write buffer
     memset(aBuffer,0,sizeof(aBuffer));
 
-#ifdef WIN
-    m_pMemoStream->Seek(0L);
-    for (UINT16 i = 0; i < 512; i++)
-    {
-        (*m_pMemoStream) << BYTE(0);
-    }
-#else
     m_pMemoStream->SetFiller('\0');
     m_pMemoStream->SetStreamSize(512);
-#endif
 
     m_pMemoStream->Seek(0L);
     (*m_pMemoStream) << long(1);                  // pointer to the first free block
@@ -1432,16 +1424,16 @@ BOOL ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
     m_pMemoStream->Flush();
     delete m_pMemoStream;
     m_pMemoStream = NULL;
-    return TRUE;
+    return sal_True;
 }
 //------------------------------------------------------------------
-BOOL ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
+sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::Drop_Static" );
     INetURLObject aURL;
     aURL.SetURL(_sUrl);
 
-    BOOL bDropped = ::utl::UCBContentHelper::Kill(aURL.GetMainURL(INetURLObject::NO_DECODE));
+    sal_Bool bDropped = ::utl::UCBContentHelper::Kill(aURL.GetMainURL(INetURLObject::NO_DECODE));
 
     if(bDropped)
     {
@@ -1484,7 +1476,7 @@ BOOL ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFie
     return bDropped;
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::DropImpl()
+sal_Bool ODbaseTable::DropImpl()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::DropImpl" );
     FileClose();
@@ -1492,7 +1484,7 @@ BOOL ODbaseTable::DropImpl()
     if(!m_pIndexes)
         refreshIndexes(); // look for indexes which must be deleted as well
 
-    BOOL bDropped = Drop_Static(getEntry(m_pConnection,m_Name),HasMemoFields(),m_pIndexes);
+    sal_Bool bDropped = Drop_Static(getEntry(m_pConnection,m_Name),HasMemoFields(),m_pIndexes);
     if(!bDropped)
     {// we couldn't drop the table so we have to reopen it
         construct();
@@ -1503,7 +1495,7 @@ BOOL ODbaseTable::DropImpl()
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<XIndexAccess>& _xCols)
+sal_Bool ODbaseTable::InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const Reference<XIndexAccess>& _xCols)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::InsertRow" );
     // fill buffer with blanks
@@ -1513,13 +1505,13 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X
 
     // Copy new row completely:
     // ... and add at the end as new Record:
-    UINT32 nTempPos = m_nFilePos;
+    sal_uInt32 nTempPos = m_nFilePos;
 
-    m_nFilePos = (ULONG)m_aHeader.db_anz + 1;
-    BOOL bInsertRow = UpdateBuffer( rRow, NULL, _xCols );
+    m_nFilePos = (sal_uIntPtr)m_aHeader.db_anz + 1;
+    sal_Bool bInsertRow = UpdateBuffer( rRow, NULL, _xCols );
     if ( bInsertRow )
     {
-        UINT32 nFileSize = 0, nMemoFileSize = 0;
+        sal_uInt32 nFileSize = 0, nMemoFileSize = 0;
 
         nFileSize = lcl_getFileSize(*m_pFileStream);
 
@@ -1561,7 +1553,7 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const Reference<XIndexAccess>& _xCols)
+sal_Bool ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const Reference<XIndexAccess>& _xCols)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::UpdateRow" );
     // fill buffer with blanks
@@ -1572,7 +1564,7 @@ BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const R
     m_pFileStream->Seek(nPos);
     m_pFileStream->Read((char*)m_pBuffer, m_aHeader.db_slng);
 
-    UINT32 nMemoFileSize( 0 );
+    sal_uInt32 nMemoFileSize( 0 );
     if (HasMemoFields() && m_pMemoStream)
     {
         m_pMemoStream->Seek(STREAM_SEEK_TO_END);
@@ -1591,7 +1583,7 @@ BOOL ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const R
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
+sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::DeleteRow" );
     // Set the Delete-Flag (be it set or not):
@@ -1601,13 +1593,13 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
 
     OValueRefRow aRow = new OValueRefVector(_rCols.get().size());
 
-    if (!fetchRow(aRow,_rCols,TRUE,TRUE))
+    if (!fetchRow(aRow,_rCols,sal_True,sal_True))
         return sal_False;
 
     Reference<XPropertySet> xCol;
     ::rtl::OUString aColName;
     ::comphelper::UStringMixEqual aCase(isCaseSensitive());
-    for (USHORT i = 0; i < m_pColumns->getCount(); i++)
+    for (sal_uInt16 i = 0; i < m_pColumns->getCount(); i++)
     {
         Reference<XPropertySet> xIndex = isUniqueByColumnName(i);
         if (xIndex.is())
@@ -1639,7 +1631,7 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
     }
 
     m_pFileStream->Seek(nFilePos);
-    (*m_pFileStream) << (BYTE)'*'; // mark the row in the table as deleted
+    (*m_pFileStream) << (sal_uInt8)'*'; // mark the row in the table as deleted
     m_pFileStream->Flush();
     return sal_True;
 }
@@ -1679,18 +1671,18 @@ double toDouble(const ByteString& rString)
 }
 
 //------------------------------------------------------------------
-BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const Reference<XIndexAccess>& _xCols)
+sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const Reference<XIndexAccess>& _xCols)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::UpdateBuffer" );
     OSL_ENSURE(m_pBuffer,"Buffer is NULL!");
     if ( !m_pBuffer )
-        return FALSE;
+        return sal_False;
     sal_Int32 nByteOffset  = 1;
 
     // Update fields:
     Reference<XPropertySet> xCol;
     Reference<XPropertySet> xIndex;
-    USHORT i;
+    sal_uInt16 i;
     ::rtl::OUString aColName;
     const sal_Int32 nColumnCount = m_pColumns->getCount();
     ::std::vector< Reference<XPropertySet> > aIndexedCols(nColumnCount);
@@ -1956,7 +1948,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
                     char cNext = pData[nLen]; // Mark's scratch and replaced by 0
                     pData[nLen] = '\0';       // This is because the buffer is always a sign of greater ...
 
-                    ULONG nBlockNo = strtol((const char *)pData,NULL,10);   // Block number read
+                    sal_uIntPtr nBlockNo = strtol((const char *)pData,NULL,10); // Block number read
 
                     // Next initial character restore again:
                     pData[nLen] = cNext;
@@ -2012,14 +2004,14 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const
 }
 
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
+sal_Bool ODbaseTable::WriteMemo(ORowSetValue& aVariable, sal_uIntPtr& rBlockNr)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteMemo" );
     // if the BlockNo 0 is given, the block will be appended at the end
-    ULONG nSize = 0;
+    sal_uIntPtr nSize = 0;
     ::rtl::OString aStr;
     ::com::sun::star::uno::Sequence<sal_Int8> aValue;
-    BYTE nHeader[4];
+    sal_uInt8 nHeader[4];
     const bool bBinary = aVariable.getTypeKind() == DataType::LONGVARBINARY && m_aMemoHeader.db_typ == MemoFoxPro;
     if ( bBinary )
     {
@@ -2032,7 +2024,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
     }
 
     // append or overwrite
-    BOOL bAppend = rBlockNr == 0;
+    sal_Bool bAppend = rBlockNr == 0;
 
     if (!bAppend)
     {
@@ -2049,7 +2041,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
                 m_pMemoStream->SeekRel(4L);
                 m_pMemoStream->Read(sHeader,4);
 
-                ULONG nOldSize;
+                sal_uIntPtr nOldSize;
                 if (m_aMemoHeader.db_typ == MemoFoxPro)
                     nOldSize = ((((unsigned char)sHeader[0]) * 256 +
                                  (unsigned char)sHeader[1]) * 256 +
@@ -2062,7 +2054,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
                                  (unsigned char)sHeader[0]  - 8;
 
                 // fits the new length in the used blocks
-                ULONG nUsedBlocks = ((nSize + 8) / m_aMemoHeader.db_size) + (((nSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0),
+                sal_uIntPtr nUsedBlocks = ((nSize + 8) / m_aMemoHeader.db_size) + (((nSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0),
                       nOldUsedBlocks = ((nOldSize + 8) / m_aMemoHeader.db_size) + (((nOldSize + 8) % m_aMemoHeader.db_size > 0) ? 1 : 0);
                 bAppend = nUsedBlocks > nOldUsedBlocks;
             }
@@ -2071,7 +2063,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
 
     if (bAppend)
     {
-        ULONG nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
+        sal_uIntPtr nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
         // fill last block
         rBlockNr = (nStreamSize / m_aMemoHeader.db_size) + ((nStreamSize % m_aMemoHeader.db_size) > 0 ? 1 : 0);
 
@@ -2096,30 +2088,30 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
         case MemodBaseIV: // dBase IV-Memofeld with length
         {
             if ( MemodBaseIV == m_aMemoHeader.db_typ )
-                (*m_pMemoStream) << (BYTE)0xFF
-                                 << (BYTE)0xFF
-                                 << (BYTE)0x08;
+                (*m_pMemoStream) << (sal_uInt8)0xFF
+                                 << (sal_uInt8)0xFF
+                                 << (sal_uInt8)0x08;
             else
-                (*m_pMemoStream) << (BYTE)0x00
-                                 << (BYTE)0x00
-                                 << (BYTE)0x00;
+                (*m_pMemoStream) << (sal_uInt8)0x00
+                                 << (sal_uInt8)0x00
+                                 << (sal_uInt8)0x00;
 
-            UINT32 nWriteSize = nSize;
+            sal_uInt32 nWriteSize = nSize;
             if (m_aMemoHeader.db_typ == MemoFoxPro)
             {
                 if ( bBinary )
-                    (*m_pMemoStream) << (BYTE) 0x00; // Picture
+                    (*m_pMemoStream) << (sal_uInt8) 0x00; // Picture
                 else
-                    (*m_pMemoStream) << (BYTE) 0x01; // Memo
+                    (*m_pMemoStream) << (sal_uInt8) 0x01; // Memo
                 for (int i = 4; i > 0; nWriteSize >>= 8)
-                    nHeader[--i] = (BYTE) (nWriteSize % 256);
+                    nHeader[--i] = (sal_uInt8) (nWriteSize % 256);
             }
             else
             {
-                (*m_pMemoStream) << (BYTE) 0x00;
+                (*m_pMemoStream) << (sal_uInt8) 0x00;
                 nWriteSize += 8;
                 for (int i = 0; i < 4; nWriteSize >>= 8)
-                    nHeader[i++] = (BYTE) (nWriteSize % 256);
+                    nHeader[i++] = (sal_uInt8) (nWriteSize % 256);
             }
 
             m_pMemoStream->Write(nHeader,4);
@@ -2135,7 +2127,7 @@ BOOL ODbaseTable::WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr)
     // Write the new block number
     if (bAppend)
     {
-        ULONG nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
+        sal_uIntPtr nStreamSize = m_pMemoStream->Seek(STREAM_SEEK_TO_END);
         m_aMemoHeader.db_next = (nStreamSize / m_aMemoHeader.db_size) + ((nStreamSize % m_aMemoHeader.db_size) > 0 ? 1 : 0);
 
         // Write the new block number
@@ -2192,7 +2184,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
         if(xOldColumn.is())
             xCopyColumn = xOldColumn->createDataDescriptor();
         else
-            xCopyColumn = new OColumn(getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+            xCopyColumn = new OColumn(getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 
         ::comphelper::copyProperties(descriptor,xCopyColumn);
 
@@ -2217,7 +2209,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
             if(xColumn.is())
                 xCpy = xColumn->createDataDescriptor();
             else
-                xCpy = new OColumn(getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+                xCpy = new OColumn(getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
             ::comphelper::copyProperties(xProp,xCpy);
             xAppend->appendByDescriptor(xCpy);
         }
@@ -2233,7 +2225,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
             if(xColumn.is())
                 xCpy = xColumn->createDataDescriptor();
             else
-                xCpy = new OColumn(getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+                xCpy = new OColumn(getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
             ::comphelper::copyProperties(xProp,xCpy);
             xAppend->appendByDescriptor(xCpy);
         }
@@ -2374,7 +2366,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
     pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
     {
         Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
-        sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+        sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
         // copy the structure
         for(sal_Int32 i=0;i < m_pColumns->getCount();++i)
         {
@@ -2407,7 +2399,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
         ::dbtools::throwGenericSQLException( sError, *this );
     }
 
-    BOOL bAlreadyDroped = FALSE;
+    sal_Bool bAlreadyDroped = sal_False;
     try
     {
         pNewTable->construct();
@@ -2416,7 +2408,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
         // drop the old table
         if(DropImpl())
         {
-            bAlreadyDroped = TRUE;
+            bAlreadyDroped = sal_True;
             pNewTable->renameImpl(m_Name);
             // release the temp file
         }
@@ -2447,7 +2439,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
     pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
     {
         Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
-        sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+        sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
         // copy the structure
         for(sal_Int32 i=0;i < m_pColumns->getCount();++i)
         {
@@ -2680,10 +2672,10 @@ End:
     return sal_True;
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
+sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::ReadMemo" );
-    BOOL bIsText = TRUE;
+    bool bIsText = true;
 
     m_pMemoStream->Seek(nBlockNo * m_aMemoHeader.db_size);
     switch (m_aMemoHeader.db_typ)
@@ -2694,13 +2686,13 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
             ByteString aBStr;
             static char aBuf[514];
             aBuf[512] = 0;          // avoid random value
-            BOOL bReady = sal_False;
+            sal_Bool bReady = sal_False;
 
             do
             {
                 m_pMemoStream->Read(&aBuf,512);
 
-                USHORT i = 0;
+                sal_uInt16 i = 0;
                 while (aBuf[i] != cEOF && ++i < 512)
                     ;
                 bReady = aBuf[i] == cEOF;
@@ -2724,7 +2716,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
             {
                 bIsText = sHeader[3] != 0;
             }
-            else if (((BYTE)sHeader[0]) != 0xFF || ((BYTE)sHeader[1]) != 0xFF || ((BYTE)sHeader[2]) != 0x08)
+            else if (((sal_uInt8)sHeader[0]) != 0xFF || ((sal_uInt8)sHeader[1]) != 0xFF || ((sal_uInt8)sHeader[2]) != 0x08)
             {
                 return sal_False;
             }
@@ -2773,7 +2765,7 @@ BOOL ODbaseTable::ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable)
 void ODbaseTable::AllocBuffer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::AllocBuffer" );
-    UINT16 nSize = m_aHeader.db_slng;
+    sal_uInt16 nSize = m_aHeader.db_slng;
     OSL_ENSURE(nSize > 0, "Size too small");
 
     if (m_nBufferSize != nSize)
@@ -2786,11 +2778,11 @@ void ODbaseTable::AllocBuffer()
     if (m_pBuffer == NULL && nSize)
     {
         m_nBufferSize = nSize;
-        m_pBuffer       = new BYTE[m_nBufferSize+1];
+        m_pBuffer       = new sal_uInt8[m_nBufferSize+1];
     }
 }
 // -----------------------------------------------------------------------------
-BOOL ODbaseTable::WriteBuffer()
+sal_Bool ODbaseTable::WriteBuffer()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteBuffer" );
     OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index ed811f9900b4..ed811f9900b4 100644..100755
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index ad840d666989..67af687fb3c4 100644..100755
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "dbase/DDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::dbase;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriver::getImplementationName_Static(),
-            ODriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/dbase/dbase.component b/connectivity/source/drivers/dbase/dbase.component
new file mode 100755
index 000000000000..7f913f083680
--- /dev/null
+++ b/connectivity/source/drivers/dbase/dbase.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.dbase.ODriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/dbase/dbase.mxp.map b/connectivity/source/drivers/dbase/dbase.mxp.map
index c5b4377b04c3..87eccc45b66a 100644..100755
--- a/connectivity/source/drivers/dbase/dbase.mxp.map
+++ b/connectivity/source/drivers/dbase/dbase.mxp.map
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/drivers/dbase/dbase.xml b/connectivity/source/drivers/dbase/dbase.xml
index 3ebfd6185380..3ebfd6185380 100644..100755
--- a/connectivity/source/drivers/dbase/dbase.xml
+++ b/connectivity/source/drivers/dbase/dbase.xml
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 1240253e5f7d..53a384ad6853 100644..100755
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -43,19 +43,19 @@ using namespace connectivity::dbase;
 using namespace connectivity::file;
 using namespace com::sun::star::sdbc;
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(UINT32 nRec)
+ONDXKey::ONDXKey(sal_uInt32 nRec)
     :nRecord(nRec)
 {
 }
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec)
+ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
     : ONDXKey_BASE(eType)
     , nRecord(nRec)
     , xValue(rVal)
 {
 }
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
+ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec)
     : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
      ,nRecord(nRec)
 {
@@ -66,7 +66,8 @@ ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
     }
 }
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(double aVal, UINT32 nRec)
+
+ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
     : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE)
      ,nRecord(nRec)
      ,xValue(aVal)
@@ -79,7 +80,7 @@ ONDXKey::ONDXKey(double aVal, UINT32 nRec)
 //==================================================================
 ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent)
            :nPagePos(nPos)
-           ,bModified(FALSE)
+           ,bModified(sal_False)
            ,nCount(0)
            ,aParent(pParent)
            ,rIndex(rInd)
@@ -101,16 +102,16 @@ void ONDXPage::QueryDelete()
     if (IsModified() && rIndex.m_pFileStream)
         (*rIndex.m_pFileStream) << *this;
 
-    bModified = FALSE;
+    bModified = sal_False;
     if (rIndex.UseCollector())
     {
         if (aChild.Is())
-            aChild->Release(FALSE);
+            aChild->Release(sal_False);
 
-        for (USHORT i = 0; i < rIndex.getHeader().db_maxkeys;i++)
+        for (sal_uInt16 i = 0; i < rIndex.getHeader().db_maxkeys;i++)
         {
             if (ppNodes[i].GetChild().Is())
-                ppNodes[i].GetChild()->Release(FALSE);
+                ppNodes[i].GetChild()->Release(sal_False);
 
             ppNodes[i] = ONDXNode();
         }
@@ -134,10 +135,10 @@ ONDXPagePtr& ONDXPage::GetChild(ODbaseIndex* pIndex)
 }
 
 //------------------------------------------------------------------
-USHORT ONDXPage::FindPos(const ONDXKey& rKey) const
+sal_uInt16 ONDXPage::FindPos(const ONDXKey& rKey) const
 {
     // searches the position for the given key in a page
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     while (i < nCount && rKey > ((*this)[i]).GetKey())
            i++;
 
@@ -145,17 +146,17 @@ USHORT ONDXPage::FindPos(const ONDXKey& rKey) const
 }
 
 //------------------------------------------------------------------
-BOOL ONDXPage::Find(const ONDXKey& rKey)
+sal_Bool ONDXPage::Find(const ONDXKey& rKey)
 {
     // searches the given key
     // Speciality: At the end of the method
     // the actual page and the position of the node, fulfilling the '<=' condition, are saved
     // This is considered at insert.
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     while (i < nCount && rKey > ((*this)[i]).GetKey())
            i++;
 
-    BOOL bResult = FALSE;
+    sal_Bool bResult = sal_False;
 
     if (!IsLeaf())
     {
@@ -167,7 +168,7 @@ BOOL ONDXPage::Find(const ONDXKey& rKey)
     {
         rIndex.m_aCurLeaf = this;
         rIndex.m_nCurNode = i - 1;
-        bResult = FALSE;
+        bResult = sal_False;
     }
     else
     {
@@ -179,14 +180,14 @@ BOOL ONDXPage::Find(const ONDXKey& rKey)
 }
 
 //------------------------------------------------------------------
-BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
+sal_Bool ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
 {
     // When creating an index there can be multiple nodes added,
     // these are sorted ascending
-    BOOL bAppend = nRowsLeft > 0;
+    sal_Bool bAppend = nRowsLeft > 0;
     if (IsFull())
     {
-        BOOL bResult = TRUE;
+        sal_Bool bResult = sal_True;
         ONDXNode aSplitNode;
         if (bAppend)
             aSplitNode = rNode;
@@ -206,7 +207,7 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
                 }
                 else  // Position unbekannt
                 {
-                    USHORT nPos = NODE_NOTFOUND;
+                    sal_uInt16 nPos = NODE_NOTFOUND;
                     while (++nPos < nCount && rNode.GetKey() > ((*this)[nPos]).GetKey()) ;
 
                     --nCount;   // (otherwise we might get Assertions and GPFs - 60593)
@@ -289,7 +290,7 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
         }
         else
         {
-            USHORT nNodePos = FindPos(rNode.GetKey());
+            sal_uInt16 nNodePos = FindPos(rNode.GetKey());
             if (IsLeaf())
                 rIndex.m_nCurNode = nNodePos;
 
@@ -299,17 +300,17 @@ BOOL ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
 }
 
 //------------------------------------------------------------------
-BOOL ONDXPage::Insert(USHORT nPos, ONDXNode& rNode)
+sal_Bool ONDXPage::Insert(sal_uInt16 nPos, ONDXNode& rNode)
 {
-    USHORT nMaxCount = rIndex.getHeader().db_maxkeys;
+    sal_uInt16 nMaxCount = rIndex.getHeader().db_maxkeys;
     if (nPos >= nMaxCount)
-        return FALSE;
+        return sal_False;
 
     if (nCount)
     {
         ++nCount;
         // shift right
-        for (USHORT i = std::min((USHORT)(nMaxCount-1), (USHORT)(nCount-1)); nPos < i; --i)
+        for (sal_uInt16 i = std::min((sal_uInt16)(nMaxCount-1), (sal_uInt16)(nCount-1)); nPos < i; --i)
             (*this)[i] = (*this)[i-1];
     }
     else
@@ -325,19 +326,19 @@ BOOL ONDXPage::Insert(USHORT nPos, ONDXNode& rNode)
         rNode.GetChild()->SetParent(this);
     }
 
-    bModified = TRUE;
+    bModified = sal_True;
 
-    return TRUE;
+    return sal_True;
 }
 
 //------------------------------------------------------------------
-BOOL ONDXPage::Append(ONDXNode& rNode)
+sal_Bool ONDXPage::Append(ONDXNode& rNode)
 {
     DBG_ASSERT(!IsFull(), "kein Append moeglich");
     return Insert(nCount, rNode);
 }
 //------------------------------------------------------------------
-void ONDXPage::Release(BOOL bSave)
+void ONDXPage::Release(sal_Bool bSave)
 {
     // free pages
     if (aChild.Is())
@@ -346,7 +347,7 @@ void ONDXPage::Release(BOOL bSave)
     // free pointer
     aChild.Clear();
 
-    for (USHORT i = 0; i < rIndex.getHeader().db_maxkeys;i++)
+    for (sal_uInt16 i = 0; i < rIndex.getHeader().db_maxkeys;i++)
     {
         if (ppNodes[i].GetChild())
             ppNodes[i].GetChild()->Release(bSave);
@@ -356,7 +357,7 @@ void ONDXPage::Release(BOOL bSave)
     aParent = NULL;
 }
 //------------------------------------------------------------------
-void ONDXPage::ReleaseFull(BOOL bSave)
+void ONDXPage::ReleaseFull(sal_Bool bSave)
 {
     ONDXPagePtr aTempParent = aParent;
     Release(bSave);
@@ -365,7 +366,7 @@ void ONDXPage::ReleaseFull(BOOL bSave)
     {
         // Free pages not needed, there will be no reference anymore to the pages
         // afterwards 'this' can't be valid anymore!!!
-        USHORT nParentPos = aTempParent->Search(this);
+        sal_uInt16 nParentPos = aTempParent->Search(this);
         if (nParentPos != NODE_NOTFOUND)
             (*aTempParent)[nParentPos].GetChild().Clear();
         else
@@ -373,7 +374,7 @@ void ONDXPage::ReleaseFull(BOOL bSave)
     }
 }
 //------------------------------------------------------------------
-BOOL ONDXPage::Delete(USHORT nNodePos)
+sal_Bool ONDXPage::Delete(sal_uInt16 nNodePos)
 {
     if (IsLeaf())
     {
@@ -396,7 +397,7 @@ BOOL ONDXPage::Delete(USHORT nNodePos)
     if (HasParent() && nCount < (rIndex.GetMaxNodes() / 2))
     {
         // determine, which node points to the page
-        USHORT nParentNodePos = aParent->Search(this);
+        sal_uInt16 nParentNodePos = aParent->Search(this);
         // last element on parent-page -> merge with secondlast page
         if (nParentNodePos == (aParent->Count() - 1))
         {
@@ -419,7 +420,7 @@ BOOL ONDXPage::Delete(USHORT nNodePos)
     else if (IsRoot())
         // make sure that the position of the root is kept
         rIndex.SetRootPos(nPagePos);
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -440,7 +441,7 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
     ONDXNode aResultNode;
     if (IsLeaf())
     {
-        for (USHORT i = (nCount - (nCount / 2)), j = 0 ; i < nCount; i++)
+        for (sal_uInt16 i = (nCount - (nCount / 2)), j = 0 ; i < nCount; i++)
             rPage.Insert(j++,(*this)[i]);
 
         // this node contains a key that already exists in the tree and must be replaced
@@ -454,7 +455,7 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
     }
     else
     {
-        for (USHORT i = (nCount + 1) / 2 + 1, j = 0 ; i < nCount; i++)
+        for (sal_uInt16 i = (nCount + 1) / 2 + 1, j = 0 ; i < nCount; i++)
             rPage.Insert(j++,(*this)[i]);
 
         aResultNode = (*this)[(nCount + 1) / 2];
@@ -469,31 +470,31 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
     // inner nodes have no record number
     if (rIndex.isUnique())
         aResultNode.GetKey().ResetRecord();
-    bModified = TRUE;
+    bModified = sal_True;
     return aResultNode;
 }
 
 //------------------------------------------------------------------
-void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
+void ONDXPage::Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage)
 {
     DBG_ASSERT(HasParent(), "kein Vater vorhanden");
     DBG_ASSERT(nParentNodePos != NODE_NOTFOUND, "Falscher Indexaufbau");
 
     /*  Merge 2 pages   */
     ONDXNode aResultNode;
-    USHORT nMaxNodes = rIndex.GetMaxNodes(),
+    sal_uInt16 nMaxNodes = rIndex.GetMaxNodes(),
            nMaxNodes_2 = nMaxNodes / 2;
 
     // Determine if page is right or left neighbour
-    BOOL    bRight    = ((*xPage)[0].GetKey() > (*this)[0].GetKey()); // TRUE, if xPage is the right page
-    USHORT  nNewCount = (*xPage).Count() + Count();
+    sal_Bool    bRight    = ((*xPage)[0].GetKey() > (*this)[0].GetKey()); // sal_True, wenn xPage die rechte Seite ist
+    sal_uInt16  nNewCount = (*xPage).Count() + Count();
 
     if (IsLeaf())
     {
         // Condition for merge
         if (nNewCount < (nMaxNodes_2 * 2))
         {
-            USHORT nLastNode = bRight ? Count() - 1 : xPage->Count() - 1;
+            sal_uInt16 nLastNode = bRight ? Count() - 1 : xPage->Count() - 1;
             if (bRight)
             {
                 DBG_ASSERT(&xPage != this,"xPage und THIS duerfen nicht gleich sein: Endlosschleife");
@@ -518,7 +519,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                     (*aParent)[nParentNodePos-1].SetChild(this,aParent);
                 else // or set as right node
                     aParent->SetChild(this);
-                aParent->SetModified(TRUE);
+                aParent->SetModified(sal_True);
 
             }
 
@@ -532,12 +533,12 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 aParent = NULL;
                 rIndex.SetRootPos(nPagePos);
                 rIndex.m_aRoot = this;
-                SetModified(TRUE);
+                SetModified(sal_True);
             }
             else
                 aParent->SearchAndReplace((*this)[nLastNode].GetKey(),(*this)[nCount-1].GetKey());
 
-            xPage->SetModified(FALSE);
+            xPage->SetModified(sal_False);
             xPage->ReleaseFull(); // is not needed anymore
         }
         // balance the elements   nNewCount >= (nMaxNodes_2 * 2)
@@ -580,7 +581,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 // Parent node will be integrated; is initialized with Child from xPage
                 (*aParent)[nParentNodePos].SetChild(xPage->GetChild(),aParent);
                 Append((*aParent)[nParentNodePos]);
-                for (USHORT i = 0 ; i < xPage->Count(); i++)
+                for (sal_uInt16 i = 0 ; i < xPage->Count(); i++)
                     Append((*xPage)[i]);
             }
             else
@@ -604,7 +605,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
 
             // afterwards parent node will be reset
             (*aParent)[nParentNodePos].SetChild();
-            aParent->SetModified(TRUE);
+            aParent->SetModified(sal_True);
 
             if(aParent->IsRoot() && aParent->Count() == 1)
             {
@@ -613,7 +614,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 aParent = NULL;
                 rIndex.SetRootPos(nPagePos);
                 rIndex.m_aRoot = this;
-                SetModified(TRUE);
+                SetModified(sal_True);
             }
             else if(nParentNodePos)
                 // replace the node value
@@ -621,7 +622,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 // thats why the node must be updated here
                 aParent->SearchAndReplace((*aParent)[nParentNodePos-1].GetKey(),(*aParent)[nParentNodePos].GetKey());
 
-            xPage->SetModified(FALSE);
+            xPage->SetModified(sal_False);
             xPage->ReleaseFull();
         }
         // balance the elements
@@ -652,7 +653,7 @@ void ONDXPage::Merge(USHORT nParentNodePos, ONDXPagePtr xPage)
                 (*aParent)[nParentNodePos].SetChild(this,aParent);
 
             }
-            aParent->SetModified(TRUE);
+            aParent->SetModified(sal_True);
         }
     }
 }
@@ -674,7 +675,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
     else
     {
         ByteString aBuf;
-        USHORT nLen = rIndex.getHeader().db_keylen;
+        sal_uInt16 nLen = rIndex.getHeader().db_keylen;
         char* pStr = aBuf.AllocBuffer(nLen+1);
 
         rStream.Read(pStr,nLen);
@@ -706,7 +707,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
         if (aKey.getValue().isNull())
         {
             memset(aNodeData.aData,0,rIndex.getHeader().db_keylen);
-            rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+            rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
         }
         else
             rStream << (double) aKey.getValue();
@@ -720,7 +721,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
             ByteString aText(sValue.getStr(), rIndex.m_pTable->getConnection()->getTextEncoding());
             strncpy(aNodeData.aData,aText.GetBuffer(),std::min(rIndex.getHeader().db_keylen, aText.Len()));
         }
-        rStream.Write((BYTE*)aNodeData.aData,rIndex.getHeader().db_keylen);
+        rStream.Write((sal_uInt8*)aNodeData.aData,rIndex.getHeader().db_keylen);
     }
     rStream << aChild;
 }
@@ -740,7 +741,7 @@ ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent)
 // ONDXKey
 //==================================================================
 //------------------------------------------------------------------
-BOOL ONDXKey::IsText(sal_Int32 eType)
+sal_Bool ONDXKey::IsText(sal_Int32 eType)
 {
     return eType == DataType::VARCHAR || eType == DataType::CHAR;
 }
@@ -766,7 +767,7 @@ StringCompare ONDXKey::Compare(const ONDXKey& rKey) const
     }
     else if (IsText(getDBType()))
     {
-        INT32 nRes = getValue().getString().compareTo(rKey.getValue());
+        sal_Int32 nRes = getValue().getString().compareTo(rKey.getValue());
         eResult = (nRes > 0) ? COMPARE_GREATER : (nRes == 0) ? COMPARE_EQUAL : COMPARE_LESS;
     }
     else
@@ -839,15 +840,15 @@ ONDXPagePtr& ONDXPagePtr::operator= (ONDXPage* pRef)
     return *this;
 }
 // -----------------------------------------------------------------------------
-static UINT32 nValue;
+static sal_uInt32 nValue;
 //------------------------------------------------------------------
 SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 {
     rStream.Seek(rPage.GetPagePos() * PAGE_SIZE);
     rStream >> nValue >> rPage.aChild;
-    rPage.nCount = USHORT(nValue);
+    rPage.nCount = sal_uInt16(nValue);
 
-    for (USHORT i = 0; i < rPage.nCount; i++)
+    for (sal_uInt16 i = 0; i < rPage.nCount; i++)
         rPage[i].Read(rStream, rPage.GetIndex());
     return rStream;
 }
@@ -856,7 +857,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& rPage)
 {
     // Page doesn't exist yet
-    ULONG nSize = (rPage.GetPagePos() + 1) * PAGE_SIZE;
+    sal_uIntPtr nSize = (rPage.GetPagePos() + 1) * PAGE_SIZE;
     if (nSize > rStream.Seek(STREAM_SEEK_TO_END))
     {
         rStream.SetStreamSize(nSize);
@@ -864,27 +865,27 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, const ONDXPage& r
 
         char aEmptyData[PAGE_SIZE];
         memset(aEmptyData,0x00,PAGE_SIZE);
-        rStream.Write((BYTE*)aEmptyData,PAGE_SIZE);
+        rStream.Write((sal_uInt8*)aEmptyData,PAGE_SIZE);
     }
-    ULONG nCurrentPos = rStream.Seek(rPage.GetPagePos() * PAGE_SIZE);
+    sal_uIntPtr nCurrentPos = rStream.Seek(rPage.GetPagePos() * PAGE_SIZE);
     OSL_UNUSED( nCurrentPos );
 
     nValue = rPage.nCount;
     rStream << nValue << rPage.aChild;
 
-    USHORT i = 0;
+    sal_uInt16 i = 0;
     for (; i < rPage.nCount; i++)
         rPage[i].Write(rStream, rPage);
 
     // check if we have to fill the stream with '\0'
     if(i < rPage.rIndex.getHeader().db_maxkeys)
     {
-        ULONG nTell = rStream.Tell() % PAGE_SIZE;
-        USHORT nBufferSize = rStream.GetBufferSize();
-        ULONG nRemainSize = nBufferSize - nTell;
+        sal_uIntPtr nTell = rStream.Tell() % PAGE_SIZE;
+        sal_uInt16 nBufferSize = rStream.GetBufferSize();
+        sal_uIntPtr nRemainSize = nBufferSize - nTell;
         char* pEmptyData = new char[nRemainSize];
         memset(pEmptyData,0x00,nRemainSize);
-        rStream.Write((BYTE*)pEmptyData,nRemainSize);
+        rStream.Write((sal_uInt8*)pEmptyData,nRemainSize);
         rStream.Seek(nTell);
         delete [] pEmptyData;
     }
@@ -898,7 +899,7 @@ void ONDXPage::PrintPage()
     OSL_TRACE("\nSDB: -----------Page: %d  Parent: %d  Count: %d  Child: %d-----",
         nPagePos, HasParent() ? aParent->GetPagePos() : 0 ,nCount, aChild.GetPagePos());
 
-    for (USHORT i = 0; i < nCount; i++)
+    for (sal_uInt16 i = 0; i < nCount; i++)
     {
         ONDXNode rNode = (*this)[i];
         ONDXKey&  rKey = rNode.GetKey();
@@ -923,7 +924,7 @@ void ONDXPage::PrintPage()
     {
 #if OSL_DEBUG_LEVEL > 1
         GetChild(&rIndex)->PrintPage();
-        for (USHORT i = 0; i < nCount; i++)
+        for (sal_uInt16 i = 0; i < nCount; i++)
         {
             ONDXNode rNode = (*this)[i];
             rNode.GetChild(&rIndex,this)->PrintPage();
@@ -934,16 +935,16 @@ void ONDXPage::PrintPage()
 }
 #endif
 // -----------------------------------------------------------------------------
-BOOL ONDXPage::IsFull() const
+sal_Bool ONDXPage::IsFull() const
 {
     return Count() == rIndex.getHeader().db_maxkeys;
 }
 // -----------------------------------------------------------------------------
 //------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXKey& rSearch)
+sal_uInt16 ONDXPage::Search(const ONDXKey& rSearch)
 {
     // binary search later
-    USHORT i = NODE_NOTFOUND;
+    sal_uInt16 i = NODE_NOTFOUND;
     while (++i < Count())
         if ((*this)[i].GetKey() == rSearch)
             break;
@@ -952,9 +953,9 @@ USHORT ONDXPage::Search(const ONDXKey& rSearch)
 }
 
 //------------------------------------------------------------------
-USHORT ONDXPage::Search(const ONDXPage* pPage)
+sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
 {
-    USHORT i = NODE_NOTFOUND;
+    sal_uInt16 i = NODE_NOTFOUND;
     while (++i < Count())
         if (((*this)[i]).GetChild() == pPage)
             break;
@@ -970,7 +971,7 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
     OSL_ENSURE(rSearch != rReplace,"Invalid here:rSearch == rReplace");
     if (rSearch != rReplace)
     {
-        USHORT nPos = NODE_NOTFOUND;
+        sal_uInt16 nPos = NODE_NOTFOUND;
         ONDXPage* pPage = this;
 
         while (pPage && (nPos = pPage->Search(rSearch)) == NODE_NOTFOUND)
@@ -979,33 +980,33 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
         if (pPage)
         {
             (*pPage)[nPos].GetKey() = rReplace;
-            pPage->SetModified(TRUE);
+            pPage->SetModified(sal_True);
         }
     }
 }
 // -----------------------------------------------------------------------------
-ONDXNode& ONDXPage::operator[] (USHORT nPos)
+ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos)
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 
 //------------------------------------------------------------------
-const ONDXNode& ONDXPage::operator[] (USHORT nPos) const
+const ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos) const
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 // -----------------------------------------------------------------------------
-void ONDXPage::Remove(USHORT nPos)
+void ONDXPage::Remove(sal_uInt16 nPos)
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
 
-    for (USHORT i = nPos; i < (nCount-1); i++)
+    for (sal_uInt16 i = nPos; i < (nCount-1); i++)
         (*this)[i] = (*this)[i+1];
 
     nCount--;
-    bModified = TRUE;
+    bModified = sal_True;
 }
 // -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/dbase/exports.dxp b/connectivity/source/drivers/dbase/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/dbase/exports.dxp
+++ b/connectivity/source/drivers/dbase/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk
index 1aac0b0b1e21..5c3344b1daad 100644..100755
--- a/connectivity/source/drivers/dbase/makefile.mk
+++ b/connectivity/source/drivers/dbase/makefile.mk
@@ -127,3 +127,11 @@ DEF1EXPORTFILE=	exports.dxp
 .INCLUDE : $(PRJ)$/target.pmk
 
 
+
+ALLTAR : $(MISC)/dbase.component
+
+$(MISC)/dbase.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        dbase.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt dbase.component
diff --git a/connectivity/source/drivers/evoab/LCatalog.cxx b/connectivity/source/drivers/evoab/LCatalog.cxx
index 25e06e2b90c0..25e06e2b90c0 100644..100755
--- a/connectivity/source/drivers/evoab/LCatalog.cxx
+++ b/connectivity/source/drivers/evoab/LCatalog.cxx
diff --git a/connectivity/source/drivers/evoab/LCatalog.hxx b/connectivity/source/drivers/evoab/LCatalog.hxx
index b8a205a38c83..b8a205a38c83 100644..100755
--- a/connectivity/source/drivers/evoab/LCatalog.hxx
+++ b/connectivity/source/drivers/evoab/LCatalog.hxx
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.cxx b/connectivity/source/drivers/evoab/LColumnAlias.cxx
index 7d005bbf5fbe..7d005bbf5fbe 100644..100755
--- a/connectivity/source/drivers/evoab/LColumnAlias.cxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.cxx
diff --git a/connectivity/source/drivers/evoab/LColumnAlias.hxx b/connectivity/source/drivers/evoab/LColumnAlias.hxx
index 419d158fa105..419d158fa105 100644..100755
--- a/connectivity/source/drivers/evoab/LColumnAlias.hxx
+++ b/connectivity/source/drivers/evoab/LColumnAlias.hxx
diff --git a/connectivity/source/drivers/evoab/LColumns.cxx b/connectivity/source/drivers/evoab/LColumns.cxx
index 5d69f28290b9..5d69f28290b9 100644..100755
--- a/connectivity/source/drivers/evoab/LColumns.cxx
+++ b/connectivity/source/drivers/evoab/LColumns.cxx
diff --git a/connectivity/source/drivers/evoab/LColumns.hxx b/connectivity/source/drivers/evoab/LColumns.hxx
index 5be028cdfe2e..5be028cdfe2e 100644..100755
--- a/connectivity/source/drivers/evoab/LColumns.hxx
+++ b/connectivity/source/drivers/evoab/LColumns.hxx
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.cxx b/connectivity/source/drivers/evoab/LConfigAccess.cxx
index 2181de964ac4..2181de964ac4 100644..100755
--- a/connectivity/source/drivers/evoab/LConfigAccess.cxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.cxx
diff --git a/connectivity/source/drivers/evoab/LConfigAccess.hxx b/connectivity/source/drivers/evoab/LConfigAccess.hxx
index c19c63c00750..c19c63c00750 100644..100755
--- a/connectivity/source/drivers/evoab/LConfigAccess.hxx
+++ b/connectivity/source/drivers/evoab/LConfigAccess.hxx
diff --git a/connectivity/source/drivers/evoab/LConnection.cxx b/connectivity/source/drivers/evoab/LConnection.cxx
index 725f24ff2236..725f24ff2236 100644..100755
--- a/connectivity/source/drivers/evoab/LConnection.cxx
+++ b/connectivity/source/drivers/evoab/LConnection.cxx
diff --git a/connectivity/source/drivers/evoab/LConnection.hxx b/connectivity/source/drivers/evoab/LConnection.hxx
index 9d7df3e3d713..9d7df3e3d713 100644..100755
--- a/connectivity/source/drivers/evoab/LConnection.hxx
+++ b/connectivity/source/drivers/evoab/LConnection.hxx
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
index 77821cb6137b..77821cb6137b 100644..100755
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
index ebd693874818..ebd693874818 100644..100755
--- a/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/evoab/LDebug.cxx b/connectivity/source/drivers/evoab/LDebug.cxx
index b28e06c55b7e..b28e06c55b7e 100644..100755
--- a/connectivity/source/drivers/evoab/LDebug.cxx
+++ b/connectivity/source/drivers/evoab/LDebug.cxx
diff --git a/connectivity/source/drivers/evoab/LDebug.hxx b/connectivity/source/drivers/evoab/LDebug.hxx
index eeb9eed1860f..eeb9eed1860f 100644..100755
--- a/connectivity/source/drivers/evoab/LDebug.hxx
+++ b/connectivity/source/drivers/evoab/LDebug.hxx
diff --git a/connectivity/source/drivers/evoab/LDriver.cxx b/connectivity/source/drivers/evoab/LDriver.cxx
index 53ac9fc3ec39..53ac9fc3ec39 100644..100755
--- a/connectivity/source/drivers/evoab/LDriver.cxx
+++ b/connectivity/source/drivers/evoab/LDriver.cxx
diff --git a/connectivity/source/drivers/evoab/LDriver.hxx b/connectivity/source/drivers/evoab/LDriver.hxx
index 65b15c50cd3f..65b15c50cd3f 100644..100755
--- a/connectivity/source/drivers/evoab/LDriver.hxx
+++ b/connectivity/source/drivers/evoab/LDriver.hxx
diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx
index 99f7b6bb930e..b276b1f06ff0 100644..100755
--- a/connectivity/source/drivers/evoab/LFolderList.cxx
+++ b/connectivity/source/drivers/evoab/LFolderList.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::lang;
 // -------------------------------------------------------------------------
 void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 {
-    BOOL bRead = TRUE;
+    sal_Bool bRead = sal_True;
 
     QuotedTokenizedString aHeaderLine;
     OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
@@ -106,7 +106,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
     m_aPrecisions.reserve(nFieldCount);
     m_aScales.reserve(nFieldCount);
 
-    sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+    sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
     CharClass aCharClass(pConnection->getDriver()->getFactory(),_aLocale);
     // read description
     sal_Unicode cDecimalDelimiter  = pConnection->getDecimalDelimiter();
@@ -124,11 +124,11 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
         aColumnName += String::CreateFromInt32(i+1);
 
         sal_Int32 eType;
-        UINT16 nPrecision = 0;
-        UINT16 nScale = 0;
+        sal_uInt16 nPrecision = 0;
+        sal_uInt16 nScale = 0;
 
-        BOOL bNumeric = FALSE;
-        ULONG  nIndex = 0;
+        sal_Bool bNumeric = sal_False;
+        sal_uIntPtr  nIndex = 0;
 
         // first without fielddelimiter
         String aField;
@@ -136,7 +136,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
         if (aField.Len() == 0 ||
             (pConnection->getStringDelimiter() && pConnection->getStringDelimiter() == aField.GetChar(0)))
         {
-            bNumeric = FALSE;
+            bNumeric = sal_False;
         }
         else
         {
@@ -148,11 +148,11 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
 
             if (aField2.Len() == 0)
             {
-                bNumeric = FALSE;
+                bNumeric = sal_False;
             }
             else
             {
-                bNumeric = TRUE;
+                bNumeric = sal_True;
                 xub_StrLen nDot = 0;
                 for (xub_StrLen j = 0; j < aField2.Len(); j++)
                 {
@@ -162,7 +162,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
                         (!cThousandDelimiter || c != cThousandDelimiter) &&
                         !aCharClass.isDigit(aField2,j))
                     {
-                        bNumeric = FALSE;
+                        bNumeric = sal_False;
                         break;
                     }
                     if (cDecimalDelimiter && c == cDecimalDelimiter)
@@ -174,7 +174,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
                 }
 
                 if (nDot > 1) // if there is more than one dot it isn't a number
-                    bNumeric = FALSE;
+                    bNumeric = sal_False;
                 if (bNumeric && cThousandDelimiter)
                 {
                     // Is the delimiter given correctly?
@@ -187,7 +187,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal
                             continue;
                         else
                         {
-                            bNumeric = FALSE;
+                            bNumeric = sal_False;
                             break;
                         }
                     }
diff --git a/connectivity/source/drivers/evoab/LFolderList.hxx b/connectivity/source/drivers/evoab/LFolderList.hxx
index 81f1f032bc3b..f6cb1ac985ea 100644..100755
--- a/connectivity/source/drivers/evoab/LFolderList.hxx
+++ b/connectivity/source/drivers/evoab/LFolderList.hxx
@@ -64,7 +64,7 @@ namespace connectivity
 
         private:
             void fillColumns(const ::com::sun::star::lang::Locale& _aLocale);
-            BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
+            sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
 
             sal_Bool fetchRow(OValueRow _rRow,const OSQLColumns& _rCols);
             sal_Bool seekRow(IResultSetHelper::Movement eCursorPosition);
diff --git a/connectivity/source/drivers/evoab/LNoException.cxx b/connectivity/source/drivers/evoab/LNoException.cxx
index fdeefbd8735b..3b223ddd943b 100644..100755
--- a/connectivity/source/drivers/evoab/LNoException.cxx
+++ b/connectivity/source/drivers/evoab/LNoException.cxx
@@ -41,20 +41,20 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
         return 0;
 
     xub_StrLen nTokCount = 1;
-    BOOL bStart = TRUE;     // Are we on the fist character of the token?
-    BOOL bInString = FALSE; // Are we within a (cStrDel delimited) string?
+    sal_Bool bStart = sal_True;     // Are we on the fist character of the token?
+    sal_Bool bInString = sal_False; // Are we within a (cStrDel delimited) string?
 
     // Search for the first not-matching character (search ends at the end of string)
     for( xub_StrLen i = 0; i < Len(); i++ )
     {
         if (bStart)
         {
-            bStart = FALSE;
+            bStart = sal_False;
             // First character a string delimiter?
             if ((*this).GetChar(i) == cStrDel)
             {
-                bInString = TRUE;   // then we are within a string!
-                continue;       // read next character!
+                bInString = sal_True;   // then we are within a string!
+                continue;           // read next character!
             }
         }
 
@@ -70,7 +70,7 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
                 else
                 {
                     // end of String
-                    bInString = FALSE;
+                    bInString = sal_False;
                 }
             }
         } else {
@@ -78,7 +78,7 @@ xub_StrLen OEvoabString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel )
             if ( (*this).GetChar(i) == cTok )
             {
                 nTokCount++;
-                bStart = TRUE;
+                bStart = sal_True;
             }
         }
     }
@@ -94,7 +94,7 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni
     xub_StrLen nLen = Len();
     if ( nLen )
     {
-        BOOL bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // are we within a (cStrDel delimited) String?
+        sal_Bool bInString = (nStartPos < nLen) && ((*this).GetChar(nStartPos) == cStrDel); // are we within a (cStrDel delimited) String?
 
         // Is the first character a String-Delimiter?
         if (bInString )
@@ -116,7 +116,7 @@ void OEvoabString::GetTokenSpecial( String& _rStr,xub_StrLen& nStartPos, sal_Uni
                     else
                     {
                         // end of String
-                        bInString = FALSE;
+                        bInString = sal_False;
                     }
                 }
                 else
@@ -151,7 +151,7 @@ sal_Bool OEvoabTable::checkHeaderLine()
 {
     if (m_nFilePos == 0 && ((OEvoabConnection*)m_pConnection)->isHeaderLine())
     {
-        BOOL bRead2;
+        sal_Bool bRead2;
         do
         {
             bRead2 = m_pFileStream->ReadByteStringLine(m_aCurrentLine,m_pConnection->getTextEncoding());
diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.cxx b/connectivity/source/drivers/evoab/LPreparedStatement.cxx
index fee0905e29ab..fee0905e29ab 100644..100755
--- a/connectivity/source/drivers/evoab/LPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab/LPreparedStatement.cxx
diff --git a/connectivity/source/drivers/evoab/LPreparedStatement.hxx b/connectivity/source/drivers/evoab/LPreparedStatement.hxx
index 700768c686c0..700768c686c0 100644..100755
--- a/connectivity/source/drivers/evoab/LPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab/LPreparedStatement.hxx
diff --git a/connectivity/source/drivers/evoab/LResultSet.cxx b/connectivity/source/drivers/evoab/LResultSet.cxx
index 4ff0e701f8a4..4ff0e701f8a4 100644..100755
--- a/connectivity/source/drivers/evoab/LResultSet.cxx
+++ b/connectivity/source/drivers/evoab/LResultSet.cxx
diff --git a/connectivity/source/drivers/evoab/LResultSet.hxx b/connectivity/source/drivers/evoab/LResultSet.hxx
index ebd64292e911..ebd64292e911 100644..100755
--- a/connectivity/source/drivers/evoab/LResultSet.hxx
+++ b/connectivity/source/drivers/evoab/LResultSet.hxx
diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx
index f6603140e245..b0f7016c5e72 100644..100755
--- a/connectivity/source/drivers/evoab/LServices.cxx
+++ b/connectivity/source/drivers/evoab/LServices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "LDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::evoab;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            OEvoabDriver::getImplementationName_Static(),
-            OEvoabDriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/evoab/LStatement.cxx b/connectivity/source/drivers/evoab/LStatement.cxx
index a6350f11139b..a6350f11139b 100644..100755
--- a/connectivity/source/drivers/evoab/LStatement.cxx
+++ b/connectivity/source/drivers/evoab/LStatement.cxx
diff --git a/connectivity/source/drivers/evoab/LStatement.hxx b/connectivity/source/drivers/evoab/LStatement.hxx
index a870c4722034..a870c4722034 100644..100755
--- a/connectivity/source/drivers/evoab/LStatement.hxx
+++ b/connectivity/source/drivers/evoab/LStatement.hxx
diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx
index e55d6fbca410..70df1622e8b1 100644..100755
--- a/connectivity/source/drivers/evoab/LTable.cxx
+++ b/connectivity/source/drivers/evoab/LTable.cxx
@@ -72,7 +72,7 @@ using namespace ::com::sun::star::lang;
 // -------------------------------------------------------------------------
 void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 {
-    BOOL bRead = TRUE;
+    sal_Bool bRead = sal_True;
 
     QuotedTokenizedString aHeaderLine;
     OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
@@ -115,7 +115,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
     m_aPrecisions.reserve(nFieldCount);
     m_aScales.reserve(nFieldCount);
 
-    sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+    sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
     CharClass aCharClass(pConnection->getDriver()->getFactory(),_aLocale);
     // read description
     sal_Unicode cDecimalDelimiter  = pConnection->getDecimalDelimiter();
@@ -141,11 +141,11 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
         //OSL_TRACE("OEvoabTable::aColumnName = %s\n", ((OUtoCStr(::rtl::OUString(aColumnName))) ? (OUtoCStr(::rtl::OUString(aColumnName))):("NULL")) );
 
         sal_Int32 eType;
-        UINT16 nPrecision = 0;
-        UINT16 nScale = 0;
+        sal_uInt16 nPrecision = 0;
+        sal_uInt16 nScale = 0;
 
-        BOOL bNumeric = FALSE;
-        ULONG  nIndex = 0;
+        sal_Bool bNumeric = sal_False;
+        sal_uIntPtr  nIndex = 0;
 
         // first without fielddelimiter
         String aField;
@@ -155,7 +155,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
         if (aField.Len() == 0 ||
             (pConnection->getStringDelimiter() && pConnection->getStringDelimiter() == aField.GetChar(0)))
         {
-            bNumeric = FALSE;
+            bNumeric = sal_False;
         }
         else
         {
@@ -169,11 +169,11 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 
             if (aField2.Len() == 0)
             {
-                bNumeric = FALSE;
+                bNumeric = sal_False;
             }
             else
             {
-                bNumeric = TRUE;
+                bNumeric = sal_True;
                 xub_StrLen nDot = 0;
                 for (xub_StrLen j = 0; j < aField2.Len(); j++)
                 {
@@ -183,7 +183,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
                         (!cThousandDelimiter || c != cThousandDelimiter) &&
                         !aCharClass.isDigit(aField2,j))
                     {
-                        bNumeric = FALSE;
+                        bNumeric = sal_False;
                         break;
                     }
                     if (cDecimalDelimiter && c == cDecimalDelimiter)
@@ -195,7 +195,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
                 }
 
                 if (nDot > 1) // if there is more than one dot it isn't a number
-                    bNumeric = FALSE;
+                    bNumeric = sal_False;
                 if (bNumeric && cThousandDelimiter)
                 {
                     // is the delimiter given correctly
@@ -208,7 +208,7 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
                             continue;
                         else
                         {
-                            bNumeric = FALSE;
+                            bNumeric = sal_False;
                             break;
                         }
                     }
@@ -510,7 +510,7 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa
     *(_rRow->get())[0] = m_nFilePos;
 
     if (!bRetrieveData)
-        return TRUE;
+        return sal_True;
 
     OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection;
     // Fields:
@@ -669,7 +669,7 @@ sal_Bool OEvoabTable::setColumnAliases()
             aColumnFinalName = aColumnReadName;
         sColumnFinalName = aColumnFinalName;
 
-        sal_Bool bCase = getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers();
+        sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
         ::rtl::OUString aTypeName;
         aTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
         sdbcx::OColumn* pColumn = new sdbcx::OColumn(sColumnFinalName,aTypeName,::rtl::OUString(),
@@ -695,7 +695,7 @@ sal_Bool OEvoabTable::checkHeaderLine()
 {
     if (m_nFilePos == 0 && ((OEvoabConnection*)m_pConnection)->isHeaderLine())
     {
-        BOOL bRead2;
+        sal_Bool bRead2;
         do
         {
             bRead2 = m_pFileStream->ReadByteStringLine(m_aCurrentLine,m_pConnection->getTextEncoding());
diff --git a/connectivity/source/drivers/evoab/LTable.hxx b/connectivity/source/drivers/evoab/LTable.hxx
index 998086be4985..998086be4985 100644..100755
--- a/connectivity/source/drivers/evoab/LTable.hxx
+++ b/connectivity/source/drivers/evoab/LTable.hxx
diff --git a/connectivity/source/drivers/evoab/LTables.cxx b/connectivity/source/drivers/evoab/LTables.cxx
index 26b5009683c6..26b5009683c6 100644..100755
--- a/connectivity/source/drivers/evoab/LTables.cxx
+++ b/connectivity/source/drivers/evoab/LTables.cxx
diff --git a/connectivity/source/drivers/evoab/LTables.hxx b/connectivity/source/drivers/evoab/LTables.hxx
index ef2c3f838da3..ef2c3f838da3 100644..100755
--- a/connectivity/source/drivers/evoab/LTables.hxx
+++ b/connectivity/source/drivers/evoab/LTables.hxx
diff --git a/connectivity/source/drivers/evoab/evoab.xml b/connectivity/source/drivers/evoab/evoab.xml
index f2bafcffdada..f2bafcffdada 100644..100755
--- a/connectivity/source/drivers/evoab/evoab.xml
+++ b/connectivity/source/drivers/evoab/evoab.xml
diff --git a/connectivity/source/drivers/evoab/exports.dxp b/connectivity/source/drivers/evoab/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/evoab/exports.dxp
+++ b/connectivity/source/drivers/evoab/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk
index 82e0ce4b70b0..82e0ce4b70b0 100644..100755
--- a/connectivity/source/drivers/evoab/makefile.mk
+++ b/connectivity/source/drivers/evoab/makefile.mk
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
index d670735d2144..d670735d2144 100644..100755
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
diff --git a/connectivity/source/drivers/evoab2/EApi.h b/connectivity/source/drivers/evoab2/EApi.h
index 90422b7e01f8..90422b7e01f8 100644..100755
--- a/connectivity/source/drivers/evoab2/EApi.h
+++ b/connectivity/source/drivers/evoab2/EApi.h
diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx
index ec5c20392cb7..ec5c20392cb7 100644..100755
--- a/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.cxx
diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx
index d55f218fd2df..d55f218fd2df 100644..100755
--- a/connectivity/source/drivers/evoab2/NCatalog.hxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.hxx
diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx
index cfed31d54422..cfed31d54422 100644..100755
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx
index 8c98e9deaf17..8c98e9deaf17 100644..100755
--- a/connectivity/source/drivers/evoab2/NColumns.hxx
+++ b/connectivity/source/drivers/evoab2/NColumns.hxx
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index f1dc29c9a222..f1dc29c9a222 100644..100755
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx
index c61d938ccf2c..c61d938ccf2c 100644..100755
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 4aed0b3ee05a..4aed0b3ee05a 100644..100755
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index d6faab52665e..d6faab52665e 100644..100755
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/evoab2/NDebug.cxx b/connectivity/source/drivers/evoab2/NDebug.cxx
index 612bb9319437..612bb9319437 100644..100755
--- a/connectivity/source/drivers/evoab2/NDebug.cxx
+++ b/connectivity/source/drivers/evoab2/NDebug.cxx
diff --git a/connectivity/source/drivers/evoab2/NDebug.hxx b/connectivity/source/drivers/evoab2/NDebug.hxx
index e522c7873971..e522c7873971 100644..100755
--- a/connectivity/source/drivers/evoab2/NDebug.hxx
+++ b/connectivity/source/drivers/evoab2/NDebug.hxx
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 855f0be63242..855f0be63242 100644..100755
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx
index 2b9a2cf0f395..2b9a2cf0f395 100644..100755
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index 3f1ef4b572b6..3f1ef4b572b6 100644..100755
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
index 1df469d0c8fb..1df469d0c8fb 100644..100755
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 8fc193ae4f10..8fc193ae4f10 100644..100755
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 36c1f7d359f0..36c1f7d359f0 100644..100755
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 429dca24f7fa..429dca24f7fa 100644..100755
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index 29e432737dac..29e432737dac 100644..100755
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index 4d2f3b8ec899..87e0831513e4 100644..100755
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -36,7 +36,6 @@ using namespace connectivity::evoab;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,27 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "EVOAB::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -119,31 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            OEvoabDriver::getImplementationName_Static(),
-            OEvoabDriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 30773e4ea665..30773e4ea665 100644..100755
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index d12956e96008..d12956e96008 100644..100755
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx
index 3d4538401f65..3d4538401f65 100644..100755
--- a/connectivity/source/drivers/evoab2/NTable.cxx
+++ b/connectivity/source/drivers/evoab2/NTable.cxx
diff --git a/connectivity/source/drivers/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx
index 8843f5fc157c..8843f5fc157c 100644..100755
--- a/connectivity/source/drivers/evoab2/NTable.hxx
+++ b/connectivity/source/drivers/evoab2/NTable.hxx
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index 1212214b7b63..1212214b7b63 100644..100755
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx
index 8654eb83997d..8654eb83997d 100644..100755
--- a/connectivity/source/drivers/evoab2/NTables.hxx
+++ b/connectivity/source/drivers/evoab2/NTables.hxx
diff --git a/connectivity/source/drivers/evoab2/evoab.component b/connectivity/source/drivers/evoab2/evoab.component
new file mode 100755
index 000000000000..a99719388d13
--- /dev/null
+++ b/connectivity/source/drivers/evoab2/evoab.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.evoab.OEvoabDriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/evoab2/evoab.xml b/connectivity/source/drivers/evoab2/evoab.xml
index f0abcc963b8d..f0abcc963b8d 100644..100755
--- a/connectivity/source/drivers/evoab2/evoab.xml
+++ b/connectivity/source/drivers/evoab2/evoab.xml
diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk
index 474e001e0926..6f61762a0c8f 100644..100755
--- a/connectivity/source/drivers/evoab2/makefile.mk
+++ b/connectivity/source/drivers/evoab2/makefile.mk
@@ -111,3 +111,11 @@ DEF1NAME=	$(SHL1TARGET)
 # --- Targets ----------------------------------
 
 .INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/evoab.component
+
+$(MISC)/evoab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        evoab.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt evoab.component
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index df810c291704..df810c291704 100644..100755
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index b1f08c38db98..9c67f48bd6a6 100644..100755
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -73,7 +73,7 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
                                             sal_False,
                                             sal_False,
                                             sal_False,
-                                            m_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers());
+                                            m_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
                 xRet = pRet;
                 break;
             }
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index aa5a5108c7d5..aa5a5108c7d5 100644..100755
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 4a98491450ba..4a98491450ba 100644..100755
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx
index a6be589f5328..a6be589f5328 100644..100755
--- a/connectivity/source/drivers/file/FDateFunctions.cxx
+++ b/connectivity/source/drivers/file/FDateFunctions.cxx
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 708a85ce1b56..708a85ce1b56 100644..100755
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index e4bd959d3577..b06cda7c5a49 100644..100755
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -101,16 +101,16 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
     }
 
     // Further descend in Parse Tree
-    for (UINT32 i = 0; i < pParseNode->count(); i++)
+    for (sal_uInt32 i = 0; i < pParseNode->count(); i++)
         scanParameter(pParseNode->getChild(i),_rParaNodes);
 }
 // -----------------------------------------------------------------------------
 OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow& _rRow)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::GetOrderbyKeyValue" );
-    UINT32 nBookmarkValue = Abs((sal_Int32)(_rRow->get())[0]->getValue());
+    sal_uInt32 nBookmarkValue = Abs((sal_Int32)(_rRow->get())[0]->getValue());
 
-    OKeyValue* pKeyValue = OKeyValue::createKeyValue((UINT32)nBookmarkValue);
+    OKeyValue* pKeyValue = OKeyValue::createKeyValue((sal_uInt32)nBookmarkValue);
 
     ::std::vector<sal_Int32>::iterator aIter = m_aOrderbyColumnNumber.begin();
     for (;aIter != m_aOrderbyColumnNumber.end(); ++aIter)
diff --git a/connectivity/source/drivers/file/FNumericFunctions.cxx b/connectivity/source/drivers/file/FNumericFunctions.cxx
index 031905a01999..031905a01999 100644..100755
--- a/connectivity/source/drivers/file/FNumericFunctions.cxx
+++ b/connectivity/source/drivers/file/FNumericFunctions.cxx
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 75325a6e077c..170dc1c5494c 100644..100755
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -479,7 +479,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal
         *((m_aParameterRow->get())[parameterIndex]) = x;
 }
 // -----------------------------------------------------------------------------
-UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
+sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::AddParameter" );
     OSL_UNUSED( pParameter );
@@ -493,7 +493,7 @@ UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
     ::rtl::OUString sParameterName;
     // set up Parameter-Column:
     sal_Int32 eType = DataType::VARCHAR;
-    UINT32 nPrecision = 255;
+    sal_uInt32 nPrecision = 255;
     sal_Int32 nScale = 0;
     sal_Int32 nNullable = ColumnValue::NULLABLE;
 
@@ -577,13 +577,13 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult)
     if (!m_xParamColumns->get().empty())
     {
         // begin with AssignValues
-        USHORT nParaCount=0; // gives the current number of previously set Parameters
+        sal_uInt16 nParaCount=0; // gives the current number of previously set Parameters
 
         // search for parameters to be substituted:
         size_t nCount = m_aAssignValues.is() ? m_aAssignValues->get().size() : 1; // 1 is important for the Criteria
         for (size_t j = 1; j < nCount; j++)
         {
-            UINT32 nParameter = (*m_aAssignValues).getParameterIndex(j);
+            sal_uInt32 nParameter = (*m_aAssignValues).getParameterIndex(j);
             if (nParameter == SQL_NO_PARAMETER)
                 continue;   // this AssignValue is no Parameter
 
@@ -627,7 +627,7 @@ void OPreparedStatement::parseParamterElem(const String& _sColumnName,OSQLParseN
     if(nParameter == -1)
         nParameter = AddParameter(pRow_Value_Constructor_Elem,xCol);
     // Save number of parameter in the variable:
-    SetAssignValue(_sColumnName, String(), TRUE, nParameter);
+    SetAssignValue(_sColumnName, String(), sal_True, nParameter);
 }
 // -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 895afd6f9e9a..58d6baad649e 100644..100755
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -76,11 +76,7 @@ using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::container;
 
 // Maximal number of Rows, that can be processed being sorted with ORDER BY:
-#if defined (WIN)
-#define MAX_KEYSET_SIZE 0x3ff0  // Somewhat less than a Segment, so there is still room for Memory-Debug-Information
-#else
 #define MAX_KEYSET_SIZE 0x40000 // 256K
-#endif
 
 namespace
 {
@@ -143,7 +139,7 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator&    _aSQLIte
 
     m_nResultSetConcurrency = isCount() ? ResultSetConcurrency::READ_ONLY : ResultSetConcurrency::UPDATABLE;
     construct();
-    m_aSkipDeletedSet.SetDeleted(m_bShowDeleted);
+    m_aSkipDeletedSet.SetDeletedVisible(m_bShowDeleted);
     osl_decrementInterlockedCount( &m_refCount );
 }
 
@@ -648,7 +644,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
     // we know that we append new rows at the end
     // so we have to know where the end is
     m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,sal_False);
-    m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, TRUE, m_xColsIdx);
+    m_bRowInserted = m_pTable->InsertRow(*m_aInsertRow, sal_True, m_xColsIdx);
     if(m_bRowInserted && m_pFileSet.is())
     {
         sal_Int32 nPos = (m_aInsertRow->get())[0]->getValue();
@@ -904,20 +900,20 @@ IPropertyArrayHelper & OResultSet::getInfoHelper()
 }
 
 //------------------------------------------------------------------
-BOOL OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
-                               INT32 nFirstOffset,
-                               BOOL bEvaluate,
-                               BOOL bRetrieveData)
+sal_Bool OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
+                               sal_Int32 nFirstOffset,
+                               sal_Bool bEvaluate,
+                               sal_Bool bRetrieveData)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::ExecuteRow" );
     OSL_ENSURE(m_pSQLAnalyzer,"OResultSet::ExecuteRow: Analyzer isn't set!");
 
     // For further Fetch-Operations this information may possibly be changed ...
     IResultSetHelper::Movement eCursorPosition = eFirstCursorPosition;
-    INT32  nOffset = nFirstOffset;
+    sal_Int32  nOffset = nFirstOffset;
 
     const OSQLColumns & rTableCols = *(m_pTable->getTableColumns());
-    BOOL bHasRestriction = m_pSQLAnalyzer->hasRestriction();
+    sal_Bool bHasRestriction = m_pSQLAnalyzer->hasRestriction();
 again:
 
     // protect from reading over the end when someboby is inserting while we are reading
@@ -940,8 +936,13 @@ again:
     {
         m_pTable->fetchRow(m_aEvaluateRow, rTableCols, sal_True,bRetrieveData || bHasRestriction);
 
-        if ((!m_bShowDeleted && m_aEvaluateRow->isDeleted())
-            || (bHasRestriction && !m_pSQLAnalyzer->evaluateRestriction()))
+        if  (   (   !m_bShowDeleted
+                &&  m_aEvaluateRow->isDeleted()
+                )
+            ||  (   bHasRestriction
+                &&  !m_pSQLAnalyzer->evaluateRestriction()
+                )
+            )
         {                                                // Evaluate the next record
             // delete current row in Keyset
             if (m_pEvaluationKeySet)
@@ -988,12 +989,14 @@ again:
 
     // Evaluate may only be set,
     // if the Keyset will be constructed further
-    if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT && !isCount() &&
-        (m_pFileSet.is() || m_pSortIndex) && bEvaluate)
+    if  (   ( m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT )
+        &&  !isCount()
+        &&  bEvaluate
+        )
     {
         if (m_pSortIndex)
         {
-            OKeyValue* pKeyValue = GetOrderbyKeyValue(m_aEvaluateRow);
+            OKeyValue* pKeyValue = GetOrderbyKeyValue( m_aSelectRow );
             m_pSortIndex->AddKeyValue(pKeyValue);
         }
         else if (m_pFileSet.is())
@@ -1008,7 +1011,7 @@ again:
         if (bEvaluate)
         {
             // read the actual result-row
-            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,TRUE);
+            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,sal_True);
         }
 
         if (bOK)
@@ -1023,7 +1026,7 @@ again:
         sal_Bool bOK = sal_True;
         if (bEvaluate)
         {
-            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,TRUE);
+            bOK = m_pTable->fetchRow(m_aEvaluateRow, *(m_pTable->getTableColumns()), sal_True,sal_True);
         }
         if (bOK)
         {
@@ -1035,13 +1038,13 @@ again:
 }
 
 //-------------------------------------------------------------------
-BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, BOOL bRetrieveData)
+sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::Move" );
 
 //IgnoreDeletedRows:
 //
-    INT32 nTempPos = m_nRowPos;
+    sal_Int32 nTempPos = m_nRowPos;
 
     if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT &&
         !isCount())
@@ -1049,7 +1052,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
         if (!m_pFileSet.is()) //no Index available
         {
             // Normal FETCH
-            ExecuteRow(eCursorPosition,nOffset,FALSE,bRetrieveData);
+            ExecuteRow(eCursorPosition,nOffset,sal_False,bRetrieveData);
 
             // now set the bookmark for outside this is the logical pos  and not the file pos
             *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1086,16 +1089,16 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
             // The FileCursor is outside of the valid range, if:
             // a.) m_nRowPos < 1
             // b.) a KeySet exists and m_nRowPos > m_pFileSet->size()
-            if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (INT32)m_pFileSet->get().size() ))
+            if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (sal_Int32)m_pFileSet->get().size() )) // && m_pFileSet->IsFrozen()
             {
                 goto Error;
             }
             else
             {
-                if (m_nRowPos < (INT32)m_pFileSet->get().size())
+                if (m_nRowPos < (sal_Int32)m_pFileSet->get().size())
                 {
                     // Fetch via Index
-                    ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],FALSE,bRetrieveData);
+                    ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],sal_False,bRetrieveData);
 
                     // now set the bookmark for outside
                     *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1);
@@ -1114,25 +1117,25 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset,
                     }
                     sal_Bool bOK = sal_True;
                     // Determine the number of further Fetches
-                    while (bOK && m_nRowPos >= (INT32)m_pFileSet->get().size())
+                    while (bOK && m_nRowPos >= (sal_Int32)m_pFileSet->get().size())
                     {
                         if (m_pEvaluationKeySet)
                         {
-                            if (m_nRowPos >= (INT32)m_pEvaluationKeySet->size())
+                            if (m_nRowPos >= (sal_Int32)m_pEvaluationKeySet->size())
                                 return sal_False;
                             else if (m_nRowPos == 0)
                             {
                                 m_aEvaluateIter = m_pEvaluationKeySet->begin();
-                                bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,TRUE, bRetrieveData);
+                                bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,sal_True, bRetrieveData);
                             }
                             else
                             {
                                 ++m_aEvaluateIter;
-                                bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,TRUE, bRetrieveData);
+                                bOK = ExecuteRow(IResultSetHelper::BOOKMARK,*m_aEvaluateIter,sal_True, bRetrieveData);
                             }
                         }
                         else
-                            bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE, FALSE);//bRetrieveData);
+                            bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True, sal_False);//bRetrieveData);
                     }
 
                     if (bOK)
@@ -1280,8 +1283,8 @@ void OResultSet::sortRows()
     ::std::vector<sal_Int32>::iterator aOrderByIter = m_aOrderbyColumnNumber.begin();
     for (::std::vector<sal_Int16>::size_type i=0;aOrderByIter != m_aOrderbyColumnNumber.end(); ++aOrderByIter,++i)
     {
-        OSL_ENSURE((sal_Int32)m_aRow->get().size() > *aOrderByIter,"Invalid Index");
-        switch ((*(m_aRow->get().begin()+*aOrderByIter))->getValue().getTypeKind())
+        OSL_ENSURE((sal_Int32)m_aSelectRow->get().size() > *aOrderByIter,"Invalid Index");
+        switch ((*(m_aSelectRow->get().begin()+*aOrderByIter))->getValue().getTypeKind())
         {
             case DataType::CHAR:
             case DataType::VARCHAR:
@@ -1310,7 +1313,7 @@ void OResultSet::sortRows()
                 OSL_FAIL("OFILECursor::Execute: Datentyp nicht implementiert");
                 break;
         }
-        (m_aEvaluateRow->get())[*aOrderByIter]->setBound(sal_True);
+        (m_aSelectRow->get())[*aOrderByIter]->setBound(sal_True);
     }
 
     m_pSortIndex = new OSortIndex(eKeyType,m_aOrderbyAscending);
@@ -1321,14 +1324,19 @@ void OResultSet::sortRows()
 
         while (m_aEvaluateIter != m_pEvaluationKeySet->end())
         {
-            ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+            ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
             ++m_aEvaluateIter;
         }
     }
     else
     {
-        while (ExecuteRow(IResultSetHelper::NEXT,1,TRUE))
+        while ( ExecuteRow( IResultSetHelper::NEXT, 1, sal_False, sal_True ) )
         {
+            m_aSelectRow->get()[0]->setValue( m_aRow->get()[0]->getValue() );
+            if ( m_pSQLAnalyzer->hasFunctions() )
+                m_pSQLAnalyzer->setSelectionEvaluationResult( m_aSelectRow, m_aColMapping );
+            const sal_Int32 nBookmark = (*m_aRow->get().begin())->getValue();
+            ExecuteRow( IResultSetHelper::BOOKMARK, nBookmark, sal_True, sal_False );
         }
     }
 
@@ -1342,7 +1350,7 @@ void OResultSet::sortRows()
 
 
 // -------------------------------------------------------------------------
-BOOL OResultSet::OpenImpl()
+sal_Bool OResultSet::OpenImpl()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::OpenImpl" );
     OSL_ENSURE(m_pSQLAnalyzer,"No analyzer set with setSqlAnalyzer!");
@@ -1410,9 +1418,9 @@ BOOL OResultSet::OpenImpl()
                     while (bOK)
                     {
                         if (m_pEvaluationKeySet)
-                            ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+                            ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
                         else
-                            bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE);
+                            bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True);
 
                         if (bOK)
                         {
@@ -1432,8 +1440,8 @@ BOOL OResultSet::OpenImpl()
             }
             else
             {
-                BOOL bDistinct = FALSE;
-                BOOL bWasSorted = FALSE;
+                sal_Bool bDistinct = sal_False;
+                sal_Bool bWasSorted = sal_False;
                 OSQLParseNode *pDistinct = m_pParseTree->getChild(1);
                 ::std::vector<sal_Int32>                aOrderbyColumnNumberSave;
                 ::std::vector<TAscendingOrder>          aOrderbyAscendingSave;
@@ -1446,14 +1454,14 @@ BOOL OResultSet::OpenImpl()
                         aOrderbyColumnNumberSave = m_aOrderbyColumnNumber;
                         m_aOrderbyColumnNumber.clear();
                         aOrderbyAscendingSave.assign(m_aOrderbyAscending.begin(), m_aOrderbyAscending.end());
-                        bWasSorted = TRUE;
+                        bWasSorted = sal_True;
                     }
 
                     // the first column is the bookmark column
                     ::std::vector<sal_Int32>::iterator aColStart = (m_aColMapping.begin()+1);
                     ::std::copy(aColStart, m_aColMapping.end(),::std::back_inserter(m_aOrderbyColumnNumber));
                     m_aOrderbyAscending.assign(m_aColMapping.size()-1, SQL_ASC);
-                    bDistinct = TRUE;
+                    bDistinct = sal_True;
                 }
 
                 if (IsSorted())
@@ -1490,15 +1498,15 @@ BOOL OResultSet::OpenImpl()
                     if (nMaxRow)
                     {
     #if OSL_DEBUG_LEVEL > 1
-                        INT32 nFound=0;
+                        sal_Int32 nFound=0;
     #endif
-                        INT32 nPos;
-                        INT32 nKey;
+                        sal_Int32 nPos;
+                        sal_Int32 nKey;
 
                         for( size_t j = nMaxRow-1; j > 0; --j)
                         {
                             nPos = (m_pFileSet->get())[j];
-                            ExecuteRow(IResultSetHelper::BOOKMARK,nPos,FALSE);
+                            ExecuteRow(IResultSetHelper::BOOKMARK,nPos,sal_False);
                             m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping);
                             { // copy row values
                                 OValueRefVector::Vector::iterator copyFrom = m_aSelectRow->get().begin();
@@ -1511,7 +1519,7 @@ BOOL OResultSet::OpenImpl()
 
                             // compare with next row
                             nKey = (m_pFileSet->get())[j-1];
-                            ExecuteRow(IResultSetHelper::BOOKMARK,nKey,FALSE);
+                            ExecuteRow(IResultSetHelper::BOOKMARK,nKey,sal_False);
                             m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping);
                             OValueRefVector::Vector::iterator loopInRow = m_aSelectRow->get().begin();
                             OValueVector::Vector::iterator existentInSearchRow = aSearchRow->get().begin();
@@ -1574,9 +1582,9 @@ BOOL OResultSet::OpenImpl()
                 while (bOK)
                 {
                     if (m_pEvaluationKeySet)
-                        ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),TRUE);
+                        ExecuteRow(IResultSetHelper::BOOKMARK,(*m_aEvaluateIter),sal_True);
                     else
-                        bOK = ExecuteRow(IResultSetHelper::NEXT,1,TRUE);
+                        bOK = ExecuteRow(IResultSetHelper::NEXT,1,sal_True);
 
                     if (bOK)
                     {
@@ -1598,7 +1606,7 @@ BOOL OResultSet::OpenImpl()
             m_nRowCountResult = 0;
 
             OSL_ENSURE(m_aAssignValues.is(),"No assign values set!");
-            if(!m_pTable->InsertRow(*m_aAssignValues, TRUE,m_xColsIdx))
+            if(!m_pTable->InsertRow(*m_aAssignValues, sal_True,m_xColsIdx))
             {
                 m_nFilePos  = 0;
                 return sal_False;
@@ -1652,7 +1660,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
                                    ::std::vector<sal_Int32>& _rColMapping)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::setBoundedColumns" );
-    ::comphelper::UStringMixEqual aCase(_xMetaData->storesMixedCaseQuotedIdentifiers());
+    ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers());
 
     Reference<XPropertySet> xTableColumn;
     ::rtl::OUString sTableColumnName, sSelectColumnRealName;
diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx
index 6d75d6f67357..6d75d6f67357 100644..100755
--- a/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index c470b1b2c927..63584d0a194b 100644..100755
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -442,19 +442,12 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
         return;
     // Everything tested and we have the name of the Column.
     // What number is the Column?
-    try
-    {
-        m_aOrderbyColumnNumber.push_back(xColLocate->findColumn(aColumnName));
-    }
-    catch(Exception)
-    {
-        ::rtl::Reference<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns();
-        ::comphelper::UStringMixEqual aCase;
-        OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),aColumnName,aCase);
-        if ( aFind == aSelectColumns->get().end() )
-            throw SQLException();
-        m_aOrderbyColumnNumber.push_back((aFind - aSelectColumns->get().begin()) + 1);
-    }
+    ::rtl::Reference<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns();
+    ::comphelper::UStringMixEqual aCase;
+    OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),aColumnName,aCase);
+    if ( aFind == aSelectColumns->get().end() )
+        throw SQLException();
+    m_aOrderbyColumnNumber.push_back((aFind - aSelectColumns->get().begin()) + 1);
 
     // Ascending or Descending?
     m_aOrderbyAscending.push_back((SQL_ISTOKEN(pAscendingDescending,DESC)) ? SQL_DESC : SQL_ASC);
@@ -740,7 +733,7 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< String>& aColumnNam
     else if (SQL_ISTOKEN(pRow_Value_Constructor_Elem,NULL))
     {
         // set NULL
-        SetAssignValue(aColumnName, String(), TRUE);
+        SetAssignValue(aColumnName, String(), sal_True);
     }
     else if (SQL_ISRULE(pRow_Value_Constructor_Elem,parameter))
         parseParamterElem(aColumnName,pRow_Value_Constructor_Elem);
@@ -752,8 +745,8 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< String>& aColumnNam
 //------------------------------------------------------------------
 void OStatement_Base::SetAssignValue(const String& aColumnName,
                                    const String& aValue,
-                                   BOOL bSetNull,
-                                   UINT32 nParameter)
+                                   sal_Bool bSetNull,
+                                   sal_uInt32 nParameter)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::SetAssignValue" );
     Reference<XPropertySet> xCol;
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index d5a9eea0407b..d5a9eea0407b 100644..100755
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 4ee04b5d99c7..ddf70610939b 100644..100755
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::container;
 
 DBG_NAME( file_OFileTable )
 OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
-: OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers())
+: OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers())
                 ,m_pConnection(_pConnection)
                 ,m_pFileStream(NULL)
                 ,m_nFilePos(0)
@@ -73,7 +73,7 @@ OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
                     const ::rtl::OUString& _Description ,
                     const ::rtl::OUString& _SchemaName,
                     const ::rtl::OUString& _CatalogName
-                ) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers(),
+                ) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers(),
                                   _Name,
                                   _Type,
                                   _Description,
@@ -205,19 +205,19 @@ void SAL_CALL OFileTable::release() throw()
     OTable_TYPEDEF::release();
 }
 // -----------------------------------------------------------------------------
-BOOL OFileTable::InsertRow(OValueRefVector& /*rRow*/, BOOL /*bFlush*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
+sal_Bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, sal_Bool /*bFlush*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::InsertRow" );
     return sal_False;
 }
 // -----------------------------------------------------------------------------
-BOOL OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/)
+sal_Bool OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::DeleteRow" );
     return sal_False;
 }
 // -----------------------------------------------------------------------------
-BOOL OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
+sal_Bool OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::UpdateRow" );
     return sal_False;
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index b5d918f1f0d9..b5d918f1f0d9 100644..100755
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index fd04c467c690..6cc7b6eaccb3 100644..100755
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -104,7 +104,26 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
                     m_pConnection->throwGenericSQLException(STR_QUERY_COMPLEX_COUNT,NULL);
                 }
                 else
-                    m_aSelectionEvaluations.push_back( TPredicates() );
+                {
+                    if  (   SQL_ISPUNCTUATION( pColumnRef, "*" )
+                        ||  (   SQL_ISRULE( pColumnRef, column_ref )
+                            &&  ( pColumnRef->count() == 3 )
+                            &&  ( pColumnRef->getChild(0)->getNodeType() == SQL_NODE_NAME )
+                            &&  SQL_ISPUNCTUATION( pColumnRef->getChild(1), "." )
+                            &&  SQL_ISRULE( pColumnRef->getChild(2), column_val )
+                            &&  SQL_ISPUNCTUATION( pColumnRef->getChild(2)->getChild(0), "*" )
+                            )
+                        )
+                    {
+                        // push one element for each column of our table
+                        const Reference< XNameAccess > xColumnNames( m_aCompiler->getOrigColumns() );
+                        const Sequence< ::rtl::OUString > aColumnNames( xColumnNames->getElementNames() );
+                        for ( sal_Int32 j=0; j<aColumnNames.getLength(); ++j )
+                            m_aSelectionEvaluations.push_back( TPredicates() );
+                    }
+                    else
+                        m_aSelectionEvaluations.push_back( TPredicates() );
+                }
             }
         }
     }
@@ -264,12 +283,12 @@ OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos,
     return new OOperandAttr(static_cast<sal_uInt16>(_nPos),_xCol);
 }
 // -----------------------------------------------------------------------------
-BOOL OSQLAnalyzer::hasRestriction() const
+sal_Bool OSQLAnalyzer::hasRestriction() const
 {
     return m_aCompiler->hasCode();
 }
 // -----------------------------------------------------------------------------
-BOOL OSQLAnalyzer::hasFunctions() const
+sal_Bool OSQLAnalyzer::hasFunctions() const
 {
     if ( m_bSelectionFirstTime )
     {
@@ -290,11 +309,12 @@ void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std:
     {
         if ( aIter->second.is() )
         {
-            sal_Int32   map = nPos;
             // the first column (index 0) is for convenience only. The first real select column is no 1.
-            if ( (nPos > 0) && (nPos < static_cast<sal_Int32>(_rColumnMapping.size())) )
+            sal_Int32   map = nPos;
+            if ( nPos < static_cast< sal_Int32 >( _rColumnMapping.size() ) )
                 map = _rColumnMapping[nPos];
-            aIter->second->startSelection((_pRow->get())[map]);
+            if ( map > 0 )
+                aIter->second->startSelection( (_pRow->get())[map] );
         }
     }
 }
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 5bc61b64ccc8..bd408cd28c29 100644..100755
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -349,7 +349,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con
         case DataType::LONGVARCHAR:
         {
             rtl::OUString sLH = aLH, sRH = aRH;
-            INT32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength
+            sal_Int32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength
                 (
                  sLH.pData->buffer,
                  sLH.pData->length,
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 634ee8e67608..bd920d356034 100644..100755
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -60,7 +60,7 @@ DBG_NAME(OPredicateCompiler)
 OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs)
                      : m_pAnalyzer(pAnalyzer)
                      , m_nParamCounter(0)
-                     , m_bORCondition(FALSE)
+                     , m_bORCondition(sal_False)
 {
     DBG_CTOR(OPredicateCompiler,NULL);
 }
diff --git a/connectivity/source/drivers/file/file.xml b/connectivity/source/drivers/file/file.xml
index 2d8281bca957..2d8281bca957 100644..100755
--- a/connectivity/source/drivers/file/file.xml
+++ b/connectivity/source/drivers/file/file.xml
diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk
index 41f061de80ca..41f061de80ca 100644..100755
--- a/connectivity/source/drivers/file/makefile.mk
+++ b/connectivity/source/drivers/file/makefile.mk
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index 2d7d5337739d..2469169a6963 100644..100755
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -45,8 +45,8 @@ namespace connectivity
             return 0;
 
         xub_StrLen nTokCount = 1;
-        BOOL bStart = TRUE;     // Are we on the first character in the Token?
-        BOOL bInString = FALSE; // Are we WITHIN a (cStrDel delimited) String?
+        sal_Bool bStart = sal_True;     // Are we on the first character in the Token?
+        sal_Bool bInString = sal_False; // Are we WITHIN a (cStrDel delimited) String?
 
         // Search for String-end after the first not matching character
         for( xub_StrLen i = 0; i < nLen; ++i )
@@ -54,11 +54,11 @@ namespace connectivity
             const sal_Unicode cChar = m_sString.GetChar(i);
             if (bStart)
             {
-                bStart = FALSE;
+                bStart = sal_False;
                 // First character a String-Delimiter?
                 if ( cChar == cStrDel )
                 {
-                    bInString = TRUE;   // then we are now WITHIN the string!
+                    bInString = sal_True;   // then we are now WITHIN the string!
                     continue;           // skip this character!
                 }
             }
@@ -76,7 +76,7 @@ namespace connectivity
                     else
                     {
                         // String-End
-                        bInString = FALSE;
+                        bInString = sal_False;
                     }
                 }
             } // if (bInString)
@@ -86,7 +86,7 @@ namespace connectivity
                 if ( cChar == cTok )
                 {
                     ++nTokCount;
-                    bStart = TRUE;
+                    bStart = sal_True;
                 }
             }
         }
@@ -103,7 +103,7 @@ namespace connectivity
         const xub_StrLen nLen = m_sString.Len();
         if ( nLen )
         {
-            BOOL bInString = (nStartPos < nLen) && (m_sString.GetChar(nStartPos) == cStrDel);   // are we WITHIN a (cStrDel delimited) String?
+            sal_Bool bInString = (nStartPos < nLen) && (m_sString.GetChar(nStartPos) == cStrDel);   // are we WITHIN a (cStrDel delimited) String?
 
             // First character a String-Delimiter?
             if (bInString )
@@ -132,7 +132,7 @@ namespace connectivity
                         else
                         {
                             //end of String
-                            bInString = FALSE;
+                            bInString = sal_False;
                             *pData = 0;
                         }
                     }
diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx
index 685947f48622..685947f48622 100644..100755
--- a/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/connectivity/source/drivers/flat/ECatalog.cxx
diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx
index 43d78e0479bf..43d78e0479bf 100644..100755
--- a/connectivity/source/drivers/flat/EColumns.cxx
+++ b/connectivity/source/drivers/flat/EColumns.cxx
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index 1808e760c430..83b72c67ec6c 100644..100755
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -53,6 +53,7 @@ using namespace ::com::sun::star::lang;
 
 // --------------------------------------------------------------------------------
 OFlatConnection::OFlatConnection(ODriver*   _pDriver) : OConnection(_pDriver)
+    ,m_nMaxRowsToScan(50)
     ,m_bHeaderLine(sal_True)
     ,m_cFieldDelimiter(';')
     ,m_cStringDelimiter('"')
@@ -105,10 +106,15 @@ void OFlatConnection::construct(const ::rtl::OUString& url,const Sequence< Prope
             OSL_VERIFY( pBegin->Value >>= aVal );
             m_cThousandDelimiter = aVal.toChar();
         }
+        else if ( !pBegin->Name.compareToAscii("MaxRowScan") )
+        {
+            pBegin->Value >>= m_nMaxRowsToScan;
+        }
     }
 
     osl_decrementInterlockedCount( &m_refCount );
     OConnection::construct(url,info);
+    m_bShowDeleted = sal_True; // we do not supported rows for this type
 }
 // --------------------------------------------------------------------------------
 Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData(  ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index 6281142f59ab..6281142f59ab 100644..100755
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index ef9a190102df..ef9a190102df 100644..100755
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
diff --git a/connectivity/source/drivers/flat/EPreparedStatement.cxx b/connectivity/source/drivers/flat/EPreparedStatement.cxx
index 4800d96a2907..4800d96a2907 100644..100755
--- a/connectivity/source/drivers/flat/EPreparedStatement.cxx
+++ b/connectivity/source/drivers/flat/EPreparedStatement.cxx
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index d484c8f51134..d484c8f51134 100644..100755
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
diff --git a/connectivity/source/drivers/flat/EStatement.cxx b/connectivity/source/drivers/flat/EStatement.cxx
index f7b617e8019e..f7b617e8019e 100644..100755
--- a/connectivity/source/drivers/flat/EStatement.cxx
+++ b/connectivity/source/drivers/flat/EStatement.cxx
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index bf6eb951da45..c4638889d15e 100644..100755
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::lang;
 void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "Ocke.Janssen@sun.com", "OFlatTable::fillColumns" );
-    BOOL bRead = TRUE;
+    sal_Bool bRead = sal_True;
 
     QuotedTokenizedString aHeaderLine;
     OFlatConnection* pConnection = (OFlatConnection*)m_pConnection;
@@ -114,11 +114,11 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
     m_aScales.clear();
     // reserve some space
     m_aColumns->get().reserve(nFieldCount+1);
-    m_aTypes.reserve(nFieldCount+1);
-    m_aPrecisions.reserve(nFieldCount+1);
-    m_aScales.reserve(nFieldCount+1);
+    m_aTypes.assign(nFieldCount+1,DataType::SQLNULL);
+    m_aPrecisions.assign(nFieldCount+1,-1);
+    m_aScales.assign(nFieldCount+1,-1);
 
-    const sal_Bool bCase = m_pConnection->getMetaData()->storesMixedCaseQuotedIdentifiers();
+    const sal_Bool bCase = m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers();
     CharClass aCharClass(pConnection->getDriver()->getFactory(),_aLocale);
     // read description
     const sal_Unicode cDecimalDelimiter  = pConnection->getDecimalDelimiter();
@@ -126,106 +126,186 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
     String aColumnName;
     ::rtl::OUString aTypeName;
     ::comphelper::UStringMixEqual aCase(bCase);
-    xub_StrLen nStartPosHeaderLine = 0; // use for eficient way to get the tokens
-    xub_StrLen nStartPosFirstLine = 0; // use for eficient way to get the tokens
-    xub_StrLen nStartPosFirstLine2 = 0;
-    for (xub_StrLen i = 0; i < nFieldCount; i++)
+    ::std::vector<String> aColumnNames,m_aTypeNames;
+    m_aTypeNames.resize(nFieldCount);
+    const sal_Int32 nMaxRowsToScan = pConnection->getMaxRowsToScan();
+    sal_Int32 nRowCount = 0;
+    do
     {
-        if ( bHasHeaderLine )
+        xub_StrLen nStartPosHeaderLine = 0; // use for eficient way to get the tokens
+        xub_StrLen nStartPosFirstLine = 0; // use for eficient way to get the tokens
+        xub_StrLen nStartPosFirstLine2 = 0;
+        for (xub_StrLen i = 0; i < nFieldCount; i++)
         {
-            aHeaderLine.GetTokenSpecial(aColumnName,nStartPosHeaderLine,m_cFieldDelimiter,m_cStringDelimiter);
-            if ( !aColumnName.Len() )
+            if ( nRowCount == 0)
             {
-                aColumnName = 'C';
-                aColumnName += String::CreateFromInt32(i+1);
+                if ( bHasHeaderLine )
+                {
+                    aHeaderLine.GetTokenSpecial(aColumnName,nStartPosHeaderLine,m_cFieldDelimiter,m_cStringDelimiter);
+                    if ( !aColumnName.Len() )
+                    {
+                        aColumnName = 'C';
+                        aColumnName += String::CreateFromInt32(i+1);
+                    }
+                }
+                else
+                {
+                    // no column name so ...
+                    aColumnName = 'C';
+                    aColumnName += String::CreateFromInt32(i+1);
+                }
+                aColumnNames.push_back(aColumnName);
             }
+            impl_fillColumnInfo_nothrow(aFirstLine,nStartPosFirstLine,nStartPosFirstLine2,m_aTypes[i],m_aPrecisions[i],m_aScales[i],m_aTypeNames[i],cDecimalDelimiter,cThousandDelimiter,aCharClass);
         }
-        else
+        ++nRowCount;
+    }
+    while(nRowCount < nMaxRowsToScan && m_pFileStream->ReadByteStringLine(aFirstLine,nEncoding));
+
+    for (xub_StrLen i = 0; i < nFieldCount; i++)
+    {
+        // check if the columname already exists
+        String aAlias(aColumnNames[i]);
+        OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
+        sal_Int32 nExprCnt = 0;
+        while(aFind != m_aColumns->get().end())
         {
-            // no column name so ...
-            aColumnName = 'C';
-            aColumnName += String::CreateFromInt32(i+1);
+            (aAlias = aColumnNames[i]) += String::CreateFromInt32(++nExprCnt);
+            aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
         }
-        sal_Int32 eType;
-        UINT16 nPrecision = 0;
-        UINT16 nScale = 0;
 
-        BOOL bNumeric = FALSE;
-        ULONG  nIndex = 0;
+        sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,m_aTypeNames[i],::rtl::OUString(),::rtl::OUString(),
+                                                ColumnValue::NULLABLE,
+                                                m_aPrecisions[i],
+                                                m_aScales[i],
+                                                m_aTypes[i],
+                                                sal_False,
+                                                sal_False,
+                                                sal_False,
+                                                bCase);
+        Reference< XPropertySet> xCol = pColumn;
+        m_aColumns->get().push_back(xCol);
+    }
+    m_pFileStream->Seek(m_nStartRowFilePos);
+}
+void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,xub_StrLen& nStartPosFirstLine,xub_StrLen& nStartPosFirstLine2
+                                             ,sal_Int32& io_nType,sal_Int32& io_nPrecisions,sal_Int32& io_nScales,String& o_sTypeName
+                                             ,const sal_Unicode cDecimalDelimiter,const sal_Unicode cThousandDelimiter,const CharClass&  aCharClass)
+{
+    if ( io_nType != DataType::VARCHAR )
+    {
+        sal_Bool bNumeric = io_nType == DataType::SQLNULL || io_nType == DataType::DOUBLE || io_nType == DataType::DECIMAL || io_nType == DataType::INTEGER;
+        sal_uLong  nIndex = 0;
 
-        // first without fielddelimiter
-        String aField;
-        aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine,m_cFieldDelimiter,'\0');
-        if (aField.Len() == 0 ||
-            (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
+        if ( bNumeric )
         {
-            bNumeric = FALSE;
-            if ( m_cStringDelimiter != '\0' )
-                aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
-            else
-                nStartPosFirstLine2 = nStartPosFirstLine;
-        }
-        else
-        {
-            String aField2;
-            if ( m_cStringDelimiter != '\0' )
-                aFirstLine.GetTokenSpecial(aField2,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
-            else
-                aField2 = aField;
-
-            if (aField2.Len() == 0)
+            // first without fielddelimiter
+            String aField;
+            aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine,m_cFieldDelimiter,'\0');
+            if (aField.Len() == 0 ||
+                (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
             {
-                bNumeric = FALSE;
+                bNumeric = sal_False;
+                if ( m_cStringDelimiter != '\0' )
+                    aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+                else
+                    nStartPosFirstLine2 = nStartPosFirstLine;
             }
             else
             {
-                bNumeric = TRUE;
-                xub_StrLen nDot = 0;
-                xub_StrLen nDecimalDelCount = 0;
-                for (xub_StrLen j = 0; j < aField2.Len(); j++)
+                String aField2;
+                if ( m_cStringDelimiter != '\0' )
+                    aFirstLine.GetTokenSpecial(aField2,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+                else
+                    aField2 = aField;
+
+                if (aField2.Len() == 0)
                 {
-                    const sal_Unicode c = aField2.GetChar(j);
-                    // just digits, decimal- and thousands-delimiter?
-                    if ( ( !cDecimalDelimiter  || c != cDecimalDelimiter )  &&
-                         ( !cThousandDelimiter || c != cThousandDelimiter ) &&
-                        !aCharClass.isDigit(aField2,j)                      &&
-                        ( j != 0 || (c != '+' && c != '-' ) ) )
-                    {
-                        bNumeric = FALSE;
-                        break;
-                    }
-                    if (cDecimalDelimiter && c == cDecimalDelimiter)
-                    {
-                        nPrecision = 15; // we have an decimal value
-                        nScale = 2;
-                        ++nDecimalDelCount;
-                    } // if (cDecimalDelimiter && c == cDecimalDelimiter)
-                    if ( c == '.' )
-                        ++nDot;
+                    bNumeric = sal_False;
                 }
-
-                if (nDecimalDelCount > 1 || nDot > 1 ) // if there is more than one dot it isn't a number
-                    bNumeric = FALSE;
-                if (bNumeric && cThousandDelimiter)
+                else
                 {
-                    // is the delimiter correctly given?
-                    const String aValue = aField2.GetToken(0,cDecimalDelimiter);
-                    for (sal_Int32 j = aValue.Len() - 4; j >= 0; j -= 4)
+                    bNumeric = sal_True;
+                    xub_StrLen nDot = 0;
+                    xub_StrLen nDecimalDelCount = 0;
+                    xub_StrLen nSpaceCount = 0;
+                    for (xub_StrLen j = 0; j < aField2.Len(); j++)
                     {
-                        const sal_Unicode c = aValue.GetChar(static_cast<sal_uInt16>(j));
-                        // just digits, decimal- and thousands-delimiter?
-                        if (c == cThousandDelimiter && j)
+                        const sal_Unicode c = aField2.GetChar(j);
+                        if ( j == nSpaceCount && m_cFieldDelimiter != 32 && c == 32 )
+                        {
+                            ++nSpaceCount;
                             continue;
-                        else
+                        }
+                        // just digits, decimal- and thousands-delimiter?
+                        if ( ( !cDecimalDelimiter  || c != cDecimalDelimiter )  &&
+                             ( !cThousandDelimiter || c != cThousandDelimiter ) &&
+                            !aCharClass.isDigit(aField2,j)                      &&
+                            ( j != 0 || (c != '+' && c != '-' ) ) )
                         {
-                            bNumeric = FALSE;
+                            bNumeric = sal_False;
                             break;
                         }
+                        if (cDecimalDelimiter && c == cDecimalDelimiter)
+                        {
+                            io_nPrecisions = 15; // we have an decimal value
+                            io_nScales = 2;
+                            ++nDecimalDelCount;
+                        } // if (cDecimalDelimiter && c == cDecimalDelimiter)
+                        if ( c == '.' )
+                            ++nDot;
                     }
-                }
 
-                // now it still can be a Date-field
-                if (!bNumeric)
+                    if (nDecimalDelCount > 1 || nDot > 1 ) // if there is more than one dot it isn't a number
+                        bNumeric = sal_False;
+                    if (bNumeric && cThousandDelimiter)
+                    {
+                        // Is the delimiter correct?
+                        const String aValue = aField2.GetToken(0,cDecimalDelimiter);
+                        for (sal_Int32 j = aValue.Len() - 4; j >= 0; j -= 4)
+                        {
+                            const sal_Unicode c = aValue.GetChar(static_cast<sal_uInt16>(j));
+                            // just digits, decimal- and thousands-delimiter?
+                            if (c == cThousandDelimiter && j)
+                                continue;
+                            else
+                            {
+                                bNumeric = sal_False;
+                                break;
+                            }
+                        }
+                    }
+
+                    // now also check for a date field
+                    if (!bNumeric)
+                    {
+                        try
+                        {
+                            nIndex = m_xNumberFormatter->detectNumberFormat(::com::sun::star::util::NumberFormat::ALL,aField2);
+                        }
+                        catch(Exception&)
+                        {
+                        }
+                    }
+                }
+            }
+        }
+        else if ( io_nType == DataType::DATE || io_nType == DataType::TIMESTAMP || io_nType == DataType::TIME)
+        {
+            String aField;
+            aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine,m_cFieldDelimiter,'\0');
+            if (aField.Len() == 0 ||
+                (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
+            {
+            }
+            else
+            {
+                String aField2;
+                if ( m_cStringDelimiter != '\0' )
+                    aFirstLine.GetTokenSpecial(aField2,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+                else
+                    aField2 = aField;
+                if (aField2.Len() )
                 {
                     try
                     {
@@ -243,87 +323,83 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
         {
             if (cDecimalDelimiter)
             {
-                if(nPrecision)
+                if(io_nPrecisions)
                 {
-                    eType = DataType::DECIMAL;
+                    io_nType = DataType::DECIMAL;
                     static const ::rtl::OUString s_sDECIMAL(RTL_CONSTASCII_USTRINGPARAM("DECIMAL"));
-                    aTypeName = s_sDECIMAL;
+                    o_sTypeName = s_sDECIMAL;
                 }
                 else
                 {
-                    eType = DataType::DOUBLE;
+                    io_nType = DataType::DOUBLE;
                     static const ::rtl::OUString s_sDOUBLE(RTL_CONSTASCII_USTRINGPARAM("DOUBLE"));
-                    aTypeName = s_sDOUBLE;
+                    o_sTypeName = s_sDOUBLE;
                 }
             }
             else
-                eType = DataType::INTEGER;
+            {
+                io_nType = DataType::INTEGER;
+                io_nPrecisions = 0;
+                io_nScales = 0;
+            }
             nFlags = ColumnSearch::BASIC;
         }
         else
         {
-
             switch (comphelper::getNumberFormatType(m_xNumberFormatter,nIndex))
             {
                 case NUMBERFORMAT_DATE:
-                    eType = DataType::DATE;
+                    io_nType = DataType::DATE;
                     {
                         static const ::rtl::OUString s_sDATE(RTL_CONSTASCII_USTRINGPARAM("DATE"));
-                        aTypeName = s_sDATE;
+                        o_sTypeName = s_sDATE;
                     }
                     break;
                 case NUMBERFORMAT_DATETIME:
-                    eType = DataType::TIMESTAMP;
+                    io_nType = DataType::TIMESTAMP;
                     {
                         static const ::rtl::OUString s_sTIMESTAMP(RTL_CONSTASCII_USTRINGPARAM("TIMESTAMP"));
-                        aTypeName = s_sTIMESTAMP;
+                        o_sTypeName = s_sTIMESTAMP;
                     }
                     break;
                 case NUMBERFORMAT_TIME:
-                    eType = DataType::TIME;
+                    io_nType = DataType::TIME;
                     {
                         static const ::rtl::OUString s_sTIME(RTL_CONSTASCII_USTRINGPARAM("TIME"));
-                        aTypeName = s_sTIME;
+                        o_sTypeName = s_sTIME;
                     }
                     break;
                 default:
-                    eType = DataType::VARCHAR;
-                    nPrecision = 0; // nyi: Data can be longer!
-                    nScale = 0;
+                    io_nType = DataType::VARCHAR;
+                    io_nPrecisions = 0; // nyi: Data can be longer!
+                    io_nScales = 0;
                     {
                         static const ::rtl::OUString s_sVARCHAR(RTL_CONSTASCII_USTRINGPARAM("VARCHAR"));
-                        aTypeName = s_sVARCHAR;
+                        o_sTypeName = s_sVARCHAR;
                     }
             };
             nFlags |= ColumnSearch::CHAR;
         }
-
-        // check if the columname already exists
-        String aAlias(aColumnName);
-        OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
-        sal_Int32 nExprCnt = 0;
-        while(aFind != m_aColumns->get().end())
+    }
+    else
+    {
+        String aField;
+        aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine,m_cFieldDelimiter,'\0');
+        if (aField.Len() == 0 ||
+                (m_cStringDelimiter && m_cStringDelimiter == aField.GetChar(0)))
         {
-            (aAlias = aColumnName) += String::CreateFromInt32(++nExprCnt);
-            aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
+            if ( m_cStringDelimiter != '\0' )
+                aFirstLine.GetTokenSpecial(aField,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
+            else
+                nStartPosFirstLine2 = nStartPosFirstLine;
+        }
+        else
+        {
+            String aField2;
+            if ( m_cStringDelimiter != '\0' )
+                aFirstLine.GetTokenSpecial(aField2,nStartPosFirstLine2,m_cFieldDelimiter,m_cStringDelimiter);
         }
-
-        sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,aTypeName,::rtl::OUString(),::rtl::OUString(),
-                                                ColumnValue::NULLABLE,
-                                                nPrecision,
-                                                nScale,
-                                                eType,
-                                                sal_False,
-                                                sal_False,
-                                                sal_False,
-                                                bCase);
-        Reference< XPropertySet> xCol = pColumn;
-        m_aColumns->get().push_back(xCol);
-        m_aTypes.push_back(eType);
-        m_aPrecisions.push_back(nPrecision);
-        m_aScales.push_back(nScale);
     }
-    m_pFileStream->Seek(m_nStartRowFilePos);
 }
 // -------------------------------------------------------------------------
 OFlatTable::OFlatTable(sdbcx::OCollection* _pTables,OFlatConnection* _pConnection,
@@ -531,7 +607,7 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal
     *(_rRow->get())[0] = m_nFilePos;
 
     if (!bRetrieveData)
-        return TRUE;
+        return sal_True;
     if ( m_bNeedToReadLine )
     {
         sal_Int32 nCurrentPos = 0;
diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx
index f9ba451c4854..f9ba451c4854 100644..100755
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 3d11375df02f..68af0a19524e 100644..100755
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "flat/EDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::flat;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,27 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the Module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "FILE::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -119,31 +96,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriver::getImplementationName_Static(),
-            ODriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "FILE::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/flat/exports.dxp b/connectivity/source/drivers/flat/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/flat/exports.dxp
+++ b/connectivity/source/drivers/flat/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/flat/flat.component b/connectivity/source/drivers/flat/flat.component
new file mode 100755
index 000000000000..fe8b79ee73b8
--- /dev/null
+++ b/connectivity/source/drivers/flat/flat.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.flat.ODriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/flat/flat.mxp.map b/connectivity/source/drivers/flat/flat.mxp.map
index 54a8532f7840..2737c61b5a57 100644..100755
--- a/connectivity/source/drivers/flat/flat.mxp.map
+++ b/connectivity/source/drivers/flat/flat.mxp.map
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/drivers/flat/flat.xcu b/connectivity/source/drivers/flat/flat.xcu
index d00d1f98c38c..a54394e853e8 100755
--- a/connectivity/source/drivers/flat/flat.xcu
+++ b/connectivity/source/drivers/flat/flat.xcu
@@ -75,8 +75,18 @@
             <value>false</value>
           </prop>
         </node>
+        <node oor:name="MaxRowScan" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:int">
+            <value>100</value>
+          </prop>
+        </node>
       </node>
       <node oor:name="Features">
+        <node oor:name="MaxRowScan" oor:op="replace">
+          <prop oor:name="Value" oor:type="xs:boolean">
+            <value>true</value>
+          </prop>
+        </node>
         <node oor:name="UseSQL92NamingConstraints" oor:op="replace">
           <prop oor:name="Value" oor:type="xs:boolean">
             <value>true</value>
diff --git a/connectivity/source/drivers/flat/flat.xml b/connectivity/source/drivers/flat/flat.xml
index f3738cc312ba..f3738cc312ba 100644..100755
--- a/connectivity/source/drivers/flat/flat.xml
+++ b/connectivity/source/drivers/flat/flat.xml
diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk
index da801c44a830..0fe857919dd5 100644..100755
--- a/connectivity/source/drivers/flat/makefile.mk
+++ b/connectivity/source/drivers/flat/makefile.mk
@@ -105,3 +105,11 @@ DEF1EXPORTFILE=	exports.dxp
 .INCLUDE : $(PRJ)$/target.pmk
 
 
+
+ALLTAR : $(MISC)/flat.component
+
+$(MISC)/flat.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        flat.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt flat.component
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 2dda469c1fb8..2dda469c1fb8 100644..100755
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index 798afeaf20bf..798afeaf20bf 100644..100755
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 3f4ca4baea93..3f4ca4baea93 100644..100755
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 818fb4d293e1..6756fd5a8447 100644..100755
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -276,22 +276,38 @@ namespace connectivity
                             if ( pStream.get() )
                             {
                                 ByteString sLine;
+                                ByteString sVersionString;
                                 while ( pStream->ReadLine(sLine) )
                                 {
-                                    if ( sLine.Equals("version=",0,sizeof("version=")-1) )
+                                    if ( sLine.Len() == 0 )
+                                        continue;
+                                    const ByteString sIniKey = sLine.GetToken( 0, '=' );
+                                    const ByteString sValue = sLine.GetToken( 1, '=' );
+                                    if ( sIniKey.Equals( "hsqldb.compatible_version" ) )
                                     {
-                                        sLine = sLine.GetToken(1,'=');
-                                        const sal_Int32 nMajor = sLine.GetToken(0,'.').ToInt32();
-                                        const sal_Int32 nMinor = sLine.GetToken(1,'.').ToInt32();
-                                        const sal_Int32 nMicro = sLine.GetToken(2,'.').ToInt32();
-                                        if (     nMajor > 1
-                                            || ( nMajor == 1 && nMinor > 8 )
-                                            || ( nMajor == 1 && nMinor == 8 && nMicro > 0 ) )
+                                        sVersionString = sValue;
+                                    }
+                                    else
+                                    {
+                                        if  (   sIniKey.Equals( "version" )
+                                            &&  ( sVersionString.Len() == 0 )
+                                            )
                                         {
-                                            ::connectivity::SharedResources aResources;
-                                            sMessage = aResources.getResourceString(STR_ERROR_NEW_VERSION);
+                                            sVersionString = sValue;
                                         }
-                                        break;
+                                    }
+                                }
+                                if ( sVersionString.Len() )
+                                {
+                                    const sal_Int32 nMajor = sVersionString.GetToken(0,'.').ToInt32();
+                                    const sal_Int32 nMinor = sVersionString.GetToken(1,'.').ToInt32();
+                                    const sal_Int32 nMicro = sVersionString.GetToken(2,'.').ToInt32();
+                                    if (     nMajor > 1
+                                        || ( nMajor == 1 && nMinor > 8 )
+                                        || ( nMajor == 1 && nMinor == 8 && nMicro > 0 ) )
+                                    {
+                                        ::connectivity::SharedResources aResources;
+                                        sMessage = aResources.getResourceString(STR_ERROR_NEW_VERSION);
                                     }
                                 }
                             }
diff --git a/connectivity/source/drivers/hsqldb/HStorage.hxx b/connectivity/source/drivers/hsqldb/HStorage.hxx
index cd7e94b44bf0..cd7e94b44bf0 100644..100755
--- a/connectivity/source/drivers/hsqldb/HStorage.hxx
+++ b/connectivity/source/drivers/hsqldb/HStorage.hxx
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 04f15cab4a21..04f15cab4a21 100644..100755
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 535f821c4902..f8bc5c53b0ce 100644..100755
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -138,7 +138,7 @@ namespace connectivity
         ::rtl::OUString StorageContainer::removeOldURLPrefix(const ::rtl::OUString& _sURL)
         {
             ::rtl::OUString sRet = _sURL;
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
             sal_Int32 nIndex = sRet.lastIndexOf('\\');
 #else
             sal_Int32 nIndex = sRet.lastIndexOf('/');
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 90ced7e5066c..90ced7e5066c 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index d055a87f2cbb..d055a87f2cbb 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index 070d5e8be5cb..070d5e8be5cb 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
index b8af49d66dc8..b8af49d66dc8 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index f3849359f80f..f3849359f80f 100644..100755
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index a433ed0c34a3..a433ed0c34a3 100644..100755
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index 8cf6f649db0b..8cf6f649db0b 100644..100755
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index 86f0ddfcca46..86f0ddfcca46 100644..100755
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index edc01233dc65..edc01233dc65 100644..100755
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index 2541c106cd2b..ac7b319ca44c 100644..100755
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -31,13 +31,11 @@
 
 #include "hsqldb/HDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::hsqldb;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -50,27 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-// The prescribed C-Api must be met!
-// It consists of three functions, which must be exported by the Module.
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -120,31 +97,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriverDelegator::getImplementationName_Static(),
-            ODriverDelegator::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 9bd28fa0b0d4..9bd28fa0b0d4 100644..100755
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index 28711c7bf277..28711c7bf277 100644..100755
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index 8bae08b4bf30..8bae08b4bf30 100644..100755
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx
index a80350eef30c..a80350eef30c 100644..100755
--- a/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.cxx
diff --git a/connectivity/source/drivers/hsqldb/accesslog.hxx b/connectivity/source/drivers/hsqldb/accesslog.hxx
index d29e67c2aa37..d29e67c2aa37 100644..100755
--- a/connectivity/source/drivers/hsqldb/accesslog.hxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.hxx
diff --git a/connectivity/source/drivers/hsqldb/exports.dxp b/connectivity/source/drivers/hsqldb/exports.dxp
index 7ff56f4f9977..3efc73741d24 100644..100755
--- a/connectivity/source/drivers/hsqldb/exports.dxp
+++ b/connectivity/source/drivers/hsqldb/exports.dxp
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream
 Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.component b/connectivity/source/drivers/hsqldb/hsqldb.component
new file mode 100755
index 000000000000..eb8ae477e749
--- /dev/null
+++ b/connectivity/source/drivers/hsqldb/hsqldb.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.sdbcx.comp.hsqldb.Driver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.map b/connectivity/source/drivers/hsqldb/hsqldb.map
index b4fc53b320ef..b611aba02d5b 100644..100755
--- a/connectivity/source/drivers/hsqldb/hsqldb.map
+++ b/connectivity/source/drivers/hsqldb/hsqldb.map
@@ -1,7 +1,6 @@
 UDK_3_0_0 {
     global:
         component_getImplementationEnvironment;
-        component_writeInfo;
         component_getFactory;
         Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream;
         Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII;
diff --git a/connectivity/source/drivers/hsqldb/hsqldb.xml b/connectivity/source/drivers/hsqldb/hsqldb.xml
index c456c253777d..c456c253777d 100644..100755
--- a/connectivity/source/drivers/hsqldb/hsqldb.xml
+++ b/connectivity/source/drivers/hsqldb/hsqldb.xml
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.hrc b/connectivity/source/drivers/hsqldb/hsqlui.hrc
index 2f25d5a8c198..2f25d5a8c198 100644..100755
--- a/connectivity/source/drivers/hsqldb/hsqlui.hrc
+++ b/connectivity/source/drivers/hsqldb/hsqlui.hrc
diff --git a/connectivity/source/drivers/hsqldb/hsqlui.src b/connectivity/source/drivers/hsqldb/hsqlui.src
index 913f366429ea..913f366429ea 100644..100755
--- a/connectivity/source/drivers/hsqldb/hsqlui.src
+++ b/connectivity/source/drivers/hsqldb/hsqlui.src
diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk
index 21274e8d4257..6e400696faa0 100644..100755
--- a/connectivity/source/drivers/hsqldb/makefile.mk
+++ b/connectivity/source/drivers/hsqldb/makefile.mk
@@ -103,6 +103,7 @@ SHL1STDLIBS=\
 
 
 SHL1DEPN=
+SHL1CREATEJNILIB=TRUE
 SHL1IMPLIB=	i$(HSQLDB_TARGET)
 
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
@@ -115,3 +116,11 @@ DEF1EXPORTFILE=	exports.dxp
 .INCLUDE : $(PRJ)$/target.pmk
 
 
+
+ALLTAR : $(MISC)/hsqldb.component
+
+$(MISC)/hsqldb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        hsqldb.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt hsqldb.component
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index 5e30c0c17ad3..5e30c0c17ad3 100644..100755
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx
index 50765fa9cba4..50765fa9cba4 100644..100755
--- a/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/connectivity/source/drivers/jdbc/Blob.cxx
diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index 307f6af80883..307f6af80883 100644..100755
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 81bb2c9859b3..81bb2c9859b3 100644..100755
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx
index b9c22e7bc955..b9c22e7bc955 100644..100755
--- a/connectivity/source/drivers/jdbc/Class.cxx
+++ b/connectivity/source/drivers/jdbc/Class.cxx
diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx
index 634274b238a3..634274b238a3 100644..100755
--- a/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/connectivity/source/drivers/jdbc/Clob.cxx
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index 2fea1cea6d14..2fea1cea6d14 100644..100755
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index 36ff7a067cc4..36ff7a067cc4 100644..100755
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 4feff317369c..4feff317369c 100644..100755
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx
index ac61b9da9d8a..ac61b9da9d8a 100644..100755
--- a/connectivity/source/drivers/jdbc/Date.cxx
+++ b/connectivity/source/drivers/jdbc/Date.cxx
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 8f0d67508936..8f0d67508936 100644..100755
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
diff --git a/connectivity/source/drivers/jdbc/Exception.cxx b/connectivity/source/drivers/jdbc/Exception.cxx
index 330cb3eda39f..330cb3eda39f 100644..100755
--- a/connectivity/source/drivers/jdbc/Exception.cxx
+++ b/connectivity/source/drivers/jdbc/Exception.cxx
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index 6db9d15d2e55..6db9d15d2e55 100644..100755
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index de48039a3543..de48039a3543 100644..100755
--- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 90209d8c528b..90209d8c528b 100644..100755
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index da389c4188dd..da389c4188dd 100644..100755
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index f34c7ef05ffc..f34c7ef05ffc 100644..100755
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index e9e90e77f9fe..e9e90e77f9fe 100644..100755
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index a485372b3d66..a485372b3d66 100644..100755
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 3415122d8ce6..3415122d8ce6 100644..100755
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx
index 7d30e94c23b1..7d30e94c23b1 100644..100755
--- a/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/connectivity/source/drivers/jdbc/Ref.cxx
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index a2d9d453f20a..a2d9d453f20a 100644..100755
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index 3d64d67630e8..3d64d67630e8 100644..100755
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx
index 6df28a63b63b..6df28a63b63b 100644..100755
--- a/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/connectivity/source/drivers/jdbc/SQLException.cxx
diff --git a/connectivity/source/drivers/jdbc/SQLWarning.cxx b/connectivity/source/drivers/jdbc/SQLWarning.cxx
index 85be40a6c342..85be40a6c342 100644..100755
--- a/connectivity/source/drivers/jdbc/SQLWarning.cxx
+++ b/connectivity/source/drivers/jdbc/SQLWarning.cxx
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index 18af00d67171..18af00d67171 100644..100755
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx
index 40713ed10beb..40713ed10beb 100644..100755
--- a/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/connectivity/source/drivers/jdbc/Throwable.cxx
diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index b45e44ed4d9d..b45e44ed4d9d 100644..100755
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
diff --git a/connectivity/source/drivers/jdbc/exports.dxp b/connectivity/source/drivers/jdbc/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/jdbc/exports.dxp
+++ b/connectivity/source/drivers/jdbc/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/jdbc/jdbc.component b/connectivity/source/drivers/jdbc/jdbc.component
new file mode 100755
index 000000000000..5d7db4690ba5
--- /dev/null
+++ b/connectivity/source/drivers/jdbc/jdbc.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.JDBCDriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/jdbc/jdbc.mxp.map b/connectivity/source/drivers/jdbc/jdbc.mxp.map
index a4457e2478af..e02823e8c41b 100644..100755
--- a/connectivity/source/drivers/jdbc/jdbc.mxp.map
+++ b/connectivity/source/drivers/jdbc/jdbc.mxp.map
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/drivers/jdbc/jdbc.xml b/connectivity/source/drivers/jdbc/jdbc.xml
index bdce638fcf0f..bdce638fcf0f 100644..100755
--- a/connectivity/source/drivers/jdbc/jdbc.xml
+++ b/connectivity/source/drivers/jdbc/jdbc.xml
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index f29909d94fbd..fe98be8ad1ff 100644..100755
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -35,7 +35,6 @@ using namespace connectivity;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -48,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pModCount
         );
 
-//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "SBA::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -123,31 +97,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            java_sql_Driver::getImplementationName_Static(),
-            java_sql_Driver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "SBA::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk
index d676945f1789..befdc73d7bf8 100644..100755
--- a/connectivity/source/drivers/jdbc/makefile.mk
+++ b/connectivity/source/drivers/jdbc/makefile.mk
@@ -110,3 +110,11 @@ DEF1EXPORTFILE=	exports.dxp
 .INCLUDE : $(PRJ)$/target.pmk
 
 
+
+ALLTAR : $(MISC)/jdbc.component
+
+$(MISC)/jdbc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        jdbc.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt jdbc.component
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index ae5672b3406f..ae5672b3406f 100644..100755
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx
index 99148afd5656..99148afd5656 100644..100755
--- a/connectivity/source/drivers/kab/KCatalog.cxx
+++ b/connectivity/source/drivers/kab/KCatalog.cxx
diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx
index 27f80caafc73..27f80caafc73 100644..100755
--- a/connectivity/source/drivers/kab/KCatalog.hxx
+++ b/connectivity/source/drivers/kab/KCatalog.hxx
diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx
index 398950c192ff..398950c192ff 100644..100755
--- a/connectivity/source/drivers/kab/KColumns.cxx
+++ b/connectivity/source/drivers/kab/KColumns.cxx
diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx
index 6ab3d32a39ec..6ab3d32a39ec 100644..100755
--- a/connectivity/source/drivers/kab/KColumns.hxx
+++ b/connectivity/source/drivers/kab/KColumns.hxx
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index b9761ebe9cb8..b9761ebe9cb8 100644..100755
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index b58460c0a80d..b58460c0a80d 100644..100755
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index 922b636337d4..922b636337d4 100644..100755
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
diff --git a/connectivity/source/drivers/kab/KDEInit.h b/connectivity/source/drivers/kab/KDEInit.h
index 9a5ea70da211..9a5ea70da211 100644..100755
--- a/connectivity/source/drivers/kab/KDEInit.h
+++ b/connectivity/source/drivers/kab/KDEInit.h
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index 870b46ed3546..870b46ed3546 100644..100755
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
index 2a3e130b6789..2a3e130b6789 100644..100755
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 8c5554082078..8c5554082078 100644..100755
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx
index e210bd7d5532..e210bd7d5532 100644..100755
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx
index 2b1c13649b01..2b1c13649b01 100644..100755
--- a/connectivity/source/drivers/kab/KPreparedStatement.cxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx
index dfaf0407e238..dfaf0407e238 100644..100755
--- a/connectivity/source/drivers/kab/KPreparedStatement.hxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx
index 7a7043eb34c6..7a7043eb34c6 100644..100755
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index fc7e5f49ce26..fc7e5f49ce26 100644..100755
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
index 95fed3057cfc..95fed3057cfc 100644..100755
--- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
index 2e04fa84c8b6..2e04fa84c8b6 100644..100755
--- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx
index 94cc95b689cb..8f2d76357498 100644..100755
--- a/connectivity/source/drivers/kab/KServices.cxx
+++ b/connectivity/source/drivers/kab/KServices.cxx
@@ -31,13 +31,11 @@
 
 #include "KDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::kab;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -50,31 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pTemp
         );
 
-//***************************************************************************************
-//
-// The following C Api must be provided!
-// It consists in three functions that must be exported by the module
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "KAB::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -124,31 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void*,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            KabDriver::getImplementationName_Static(),
-            KabDriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "KAB::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index 4121681255fd..4121681255fd 100644..100755
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx
index dcc141fc9bd2..dcc141fc9bd2 100644..100755
--- a/connectivity/source/drivers/kab/KStatement.hxx
+++ b/connectivity/source/drivers/kab/KStatement.hxx
diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx
index f0af9c6c41c5..f0af9c6c41c5 100644..100755
--- a/connectivity/source/drivers/kab/KTable.cxx
+++ b/connectivity/source/drivers/kab/KTable.cxx
diff --git a/connectivity/source/drivers/kab/KTable.hxx b/connectivity/source/drivers/kab/KTable.hxx
index 9ab4fb532143..9ab4fb532143 100644..100755
--- a/connectivity/source/drivers/kab/KTable.hxx
+++ b/connectivity/source/drivers/kab/KTable.hxx
diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx
index 55f10203b226..55f10203b226 100644..100755
--- a/connectivity/source/drivers/kab/KTables.cxx
+++ b/connectivity/source/drivers/kab/KTables.cxx
diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx
index d2d8179c09cf..d2d8179c09cf 100644..100755
--- a/connectivity/source/drivers/kab/KTables.hxx
+++ b/connectivity/source/drivers/kab/KTables.hxx
diff --git a/connectivity/source/drivers/kab/exports.dxp b/connectivity/source/drivers/kab/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/kab/exports.dxp
+++ b/connectivity/source/drivers/kab/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/kab/kab.xml b/connectivity/source/drivers/kab/kab.xml
index 943906d6c3e7..943906d6c3e7 100644..100755
--- a/connectivity/source/drivers/kab/kab.xml
+++ b/connectivity/source/drivers/kab/kab.xml
diff --git a/connectivity/source/drivers/kab/kab1.component b/connectivity/source/drivers/kab/kab1.component
new file mode 100755
index 000000000000..77227501d36c
--- /dev/null
+++ b/connectivity/source/drivers/kab/kab1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.kab.Driver">
+    <service name="com.sun.star.sdbc.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/kab/kabdrv.map b/connectivity/source/drivers/kab/kabdrv.map
index 5de866f2e52f..5de866f2e52f 100644..100755
--- a/connectivity/source/drivers/kab/kabdrv.map
+++ b/connectivity/source/drivers/kab/kabdrv.map
diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx
index 6e44372924e5..6e44372924e5 100644..100755
--- a/connectivity/source/drivers/kab/kcondition.cxx
+++ b/connectivity/source/drivers/kab/kcondition.cxx
diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx
index 34e014c637d6..34e014c637d6 100644..100755
--- a/connectivity/source/drivers/kab/kcondition.hxx
+++ b/connectivity/source/drivers/kab/kcondition.hxx
diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx
index 9acae2750e64..9acae2750e64 100644..100755
--- a/connectivity/source/drivers/kab/kfields.cxx
+++ b/connectivity/source/drivers/kab/kfields.cxx
diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx
index 6a79455f906c..6a79455f906c 100644..100755
--- a/connectivity/source/drivers/kab/kfields.hxx
+++ b/connectivity/source/drivers/kab/kfields.hxx
diff --git a/connectivity/source/drivers/kab/korder.cxx b/connectivity/source/drivers/kab/korder.cxx
index 6220a2383133..6220a2383133 100644..100755
--- a/connectivity/source/drivers/kab/korder.cxx
+++ b/connectivity/source/drivers/kab/korder.cxx
diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx
index 29fa9637c396..29fa9637c396 100644..100755
--- a/connectivity/source/drivers/kab/korder.hxx
+++ b/connectivity/source/drivers/kab/korder.hxx
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index 98bedf66ede8..13d4857c9182 100644..100755
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -46,6 +46,9 @@ CFLAGS+=$(KDE_CFLAGS)
 
 .IF "$(KDE_ROOT)"!=""
 EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib
+.IF "$(OS)$(CPU)" == "LINUXX"
+EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib64
+.ENDIF
 .ENDIF
 
 # === KAB base library ==========================
@@ -136,3 +139,11 @@ dummy:
 
 .INCLUDE : $(PRJ)$/target.pmk
 
+
+ALLTAR : $(MISC)/kab1.component
+
+$(MISC)/kab1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        kab1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt kab1.component
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 1f273ad52b99..1f273ad52b99 100644..100755
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx
index 7ac3f4593d3f..7ac3f4593d3f 100644..100755
--- a/connectivity/source/drivers/macab/MacabAddressBook.hxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx
diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx
index 2e836e1390b9..2e836e1390b9 100644..100755
--- a/connectivity/source/drivers/macab/MacabCatalog.cxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.cxx
diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx
index c63f4187791a..c63f4187791a 100644..100755
--- a/connectivity/source/drivers/macab/MacabCatalog.hxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.hxx
diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx
index 8501aadd2a70..8501aadd2a70 100644..100755
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx
index 3cc87d4bedc8..3cc87d4bedc8 100644..100755
--- a/connectivity/source/drivers/macab/MacabColumns.hxx
+++ b/connectivity/source/drivers/macab/MacabColumns.hxx
diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx
index bb9052b463f0..bb9052b463f0 100644..100755
--- a/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/connectivity/source/drivers/macab/MacabConnection.cxx
diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx
index f149847958b9..f149847958b9 100644..100755
--- a/connectivity/source/drivers/macab/MacabConnection.hxx
+++ b/connectivity/source/drivers/macab/MacabConnection.hxx
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index dcb776b6d3c2..dcb776b6d3c2 100644..100755
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
index 0cc796bda9be..0cc796bda9be 100644..100755
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index 92d3e0f16963..92d3e0f16963 100644..100755
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx
index 2648e3871e82..2648e3871e82 100644..100755
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
diff --git a/connectivity/source/drivers/macab/MacabGroup.cxx b/connectivity/source/drivers/macab/MacabGroup.cxx
index f254e2d48f82..f254e2d48f82 100644..100755
--- a/connectivity/source/drivers/macab/MacabGroup.cxx
+++ b/connectivity/source/drivers/macab/MacabGroup.cxx
diff --git a/connectivity/source/drivers/macab/MacabGroup.hxx b/connectivity/source/drivers/macab/MacabGroup.hxx
index afc45408face..afc45408face 100644..100755
--- a/connectivity/source/drivers/macab/MacabGroup.hxx
+++ b/connectivity/source/drivers/macab/MacabGroup.hxx
diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx
index 5393d9247dd0..5393d9247dd0 100644..100755
--- a/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/connectivity/source/drivers/macab/MacabHeader.cxx
diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx
index c2ca8d7a69d1..c2ca8d7a69d1 100644..100755
--- a/connectivity/source/drivers/macab/MacabHeader.hxx
+++ b/connectivity/source/drivers/macab/MacabHeader.hxx
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index aa94353e72cd..aa94353e72cd 100644..100755
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
index 15443ef7636c..15443ef7636c 100644..100755
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx
index d3521663e9e1..d3521663e9e1 100644..100755
--- a/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/connectivity/source/drivers/macab/MacabRecord.cxx
diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx
index 9ab992eeb27a..9ab992eeb27a 100644..100755
--- a/connectivity/source/drivers/macab/MacabRecord.hxx
+++ b/connectivity/source/drivers/macab/MacabRecord.hxx
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 86d34a808355..86d34a808355 100644..100755
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx
index ff01bbc16227..ff01bbc16227 100644..100755
--- a/connectivity/source/drivers/macab/MacabRecords.hxx
+++ b/connectivity/source/drivers/macab/MacabRecords.hxx
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index 6bc7d7ccca3d..6bc7d7ccca3d 100644..100755
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx
index 46363e979469..46363e979469 100644..100755
--- a/connectivity/source/drivers/macab/MacabResultSet.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.hxx
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index 69f77633e1db..69f77633e1db 100644..100755
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
index ab5b9bd20062..ab5b9bd20062 100644..100755
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx
index 368bbd3db2fb..3f6967217afe 100644..100755
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -31,13 +31,11 @@
 
 #include "MacabDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::macab;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -50,31 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pTemp
         );
 
-//***************************************************************************************
-//
-// The following C Api must be provided!
-// It consists in three functions that must be exported by the module
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "MACAB::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -124,31 +97,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void*,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            MacabDriver::getImplementationName_Static(),
-            MacabDriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "MACAB::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 583dc62910b6..583dc62910b6 100644..100755
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx
index e9fabc4ee9dc..e9fabc4ee9dc 100644..100755
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx
index f6d78221d30d..f6d78221d30d 100644..100755
--- a/connectivity/source/drivers/macab/MacabTable.cxx
+++ b/connectivity/source/drivers/macab/MacabTable.cxx
diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx
index 1375aacc2e9a..1375aacc2e9a 100644..100755
--- a/connectivity/source/drivers/macab/MacabTable.hxx
+++ b/connectivity/source/drivers/macab/MacabTable.hxx
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx
index eddd6a68ab7f..eddd6a68ab7f 100644..100755
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx
index 657fa753d7d3..657fa753d7d3 100644..100755
--- a/connectivity/source/drivers/macab/MacabTables.hxx
+++ b/connectivity/source/drivers/macab/MacabTables.hxx
diff --git a/connectivity/source/drivers/macab/exports.dxp b/connectivity/source/drivers/macab/exports.dxp
index 9630d7e06768..f0e1c69934bc 100755
--- a/connectivity/source/drivers/macab/exports.dxp
+++ b/connectivity/source/drivers/macab/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/macab/macab1.component b/connectivity/source/drivers/macab/macab1.component
new file mode 100755
index 000000000000..0a120c041883
--- /dev/null
+++ b/connectivity/source/drivers/macab/macab1.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.macab.Driver">
+    <service name="com.sun.star.sdbc.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx
index 9c584cb96803..9c584cb96803 100644..100755
--- a/connectivity/source/drivers/macab/macabcondition.cxx
+++ b/connectivity/source/drivers/macab/macabcondition.cxx
diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx
index d268c4100bdb..d268c4100bdb 100644..100755
--- a/connectivity/source/drivers/macab/macabcondition.hxx
+++ b/connectivity/source/drivers/macab/macabcondition.hxx
diff --git a/connectivity/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx
index c1afc29d7867..c1afc29d7867 100644..100755
--- a/connectivity/source/drivers/macab/macaborder.cxx
+++ b/connectivity/source/drivers/macab/macaborder.cxx
diff --git a/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx
index 2dbc6c5d2850..2dbc6c5d2850 100644..100755
--- a/connectivity/source/drivers/macab/macaborder.hxx
+++ b/connectivity/source/drivers/macab/macaborder.hxx
diff --git a/connectivity/source/drivers/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx
index 97e84c218986..97e84c218986 100644..100755
--- a/connectivity/source/drivers/macab/macabutilities.hxx
+++ b/connectivity/source/drivers/macab/macabutilities.hxx
diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk
index 31ffede390fd..b2e8db65dc6b 100755
--- a/connectivity/source/drivers/macab/makefile.mk
+++ b/connectivity/source/drivers/macab/makefile.mk
@@ -128,3 +128,11 @@ dummy:
 
 .INCLUDE : $(PRJ)$/target.pmk
 
+
+ALLTAR : $(MISC)/macab1.component
+
+$(MISC)/macab1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        macab1.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt macab1.component
diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx
index 45e399473eee..45e399473eee 100644..100755
--- a/connectivity/source/drivers/mozab/MCatalog.cxx
+++ b/connectivity/source/drivers/mozab/MCatalog.cxx
diff --git a/connectivity/source/drivers/mozab/MCatalog.hxx b/connectivity/source/drivers/mozab/MCatalog.hxx
index d75774f7de05..d75774f7de05 100644..100755
--- a/connectivity/source/drivers/mozab/MCatalog.hxx
+++ b/connectivity/source/drivers/mozab/MCatalog.hxx
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx
index 4585bddd6331..4585bddd6331 100644..100755
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx
index 1508ae53c2b6..1508ae53c2b6 100644..100755
--- a/connectivity/source/drivers/mozab/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx
diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx
index dc8effa590bc..dc8effa590bc 100644..100755
--- a/connectivity/source/drivers/mozab/MColumns.cxx
+++ b/connectivity/source/drivers/mozab/MColumns.cxx
diff --git a/connectivity/source/drivers/mozab/MColumns.hxx b/connectivity/source/drivers/mozab/MColumns.hxx
index 6328dc36e1f2..6328dc36e1f2 100644..100755
--- a/connectivity/source/drivers/mozab/MColumns.hxx
+++ b/connectivity/source/drivers/mozab/MColumns.hxx
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index 1ef4cf3ebe74..1ef4cf3ebe74 100644..100755
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.hxx b/connectivity/source/drivers/mozab/MConfigAccess.hxx
index 7aa02d0b4b5e..7aa02d0b4b5e 100644..100755
--- a/connectivity/source/drivers/mozab/MConfigAccess.hxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.hxx
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index 943bb7cc774e..943bb7cc774e 100644..100755
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index 76dcb328c2c4..76dcb328c2c4 100644..100755
--- a/connectivity/source/drivers/mozab/MConnection.hxx
+++ b/connectivity/source/drivers/mozab/MConnection.hxx
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
index 4bcea69d2f1a..4bcea69d2f1a 100644..100755
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
index 4fb8d5f9a145..4fb8d5f9a145 100644..100755
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 3132834c58bd..082a2bb9331e 100644..100755
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -251,7 +251,7 @@ EDriverType MozabDriver::impl_classifyURL( const ::rtl::OUString& url )
         const sal_Char* pScheme;
     } aSchemeMap[] =
     {
-#if defined(WNT) || defined(WIN)
+#if defined(WNT)
         { Outlook,          "outlook" },
         { OutlookExpress,   "outlookexp" },
 #endif
diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx
index b8ea911c7db1..b8ea911c7db1 100644..100755
--- a/connectivity/source/drivers/mozab/MDriver.hxx
+++ b/connectivity/source/drivers/mozab/MDriver.hxx
diff --git a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
index bc1b4fdc07d4..bc1b4fdc07d4 100644..100755
--- a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
+++ b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index f8d417bf60da..f8d417bf60da 100644..100755
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
index 31cfa97bc3f0..31cfa97bc3f0 100644..100755
--- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index d50c9817aeb8..9a891affdd08 100644..100755
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -898,8 +898,8 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
         OSQLParseNode *pOptEscape;
         const OSQLParseNode* pPart2 = parseTree->getChild(1);
         pColumn     = parseTree->getChild(0);                        // Match Item
-        pAtom       = pPart2->getChild(parseTree->count()-2);     // Match String
-        pOptEscape  = pPart2->getChild(parseTree->count()-1);     // Opt Escape Rule
+        pAtom       = pPart2->getChild(pPart2->count()-2);     // Match String
+        pOptEscape  = pPart2->getChild(pPart2->count()-1);     // Opt Escape Rule
         (void)pOptEscape;
         const bool bNot = SQL_ISTOKEN(pPart2->getChild(0), NOT);
 
@@ -1373,7 +1373,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
                                    const Reference<XDatabaseMetaData>& _xMetaData,
                                    ::std::vector<sal_Int32>& _rColMapping)
 {
-    ::comphelper::UStringMixEqual aCase(_xMetaData->storesMixedCaseQuotedIdentifiers());
+    ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers());
 
     Reference<XPropertySet> xTableColumn;
     ::rtl::OUString sTableColumnName, sSelectColumnRealName;
diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx
index 47e9ad13d276..47e9ad13d276 100644..100755
--- a/connectivity/source/drivers/mozab/MResultSet.hxx
+++ b/connectivity/source/drivers/mozab/MResultSet.hxx
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
index 042207f6618e..042207f6618e 100644..100755
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
index e04668070dfc..e04668070dfc 100644..100755
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx
diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx
index f82bb012af98..216dec207bb3 100644..100755
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -40,7 +40,6 @@ using namespace connectivity::mozab;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::mozilla::XMozillaBootstrap;
@@ -54,31 +53,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pTemp
         );
 
-//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString( RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -128,37 +102,6 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-
-        REGISTER_PROVIDER(
-            MozabDriver::getImplementationName_Static(),
-            MozabDriver::getSupportedServiceNames_Static(), xKey);
-
-        Sequence< ::rtl::OUString > aSNS( 1 );
-        aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
-        REGISTER_PROVIDER(
-             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")),
-             aSNS, xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
 typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory );
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
 {
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index 2070f8da37c8..2070f8da37c8 100644..100755
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx
index 41775540713c..41775540713c 100644..100755
--- a/connectivity/source/drivers/mozab/MStatement.hxx
+++ b/connectivity/source/drivers/mozab/MStatement.hxx
diff --git a/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx
index ddfaed031770..ddfaed031770 100644..100755
--- a/connectivity/source/drivers/mozab/MTable.cxx
+++ b/connectivity/source/drivers/mozab/MTable.cxx
diff --git a/connectivity/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx
index 3cc6728fe156..3cc6728fe156 100644..100755
--- a/connectivity/source/drivers/mozab/MTable.hxx
+++ b/connectivity/source/drivers/mozab/MTable.hxx
diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx
index b01c8fe9d6b2..b01c8fe9d6b2 100644..100755
--- a/connectivity/source/drivers/mozab/MTables.cxx
+++ b/connectivity/source/drivers/mozab/MTables.cxx
diff --git a/connectivity/source/drivers/mozab/MTables.hxx b/connectivity/source/drivers/mozab/MTables.hxx
index 56ed3d001d3e..56ed3d001d3e 100644..100755
--- a/connectivity/source/drivers/mozab/MTables.hxx
+++ b/connectivity/source/drivers/mozab/MTables.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index c7ca9e1287ff..ed9bdac5476c 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -239,7 +239,6 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(
 #include <cppuhelper/factory.hxx>
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -252,50 +251,6 @@ component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const ::rtl::OUString& aServiceImplName,
-        const Sequence< ::rtl::OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    ::rtl::OUString aMainKeyName;
-    aMainKeyName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "MOZAB::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        Sequence< ::rtl::OUString > aSNS( 1 );
-        aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap"));
-        REGISTER_PROVIDER(
-             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.mozilla.MozillaBootstrap")),
-             aSNS, xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "Mozab::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
 static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
 {
         MozillaBootstrap * pBootstrap = reinterpret_cast<MozillaBootstrap*>(OMozillaBootstrap_CreateInstance(rServiceManager));
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index 5a3f609ea90f..5a3f609ea90f 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 481cc7863c20..481cc7863c20 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
index 75f443d0f530..75f443d0f530 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
index f56df914a411..f56df914a411 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
index 57ff62261213..57ff62261213 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index 8e2cf5deed40..8e2cf5deed40 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
index 0ccd4322539c..0ccd4322539c 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
index bb751a4c100f..bb751a4c100f 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
index 723af162ab5b..723af162ab5b 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
index 279faa7f2318..279faa7f2318 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
index 434c9e3af390..434c9e3af390 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index 60d6b80bdf06..60d6b80bdf06 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 5cc807fceb11..5cc807fceb11 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
index 84684056f557..84684056f557 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
index 6e52c40b8f71..6e52c40b8f71 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
index c950e4d0e7e0..c950e4d0e7e0 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
index 2f17ea53f556..2f17ea53f556 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index 6a4172da205d..b44436e488ce 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -78,6 +78,14 @@ SHL1STDLIBS=\
         $(SALLIB)        \
         $(COMPHELPERLIB)
 
+ALLTAR : $(MISC)/mozbootstrap.component
+
+$(MISC)/mozbootstrap.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt mozbootstrap.component
+
 .ELSE
 SLOFILES += \
     $(SLO)$/MNSInit.obj			            \
@@ -90,4 +98,3 @@ SLOFILES += \
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
-
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
new file mode 100755
index 000000000000..5da158924a06
--- /dev/null
+++ b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.mozilla.MozillaBootstrap">
+    <service name="com.sun.star.mozilla.MozillaBootstrap"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
index f03d4a3bb208..f03d4a3bb208 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
index 3d01a103c9e2..3d01a103c9e2 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
index ec9bd9d63d74..ec9bd9d63d74 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
index 75913dcd525c..75913dcd525c 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
index 4208eb6db606..4208eb6db606 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
+++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
index b029a0e23638..b029a0e23638 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
+++ b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h
diff --git a/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
index 15eeb5395195..15eeb5395195 100644..100755
--- a/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
+++ b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h
diff --git a/connectivity/source/drivers/mozab/exports.dxp b/connectivity/source/drivers/mozab/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/mozab/exports.dxp
+++ b/connectivity/source/drivers/mozab/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 0a06f0013412..1928961b04b7 100644..100755
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -82,7 +82,7 @@ COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
 SLOFILES=\
         $(SLO)$/MDriver.obj						\
         $(SLO)$/MServices.obj
-
+            
 # --- MOZAB BASE Library -----------------------------------
 
 SHL1VERSIONMAP=$(SOLARENV)/src/component.map
@@ -184,3 +184,11 @@ $(MISC)$/$(SHL2TARGET).flt: makefile.mk
     @echo _TI				>$@
     @echo _real				>>$@
 
+
+ALLTAR : $(MISC)/mozab.component
+
+$(MISC)/mozab.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        mozab.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt mozab.component
diff --git a/connectivity/source/drivers/mozab/makefile_mozab.mk b/connectivity/source/drivers/mozab/makefile_mozab.mk
index b7ce6abc7199..c984f121a23c 100644..100755
--- a/connectivity/source/drivers/mozab/makefile_mozab.mk
+++ b/connectivity/source/drivers/mozab/makefile_mozab.mk
@@ -56,7 +56,7 @@ MOZINC = . \
         -I$(MOZ_INC)$/uconv \
         -I$(MOZ_INC)$/xpcom_obsolete \
         -I$(MOZ_INC)$/content
-
+        
 .IF "$(GUI)" == "WNT"
   CDEFS +=    \
         -DMOZILLA_CLIENT \
diff --git a/connectivity/source/drivers/mozab/mozab.component b/connectivity/source/drivers/mozab/mozab.component
new file mode 100755
index 000000000000..70f5da3bfe72
--- /dev/null
+++ b/connectivity/source/drivers/mozab/mozab.component
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.mozilla.MozillaBootstrap">
+    <service name="com.sun.star.mozilla.MozillaBootstrap"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.sdbc.MozabDriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/mozab/mozab.xml b/connectivity/source/drivers/mozab/mozab.xml
index 6663387cf34c..6663387cf34c 100644..100755
--- a/connectivity/source/drivers/mozab/mozab.xml
+++ b/connectivity/source/drivers/mozab/mozab.xml
diff --git a/connectivity/source/drivers/mozab/mozabdrv.map b/connectivity/source/drivers/mozab/mozabdrv.map
index a431a0737754..a431a0737754 100644..100755
--- a/connectivity/source/drivers/mozab/mozabdrv.map
+++ b/connectivity/source/drivers/mozab/mozabdrv.map
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index 28cc64d707ba..28cc64d707ba 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
index 77de88b2f07d..77de88b2f07d 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
index c7f1dffd83c4..c7f1dffd83c4 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index 7f625c59a1b7..7f625c59a1b7 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
index c7b5224893da..c7b5224893da 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
index 0ef193cc3bd8..0ef193cc3bd8 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
index b3e75c3763bb..b3e75c3763bb 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index df81bb886b5e..df81bb886b5e 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
index 06c13993edda..06c13993edda 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
index de6be351a854..de6be351a854 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
index 85e36e8abacd..85e36e8abacd 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
index d50097e5c65d..d50097e5c65d 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
index 6fdbcea39938..6fdbcea39938 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 177363509305..177363509305 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
index 2c17529ed48d..2c17529ed48d 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 1ce71c85b9da..1ce71c85b9da 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
index 6884ddd2c8b3..6884ddd2c8b3 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
index 8bb78aca4e6b..8bb78aca4e6b 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
index df903eaa003f..df903eaa003f 100644..100755
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx
diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h
index a63db2b480c8..a63db2b480c8 100644..100755
--- a/connectivity/source/drivers/mozab/post_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/post_include_mozilla.h
diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h
index a90c6a394fd8..e5e3dac6e9a6 100644..100755
--- a/connectivity/source/drivers/mozab/pre_include_mozilla.h
+++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h
@@ -26,13 +26,6 @@
  *
  ************************************************************************/
 
-#ifndef BOOL
-# define MOZ_BOOL
-
-# define BOOL mozBOOL
-# define Bool mozBooL
-#endif
-
 // Turn off DEBUG Assertions
 #ifdef _DEBUG
     #define _DEBUG_WAS_DEFINED _DEBUG
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index 090d0b5486d0..090d0b5486d0 100644..100755
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx
index 59c8abeae61f..59c8abeae61f 100644..100755
--- a/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/connectivity/source/drivers/mysql/YColumns.cxx
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index aef756916ec6..aef756916ec6 100644..100755
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index c5edb19af2bd..c5edb19af2bd 100644..100755
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index e40adf2c211a..e40adf2c211a 100644..100755
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 01cb1cbda515..01cb1cbda515 100644..100755
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index a95d1d527c05..a95d1d527c05 100644..100755
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index 0ba85c02ddd5..0ba85c02ddd5 100644..100755
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx
index b6bdec36e9b1..32122c6e7166 100644..100755
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -30,13 +30,11 @@
 #include "precompiled_connectivity.hxx"
 #include "mysql/YDriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::mysql;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -49,31 +47,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pT
         );
 
-//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "ADABAS::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -124,31 +97,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODriverDelegator::getImplementationName_Static(),
-            ODriverDelegator::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/mysql/exports.dxp b/connectivity/source/drivers/mysql/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/drivers/mysql/exports.dxp
+++ b/connectivity/source/drivers/mysql/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk
index fbb68321cb01..453f4b652f21 100644..100755
--- a/connectivity/source/drivers/mysql/makefile.mk
+++ b/connectivity/source/drivers/mysql/makefile.mk
@@ -82,3 +82,11 @@ DEF1EXPORTFILE=	exports.dxp
 .INCLUDE : $(PRJ)$/target.pmk
 
 
+
+ALLTAR : $(MISC)/mysql.component
+
+$(MISC)/mysql.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        mysql.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt mysql.component
diff --git a/connectivity/source/drivers/mysql/mysql.component b/connectivity/source/drivers/mysql/mysql.component
new file mode 100755
index 000000000000..ced2297fa07f
--- /dev/null
+++ b/connectivity/source/drivers/mysql/mysql.component
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="org.openoffice.comp.drivers.MySQL.Driver">
+    <service name="com.sun.star.sdbc.Driver"/>
+    <service name="com.sun.star.sdbcx.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/mysql/mysql.xml b/connectivity/source/drivers/mysql/mysql.xml
index 6ef9f55721b1..6ef9f55721b1 100644..100755
--- a/connectivity/source/drivers/mysql/mysql.xml
+++ b/connectivity/source/drivers/mysql/mysql.xml
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index 7fe29c930afb..eed70634fe70 100644..100755
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -110,10 +110,6 @@ sal_Bool LoadLibrary_ODBC3(::rtl::OUString &_rPath)
 
     if (bLoaded)
         return sal_True;
-#ifdef WIN
-    _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODBC.DLL"));
-
-#endif
 #ifdef WNT
     _rPath = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ODBC32.DLL"));
 #endif
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index c786df3e9b89..c786df3e9b89 100644..100755
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx
index 41185499aa15..41185499aa15 100644..100755
--- a/connectivity/source/drivers/odbc/ORealDriver.hxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.hxx
diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk
index a13837224b93..6d701b87c5e2 100644..100755
--- a/connectivity/source/drivers/odbc/makefile.mk
+++ b/connectivity/source/drivers/odbc/makefile.mk
@@ -77,3 +77,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 # --- Targets ----------------------------------
 
 .INCLUDE : $(PRJ)$/target.pmk
+
+ALLTAR : $(MISC)/odbc.component
+
+$(MISC)/odbc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        odbc.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt odbc.component
diff --git a/connectivity/source/drivers/odbc/odbc.component b/connectivity/source/drivers/odbc/odbc.component
new file mode 100755
index 000000000000..d4e6bc127da2
--- /dev/null
+++ b/connectivity/source/drivers/odbc/odbc.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.ODBCDriver">
+    <service name="com.sun.star.sdbc.Driver"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/drivers/odbc/odbc.xml b/connectivity/source/drivers/odbc/odbc.xml
index ad7562ae7a35..ad7562ae7a35 100644..100755
--- a/connectivity/source/drivers/odbc/odbc.xml
+++ b/connectivity/source/drivers/odbc/odbc.xml
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 76f392c9b8a2..ecb1793c2076 100644..100755
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -31,13 +31,11 @@
 #include "ORealDriver.hxx"
 #include "odbc/ODriver.hxx"
 #include <cppuhelper/factory.hxx>
-#include <osl/diagnose.h>
 
 using namespace connectivity::odbc;
 using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::com::sun::star::registry::XRegistryKey;
 using ::com::sun::star::lang::XSingleServiceFactory;
 using ::com::sun::star::lang::XMultiServiceFactory;
 
@@ -50,31 +48,6 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount* _pTemp
         );
 
-//***************************************************************************************
-//
-// Die vorgeschriebene C-Api muss erfuellt werden!
-// Sie besteht aus drei Funktionen, die von dem Modul exportiert werden muessen.
-//
-
-//---------------------------------------------------------------------------------------
-void REGISTER_PROVIDER(
-        const OUString& aServiceImplName,
-        const Sequence< OUString>& Services,
-        const Reference< ::com::sun::star::registry::XRegistryKey > & xKey)
-{
-    OUString aMainKeyName;
-    aMainKeyName = OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-    aMainKeyName += aServiceImplName;
-    aMainKeyName += OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-
-    Reference< ::com::sun::star::registry::XRegistryKey >  xNewKey( xKey->createKey(aMainKeyName) );
-    OSL_ENSURE(xNewKey.is(), "ODBC::component_writeInfo : could not create a registry key !");
-
-    for (sal_Int32 i=0; i<Services.getLength(); ++i)
-        xNewKey->createKey(Services[i]);
-}
-
-
 //---------------------------------------------------------------------------------------
 struct ProviderRequest
 {
@@ -125,31 +98,6 @@ component_getImplementationEnvironment(
 }
 
 //---------------------------------------------------------------------------------------
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-                void* /*pServiceManager*/,
-                void* pRegistryKey
-            )
-{
-    if (pRegistryKey)
-    try
-    {
-        Reference< ::com::sun::star::registry::XRegistryKey > xKey(reinterpret_cast< ::com::sun::star::registry::XRegistryKey*>(pRegistryKey));
-
-        REGISTER_PROVIDER(
-            ODBCDriver::getImplementationName_Static(),
-            ODBCDriver::getSupportedServiceNames_Static(), xKey);
-
-        return sal_True;
-    }
-    catch (::com::sun::star::registry::InvalidRegistryException& )
-    {
-        OSL_ENSURE(sal_False, "ODBC::component_writeInfo : could not create a registry key ! ## InvalidRegistryException !");
-    }
-
-    return sal_False;
-}
-
-//---------------------------------------------------------------------------------------
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/odbcbase/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx
index 891eabc7d5eb..891eabc7d5eb 100644..100755
--- a/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/connectivity/source/drivers/odbcbase/OConnection.cxx
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
index c0d8383eb1a7..c0d8383eb1a7 100644..100755
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 55f7548d5f70..55f7548d5f70 100644..100755
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
diff --git a/connectivity/source/drivers/odbcbase/ODriver.cxx b/connectivity/source/drivers/odbcbase/ODriver.cxx
index 0e8a49065f95..0e8a49065f95 100644..100755
--- a/connectivity/source/drivers/odbcbase/ODriver.cxx
+++ b/connectivity/source/drivers/odbcbase/ODriver.cxx
diff --git a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 3b45903ee1b2..3b45903ee1b2 100644..100755
--- a/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index e789f4bd111b..e789f4bd111b 100644..100755
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
diff --git a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
index 34f60939f9f8..34f60939f9f8 100644..100755
--- a/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
diff --git a/connectivity/source/drivers/odbcbase/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx
index 8a92fa87911c..8a92fa87911c 100644..100755
--- a/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/connectivity/source/drivers/odbcbase/OStatement.cxx
diff --git a/connectivity/source/drivers/odbcbase/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx
index d9eb8647d485..d9eb8647d485 100644..100755
--- a/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/connectivity/source/drivers/odbcbase/OTools.cxx
diff --git a/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk
index 85e96ea857d6..85e96ea857d6 100644..100755
--- a/connectivity/source/drivers/odbcbase/makefile.mk
+++ b/connectivity/source/drivers/odbcbase/makefile.mk
diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx
index 0284c70fab89..0284c70fab89 100644..100755
--- a/connectivity/source/inc/AutoRetrievingBase.hxx
+++ b/connectivity/source/inc/AutoRetrievingBase.hxx
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index c51468c0ff4d..c51468c0ff4d 100644..100755
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
index 6f2a318e6e1c..6f2a318e6e1c 100644..100755
--- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx
index baa54737f482..baa54737f482 100644..100755
--- a/connectivity/source/inc/OColumn.hxx
+++ b/connectivity/source/inc/OColumn.hxx
diff --git a/connectivity/source/inc/OSubComponent.hxx b/connectivity/source/inc/OSubComponent.hxx
index 8db7336b16d1..8db7336b16d1 100644..100755
--- a/connectivity/source/inc/OSubComponent.hxx
+++ b/connectivity/source/inc/OSubComponent.hxx
diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx
index 13f0fd2975ce..13f0fd2975ce 100644..100755
--- a/connectivity/source/inc/OTypeInfo.hxx
+++ b/connectivity/source/inc/OTypeInfo.hxx
diff --git a/connectivity/source/inc/ParameterSubstitution.hxx b/connectivity/source/inc/ParameterSubstitution.hxx
index abfc1d107cb2..abfc1d107cb2 100644..100755
--- a/connectivity/source/inc/ParameterSubstitution.hxx
+++ b/connectivity/source/inc/ParameterSubstitution.hxx
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index f65539da3f77..f65539da3f77 100644..100755
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx
index 92e974f508f8..92e974f508f8 100644..100755
--- a/connectivity/source/inc/TConnection.hxx
+++ b/connectivity/source/inc/TConnection.hxx
diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
index 7fb815d21f50..7fb815d21f50 100644..100755
--- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx
+++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx
diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx
index b5fa33b5c493..b5fa33b5c493 100644..100755
--- a/connectivity/source/inc/TKeyValue.hxx
+++ b/connectivity/source/inc/TKeyValue.hxx
diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx
index a02fde92e412..a02fde92e412 100644..100755
--- a/connectivity/source/inc/TPrivilegesResultSet.hxx
+++ b/connectivity/source/inc/TPrivilegesResultSet.hxx
diff --git a/connectivity/source/inc/TResultSetHelper.hxx b/connectivity/source/inc/TResultSetHelper.hxx
index 874b9d93d82b..874b9d93d82b 100644..100755
--- a/connectivity/source/inc/TResultSetHelper.hxx
+++ b/connectivity/source/inc/TResultSetHelper.hxx
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 8b9b49d75f22..19548a5e8ccd 100644..100755
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -99,7 +99,7 @@ namespace connectivity
             @return the last position
         */
         inline sal_Int32    getLastPosition() const { return m_aBookmarksPositions.size(); }
-        inline void SetDeleted(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; }
+        inline void SetDeletedVisible(bool _bDeletedVisible) { m_bDeletedVisible = _bDeletedVisible; }
     };
 }
 #endif // CONNECTIVITY_SKIPDELETEDSSET_HXX
diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx
index 21212bc90ce6..21212bc90ce6 100644..100755
--- a/connectivity/source/inc/TSortIndex.hxx
+++ b/connectivity/source/inc/TSortIndex.hxx
diff --git a/connectivity/source/inc/UStringDescription_Impl.hxx b/connectivity/source/inc/UStringDescription_Impl.hxx
index 2c2c33d03175..2c2c33d03175 100644..100755
--- a/connectivity/source/inc/UStringDescription_Impl.hxx
+++ b/connectivity/source/inc/UStringDescription_Impl.hxx
diff --git a/connectivity/source/inc/adabas/BCatalog.hxx b/connectivity/source/inc/adabas/BCatalog.hxx
index af411b825b5a..af411b825b5a 100644..100755
--- a/connectivity/source/inc/adabas/BCatalog.hxx
+++ b/connectivity/source/inc/adabas/BCatalog.hxx
diff --git a/connectivity/source/inc/adabas/BColumn.hxx b/connectivity/source/inc/adabas/BColumn.hxx
index 34afc908dedd..34afc908dedd 100644..100755
--- a/connectivity/source/inc/adabas/BColumn.hxx
+++ b/connectivity/source/inc/adabas/BColumn.hxx
diff --git a/connectivity/source/inc/adabas/BColumns.hxx b/connectivity/source/inc/adabas/BColumns.hxx
index 40eadf3e9bf9..40eadf3e9bf9 100644..100755
--- a/connectivity/source/inc/adabas/BColumns.hxx
+++ b/connectivity/source/inc/adabas/BColumns.hxx
diff --git a/connectivity/source/inc/adabas/BConnection.hxx b/connectivity/source/inc/adabas/BConnection.hxx
index afa5cc300a72..afa5cc300a72 100644..100755
--- a/connectivity/source/inc/adabas/BConnection.hxx
+++ b/connectivity/source/inc/adabas/BConnection.hxx
diff --git a/connectivity/source/inc/adabas/BDatabaseMetaData.hxx b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
index b60551069d4e..b60551069d4e 100644..100755
--- a/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
+++ b/connectivity/source/inc/adabas/BDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/adabas/BDriver.hxx b/connectivity/source/inc/adabas/BDriver.hxx
index 82cbc0594a31..82cbc0594a31 100644..100755
--- a/connectivity/source/inc/adabas/BDriver.hxx
+++ b/connectivity/source/inc/adabas/BDriver.hxx
diff --git a/connectivity/source/inc/adabas/BGroup.hxx b/connectivity/source/inc/adabas/BGroup.hxx
index 29a0486a7bc4..29a0486a7bc4 100644..100755
--- a/connectivity/source/inc/adabas/BGroup.hxx
+++ b/connectivity/source/inc/adabas/BGroup.hxx
diff --git a/connectivity/source/inc/adabas/BGroups.hxx b/connectivity/source/inc/adabas/BGroups.hxx
index 7989aaa4cbfd..7989aaa4cbfd 100644..100755
--- a/connectivity/source/inc/adabas/BGroups.hxx
+++ b/connectivity/source/inc/adabas/BGroups.hxx
diff --git a/connectivity/source/inc/adabas/BIndex.hxx b/connectivity/source/inc/adabas/BIndex.hxx
index d089d0bd8d89..d089d0bd8d89 100644..100755
--- a/connectivity/source/inc/adabas/BIndex.hxx
+++ b/connectivity/source/inc/adabas/BIndex.hxx
diff --git a/connectivity/source/inc/adabas/BIndexColumn.hxx b/connectivity/source/inc/adabas/BIndexColumn.hxx
index 9b515053ad31..9b515053ad31 100644..100755
--- a/connectivity/source/inc/adabas/BIndexColumn.hxx
+++ b/connectivity/source/inc/adabas/BIndexColumn.hxx
diff --git a/connectivity/source/inc/adabas/BIndexColumns.hxx b/connectivity/source/inc/adabas/BIndexColumns.hxx
index 80274d098dc7..80274d098dc7 100644..100755
--- a/connectivity/source/inc/adabas/BIndexColumns.hxx
+++ b/connectivity/source/inc/adabas/BIndexColumns.hxx
diff --git a/connectivity/source/inc/adabas/BIndexes.hxx b/connectivity/source/inc/adabas/BIndexes.hxx
index 451e4ef05e90..451e4ef05e90 100644..100755
--- a/connectivity/source/inc/adabas/BIndexes.hxx
+++ b/connectivity/source/inc/adabas/BIndexes.hxx
diff --git a/connectivity/source/inc/adabas/BKeys.hxx b/connectivity/source/inc/adabas/BKeys.hxx
index 1ba5f9372532..1ba5f9372532 100644..100755
--- a/connectivity/source/inc/adabas/BKeys.hxx
+++ b/connectivity/source/inc/adabas/BKeys.hxx
diff --git a/connectivity/source/inc/adabas/BPreparedStatement.hxx b/connectivity/source/inc/adabas/BPreparedStatement.hxx
index c74bf3a3f0cd..c74bf3a3f0cd 100644..100755
--- a/connectivity/source/inc/adabas/BPreparedStatement.hxx
+++ b/connectivity/source/inc/adabas/BPreparedStatement.hxx
diff --git a/connectivity/source/inc/adabas/BResultSet.hxx b/connectivity/source/inc/adabas/BResultSet.hxx
index 95a9a41eea84..95a9a41eea84 100644..100755
--- a/connectivity/source/inc/adabas/BResultSet.hxx
+++ b/connectivity/source/inc/adabas/BResultSet.hxx
diff --git a/connectivity/source/inc/adabas/BResultSetMetaData.hxx b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
index 3fe11e02743d..3fe11e02743d 100644..100755
--- a/connectivity/source/inc/adabas/BResultSetMetaData.hxx
+++ b/connectivity/source/inc/adabas/BResultSetMetaData.hxx
diff --git a/connectivity/source/inc/adabas/BStatement.hxx b/connectivity/source/inc/adabas/BStatement.hxx
index 6f92bacc6fc9..6f92bacc6fc9 100644..100755
--- a/connectivity/source/inc/adabas/BStatement.hxx
+++ b/connectivity/source/inc/adabas/BStatement.hxx
diff --git a/connectivity/source/inc/adabas/BTable.hxx b/connectivity/source/inc/adabas/BTable.hxx
index 7dde9b69d2a9..7dde9b69d2a9 100644..100755
--- a/connectivity/source/inc/adabas/BTable.hxx
+++ b/connectivity/source/inc/adabas/BTable.hxx
diff --git a/connectivity/source/inc/adabas/BTables.hxx b/connectivity/source/inc/adabas/BTables.hxx
index 98aae92abfd0..98aae92abfd0 100644..100755
--- a/connectivity/source/inc/adabas/BTables.hxx
+++ b/connectivity/source/inc/adabas/BTables.hxx
diff --git a/connectivity/source/inc/adabas/BUser.hxx b/connectivity/source/inc/adabas/BUser.hxx
index da336939f071..da336939f071 100644..100755
--- a/connectivity/source/inc/adabas/BUser.hxx
+++ b/connectivity/source/inc/adabas/BUser.hxx
diff --git a/connectivity/source/inc/adabas/BUsers.hxx b/connectivity/source/inc/adabas/BUsers.hxx
index df4915cf4fb2..df4915cf4fb2 100644..100755
--- a/connectivity/source/inc/adabas/BUsers.hxx
+++ b/connectivity/source/inc/adabas/BUsers.hxx
diff --git a/connectivity/source/inc/adabas/BViews.hxx b/connectivity/source/inc/adabas/BViews.hxx
index 751726eed72a..751726eed72a 100644..100755
--- a/connectivity/source/inc/adabas/BViews.hxx
+++ b/connectivity/source/inc/adabas/BViews.hxx
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx b/connectivity/source/inc/ado/ACallableStatement.hxx
index 00398698ea13..00398698ea13 100644..100755
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
diff --git a/connectivity/source/inc/ado/ACatalog.hxx b/connectivity/source/inc/ado/ACatalog.hxx
index 4ac4a7ef4394..4ac4a7ef4394 100644..100755
--- a/connectivity/source/inc/ado/ACatalog.hxx
+++ b/connectivity/source/inc/ado/ACatalog.hxx
diff --git a/connectivity/source/inc/ado/ACollection.hxx b/connectivity/source/inc/ado/ACollection.hxx
index 3dafa36b9b3a..3dafa36b9b3a 100644..100755
--- a/connectivity/source/inc/ado/ACollection.hxx
+++ b/connectivity/source/inc/ado/ACollection.hxx
diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx
index ce93f201aef1..ce93f201aef1 100644..100755
--- a/connectivity/source/inc/ado/AColumn.hxx
+++ b/connectivity/source/inc/ado/AColumn.hxx
diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx
index 6f8867ec0fb4..6f8867ec0fb4 100644..100755
--- a/connectivity/source/inc/ado/AColumns.hxx
+++ b/connectivity/source/inc/ado/AColumns.hxx
diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx
index 4be35ae52fff..4be35ae52fff 100644..100755
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
index d2e6fe645f5d..d2e6fe645f5d 100644..100755
--- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index 4ac87c6ff7aa..4ac87c6ff7aa 100644..100755
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index fadbde55724e..fadbde55724e 100644..100755
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx
index 1efc9580ba35..1efc9580ba35 100644..100755
--- a/connectivity/source/inc/ado/ADriver.hxx
+++ b/connectivity/source/inc/ado/ADriver.hxx
diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx
index 7efe1650a89f..7efe1650a89f 100644..100755
--- a/connectivity/source/inc/ado/AGroup.hxx
+++ b/connectivity/source/inc/ado/AGroup.hxx
diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx
index 13808a8e0607..13808a8e0607 100644..100755
--- a/connectivity/source/inc/ado/AGroups.hxx
+++ b/connectivity/source/inc/ado/AGroups.hxx
diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx
index e21d05b990ba..e21d05b990ba 100644..100755
--- a/connectivity/source/inc/ado/AIndex.hxx
+++ b/connectivity/source/inc/ado/AIndex.hxx
diff --git a/connectivity/source/inc/ado/AIndexColumn.hxx b/connectivity/source/inc/ado/AIndexColumn.hxx
index 9d2057bbf565..9d2057bbf565 100644..100755
--- a/connectivity/source/inc/ado/AIndexColumn.hxx
+++ b/connectivity/source/inc/ado/AIndexColumn.hxx
diff --git a/connectivity/source/inc/ado/AIndexColumns.hxx b/connectivity/source/inc/ado/AIndexColumns.hxx
index be58ffb6f2b0..be58ffb6f2b0 100644..100755
--- a/connectivity/source/inc/ado/AIndexColumns.hxx
+++ b/connectivity/source/inc/ado/AIndexColumns.hxx
diff --git a/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx
index 345c9ce8176d..345c9ce8176d 100644..100755
--- a/connectivity/source/inc/ado/AIndexes.hxx
+++ b/connectivity/source/inc/ado/AIndexes.hxx
diff --git a/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx
index ad4dbada2b12..ad4dbada2b12 100644..100755
--- a/connectivity/source/inc/ado/AKey.hxx
+++ b/connectivity/source/inc/ado/AKey.hxx
diff --git a/connectivity/source/inc/ado/AKeyColumn.hxx b/connectivity/source/inc/ado/AKeyColumn.hxx
index 098a4b36e0f8..098a4b36e0f8 100644..100755
--- a/connectivity/source/inc/ado/AKeyColumn.hxx
+++ b/connectivity/source/inc/ado/AKeyColumn.hxx
diff --git a/connectivity/source/inc/ado/AKeyColumns.hxx b/connectivity/source/inc/ado/AKeyColumns.hxx
index 40873d2e252e..40873d2e252e 100644..100755
--- a/connectivity/source/inc/ado/AKeyColumns.hxx
+++ b/connectivity/source/inc/ado/AKeyColumns.hxx
diff --git a/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx
index 03991d0345ba..03991d0345ba 100644..100755
--- a/connectivity/source/inc/ado/AKeys.hxx
+++ b/connectivity/source/inc/ado/AKeys.hxx
diff --git a/connectivity/source/inc/ado/APreparedStatement.hxx b/connectivity/source/inc/ado/APreparedStatement.hxx
index 585c9ff20a02..585c9ff20a02 100644..100755
--- a/connectivity/source/inc/ado/APreparedStatement.hxx
+++ b/connectivity/source/inc/ado/APreparedStatement.hxx
diff --git a/connectivity/source/inc/ado/AResultSet.hxx b/connectivity/source/inc/ado/AResultSet.hxx
index 29dc7b7a4bbc..29dc7b7a4bbc 100644..100755
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx b/connectivity/source/inc/ado/AResultSetMetaData.hxx
index 535e333f5c25..535e333f5c25 100644..100755
--- a/connectivity/source/inc/ado/AResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx
diff --git a/connectivity/source/inc/ado/AStatement.hxx b/connectivity/source/inc/ado/AStatement.hxx
index baaa21ec5e78..baaa21ec5e78 100644..100755
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx
index afa740ad5427..afa740ad5427 100644..100755
--- a/connectivity/source/inc/ado/ATable.hxx
+++ b/connectivity/source/inc/ado/ATable.hxx
diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx
index 1548cd34f7f5..1548cd34f7f5 100644..100755
--- a/connectivity/source/inc/ado/ATables.hxx
+++ b/connectivity/source/inc/ado/ATables.hxx
diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx
index 922d9529c2e4..922d9529c2e4 100644..100755
--- a/connectivity/source/inc/ado/AUser.hxx
+++ b/connectivity/source/inc/ado/AUser.hxx
diff --git a/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx
index 8e8c79d231cb..8e8c79d231cb 100644..100755
--- a/connectivity/source/inc/ado/AUsers.hxx
+++ b/connectivity/source/inc/ado/AUsers.hxx
diff --git a/connectivity/source/inc/ado/AView.hxx b/connectivity/source/inc/ado/AView.hxx
index 4ca8b51b6a2f..4ca8b51b6a2f 100644..100755
--- a/connectivity/source/inc/ado/AView.hxx
+++ b/connectivity/source/inc/ado/AView.hxx
diff --git a/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx
index 78a4f16134d0..78a4f16134d0 100644..100755
--- a/connectivity/source/inc/ado/AViews.hxx
+++ b/connectivity/source/inc/ado/AViews.hxx
diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx
index fd343f32df61..fd343f32df61 100644..100755
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx
index 46dcf18668e6..46dcf18668e6 100644..100755
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
diff --git a/connectivity/source/inc/ado/Awrapado.hxx b/connectivity/source/inc/ado/Awrapado.hxx
index b34fec336685..b34fec336685 100644..100755
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
diff --git a/connectivity/source/inc/ado/Awrapadox.hxx b/connectivity/source/inc/ado/Awrapadox.hxx
index 614c139aecb5..614c139aecb5 100644..100755
--- a/connectivity/source/inc/ado/Awrapadox.hxx
+++ b/connectivity/source/inc/ado/Awrapadox.hxx
diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx b/connectivity/source/inc/ado/WrapCatalog.hxx
index 8ebbb6259c35..8ebbb6259c35 100644..100755
--- a/connectivity/source/inc/ado/WrapCatalog.hxx
+++ b/connectivity/source/inc/ado/WrapCatalog.hxx
diff --git a/connectivity/source/inc/ado/WrapColumn.hxx b/connectivity/source/inc/ado/WrapColumn.hxx
index e39474b5057b..e39474b5057b 100644..100755
--- a/connectivity/source/inc/ado/WrapColumn.hxx
+++ b/connectivity/source/inc/ado/WrapColumn.hxx
diff --git a/connectivity/source/inc/ado/WrapIndex.hxx b/connectivity/source/inc/ado/WrapIndex.hxx
index bc350f72eb3d..bc350f72eb3d 100644..100755
--- a/connectivity/source/inc/ado/WrapIndex.hxx
+++ b/connectivity/source/inc/ado/WrapIndex.hxx
diff --git a/connectivity/source/inc/ado/WrapKey.hxx b/connectivity/source/inc/ado/WrapKey.hxx
index 3666338fd613..3666338fd613 100644..100755
--- a/connectivity/source/inc/ado/WrapKey.hxx
+++ b/connectivity/source/inc/ado/WrapKey.hxx
diff --git a/connectivity/source/inc/ado/WrapTable.hxx b/connectivity/source/inc/ado/WrapTable.hxx
index 646b26e333de..646b26e333de 100644..100755
--- a/connectivity/source/inc/ado/WrapTable.hxx
+++ b/connectivity/source/inc/ado/WrapTable.hxx
diff --git a/connectivity/source/inc/ado/WrapTypeDefs.hxx b/connectivity/source/inc/ado/WrapTypeDefs.hxx
index c81ec6839ae9..c81ec6839ae9 100644..100755
--- a/connectivity/source/inc/ado/WrapTypeDefs.hxx
+++ b/connectivity/source/inc/ado/WrapTypeDefs.hxx
diff --git a/connectivity/source/inc/ado/adoimp.hxx b/connectivity/source/inc/ado/adoimp.hxx
index eb07d0200582..eb07d0200582 100644..100755
--- a/connectivity/source/inc/ado/adoimp.hxx
+++ b/connectivity/source/inc/ado/adoimp.hxx
diff --git a/connectivity/source/inc/calc/CCatalog.hxx b/connectivity/source/inc/calc/CCatalog.hxx
index fb3616c0a075..fb3616c0a075 100644..100755
--- a/connectivity/source/inc/calc/CCatalog.hxx
+++ b/connectivity/source/inc/calc/CCatalog.hxx
diff --git a/connectivity/source/inc/calc/CColumns.hxx b/connectivity/source/inc/calc/CColumns.hxx
index bef6a7b767e8..bef6a7b767e8 100644..100755
--- a/connectivity/source/inc/calc/CColumns.hxx
+++ b/connectivity/source/inc/calc/CColumns.hxx
diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx
index b58f25cfc8c7..b58f25cfc8c7 100644..100755
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
index e001e315f502..e001e315f502 100644..100755
--- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx
index 1488d3605888..1488d3605888 100644..100755
--- a/connectivity/source/inc/calc/CDriver.hxx
+++ b/connectivity/source/inc/calc/CDriver.hxx
diff --git a/connectivity/source/inc/calc/CPreparedStatement.hxx b/connectivity/source/inc/calc/CPreparedStatement.hxx
index 331b3aa5212d..331b3aa5212d 100644..100755
--- a/connectivity/source/inc/calc/CPreparedStatement.hxx
+++ b/connectivity/source/inc/calc/CPreparedStatement.hxx
diff --git a/connectivity/source/inc/calc/CResultSet.hxx b/connectivity/source/inc/calc/CResultSet.hxx
index d144f75dc09e..d144f75dc09e 100644..100755
--- a/connectivity/source/inc/calc/CResultSet.hxx
+++ b/connectivity/source/inc/calc/CResultSet.hxx
diff --git a/connectivity/source/inc/calc/CStatement.hxx b/connectivity/source/inc/calc/CStatement.hxx
index 46df690cb65d..46df690cb65d 100644..100755
--- a/connectivity/source/inc/calc/CStatement.hxx
+++ b/connectivity/source/inc/calc/CStatement.hxx
diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx
index 0db28e7fd9a5..0db28e7fd9a5 100644..100755
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
diff --git a/connectivity/source/inc/calc/CTables.hxx b/connectivity/source/inc/calc/CTables.hxx
index 97f8f161fdbc..97f8f161fdbc 100644..100755
--- a/connectivity/source/inc/calc/CTables.hxx
+++ b/connectivity/source/inc/calc/CTables.hxx
diff --git a/connectivity/source/inc/dbase/DCatalog.hxx b/connectivity/source/inc/dbase/DCatalog.hxx
index 493fc94b470b..493fc94b470b 100644..100755
--- a/connectivity/source/inc/dbase/DCatalog.hxx
+++ b/connectivity/source/inc/dbase/DCatalog.hxx
diff --git a/connectivity/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx
index 7c5fc7312e1a..7c5fc7312e1a 100644..100755
--- a/connectivity/source/inc/dbase/DCode.hxx
+++ b/connectivity/source/inc/dbase/DCode.hxx
diff --git a/connectivity/source/inc/dbase/DColumns.hxx b/connectivity/source/inc/dbase/DColumns.hxx
index fc86b7d42378..fc86b7d42378 100644..100755
--- a/connectivity/source/inc/dbase/DColumns.hxx
+++ b/connectivity/source/inc/dbase/DColumns.hxx
diff --git a/connectivity/source/inc/dbase/DConnection.hxx b/connectivity/source/inc/dbase/DConnection.hxx
index 6d93cc5a19ac..6d93cc5a19ac 100644..100755
--- a/connectivity/source/inc/dbase/DConnection.hxx
+++ b/connectivity/source/inc/dbase/DConnection.hxx
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
index cde83ca67497..cde83ca67497 100644..100755
--- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
index 2d24d0f7585e..2d24d0f7585e 100644..100755
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
index 114aa25545fb..114aa25545fb 100644..100755
--- a/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaDataResultSetMetaData.hxx
diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx
index eac29c1826c2..eac29c1826c2 100644..100755
--- a/connectivity/source/inc/dbase/DDriver.hxx
+++ b/connectivity/source/inc/dbase/DDriver.hxx
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index fb3ed77e7048..7dcc6608cb84 100644..100755
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -84,13 +84,13 @@ namespace connectivity
             ONDXPageList    m_aCollector;                   // Pool von nicht mehr benoetigten Seiten
             ONDXPagePtr     m_aRoot,                        // Wurzel des b+ Baums
                             m_aCurLeaf;                 // aktuelles Blatt
-            USHORT          m_nCurNode;                 // Position des aktuellen Knoten
+            sal_uInt16          m_nCurNode;                 // Position des aktuellen Knoten
 
             sal_uInt32          m_nPageCount,
                             m_nRootPage;
 
             ODbaseTable*    m_pTable;
-            BOOL            m_bUseCollector : 1;                        // Verwenden des GarbageCollectors
+            sal_Bool            m_bUseCollector : 1;                        // Verwenden des GarbageCollectors
 
             ::rtl::OUString getCompletePath();
             void closeImpl();
@@ -124,31 +124,31 @@ namespace connectivity
             sal_uInt32 GetRootPos()                 {return m_nRootPage;}
             sal_uInt32 GetPageCount()               {return m_nPageCount;}
 
-            BOOL IsText() const                 {return m_aHeader.db_keytype == 0;}
-            USHORT GetMaxNodes() const          {return m_aHeader.db_maxkeys;}
+            sal_Bool IsText() const                 {return m_aHeader.db_keytype == 0;}
+            sal_uInt16 GetMaxNodes() const          {return m_aHeader.db_maxkeys;}
 
-            virtual BOOL Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
-            virtual BOOL Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
-            virtual BOOL Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
-            virtual BOOL Find(sal_uInt32 nRec, const ORowSetValue& rValue);
+            virtual sal_Bool Insert(sal_uInt32 nRec, const ORowSetValue& rValue);
+            virtual sal_Bool Update(sal_uInt32 nRec, const ORowSetValue&, const ORowSetValue&);
+            virtual sal_Bool Delete(sal_uInt32 nRec, const ORowSetValue& rValue);
+            virtual sal_Bool Find(sal_uInt32 nRec, const ORowSetValue& rValue);
 
             void createINFEntry();
-            BOOL CreateImpl();
-            BOOL DropImpl();
+            sal_Bool CreateImpl();
+            sal_Bool DropImpl();
 
             DECLARE_SERVICE_INFO();
         protected:
 
-            ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = NULL, BOOL bLoad = FALSE);
+            ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = NULL, sal_Bool bLoad = sal_False);
             void Collect(ONDXPage*);
             ONDXPagePtr getRoot();
 
             sal_Bool isUnique() const { return m_IsUnique; }
-            BOOL UseCollector() const {return m_bUseCollector;}
+            sal_Bool UseCollector() const {return m_bUseCollector;}
             // Tree operationen
             void Insert(ONDXPagePtr aCurPage, ONDXNode& rNode);
-            void Release(BOOL bSave = TRUE);
-            BOOL ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
+            void Release(sal_Bool bSave = sal_True);
+            sal_Bool ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue);
         };
 
         SvStream& operator << (SvStream &rStream, ODbaseIndex&);
diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx
index 136c49a1f574..a38b137b95a4 100644..100755
--- a/connectivity/source/inc/dbase/DIndexColumns.hxx
+++ b/connectivity/source/inc/dbase/DIndexColumns.hxx
@@ -49,7 +49,7 @@ namespace connectivity
             ODbaseIndexColumns( ODbaseIndex* _pIndex,
                                 ::osl::Mutex& _rMutex,
                                 const TStringVector &_rVector)
-                        : sdbcx::OCollection(*_pIndex,_pIndex->getTable()->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+                        : sdbcx::OCollection(*_pIndex,_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
                         , m_pIndex(_pIndex)
             {}
 
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index a6c4308a35e2..ec98734053a9 100644..100755
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -48,14 +48,14 @@ namespace connectivity
             ODbaseIndex*            m_pIndex;
             ONDXPagePtr             m_aRoot,
                                     m_aCurLeaf;
-            USHORT                  m_nCurNode;
+            sal_uInt16                  m_nCurNode;
 
         protected:
-            ULONG Find(BOOL bFirst);
-            ULONG GetCompare(BOOL bFirst);
-            ULONG GetLike(BOOL bFirst);
-            ULONG GetNull(BOOL bFirst);
-            ULONG GetNotNull(BOOL bFirst);
+            sal_uIntPtr Find(sal_Bool bFirst);
+            sal_uIntPtr GetCompare(sal_Bool bFirst);
+            sal_uIntPtr GetLike(sal_Bool bFirst);
+            sal_uIntPtr GetNull(sal_Bool bFirst);
+            sal_uIntPtr GetNotNull(sal_Bool bFirst);
 
             ONDXKey* GetFirstKey(ONDXPage* pPage,
                                 const file::OOperand& rKey);
@@ -76,8 +76,8 @@ namespace connectivity
             }
 
             virtual ~OIndexIterator();
-            ULONG First();
-            ULONG Next();
+            sal_uIntPtr First();
+            sal_uIntPtr Next();
 
         };
     }
diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx
index 7de170c1ca4c..2e693765cad4 100644..100755
--- a/connectivity/source/inc/dbase/DIndexPage.hxx
+++ b/connectivity/source/inc/dbase/DIndexPage.hxx
@@ -31,9 +31,7 @@
 
 #include <rtl/ref.hxx>
 #include <tools/stream.hxx>
-#ifndef _VECTOR_
 #include <vector>
-#endif
 
 #endif // _CONNECTIVITY_DBASE_INDEXPAGE_HXX_
 
diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx
index bde6e63526da..a0dceffe9434 100644..100755
--- a/connectivity/source/inc/dbase/DIndexes.hxx
+++ b/connectivity/source/inc/dbase/DIndexes.hxx
@@ -51,7 +51,7 @@ namespace connectivity
             virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
         public:
             ODbaseIndexes(ODbaseTable* _pTable, ::osl::Mutex& _rMutex,
-                const TStringVector &_rVector) : ODbaseIndexes_BASE(*_pTable,_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+                const TStringVector &_rVector) : ODbaseIndexes_BASE(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
                 , m_pTable(_pTable)
             {}
 
diff --git a/connectivity/source/inc/dbase/DPreparedStatement.hxx b/connectivity/source/inc/dbase/DPreparedStatement.hxx
index 52bbaf73bb8c..52bbaf73bb8c 100644..100755
--- a/connectivity/source/inc/dbase/DPreparedStatement.hxx
+++ b/connectivity/source/inc/dbase/DPreparedStatement.hxx
diff --git a/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx
index d5a05e946dcf..d5a05e946dcf 100644..100755
--- a/connectivity/source/inc/dbase/DResultSet.hxx
+++ b/connectivity/source/inc/dbase/DResultSet.hxx
diff --git a/connectivity/source/inc/dbase/DStatement.hxx b/connectivity/source/inc/dbase/DStatement.hxx
index 8029cf9ed79a..8029cf9ed79a 100644..100755
--- a/connectivity/source/inc/dbase/DStatement.hxx
+++ b/connectivity/source/inc/dbase/DStatement.hxx
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index ba41c10c8df7..7ca7ee62c0e5 100644..100755
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -69,26 +69,26 @@ namespace connectivity
         private:
             struct DBFHeader {                       /* Kopfsatz-Struktur            */
                                 DBFType db_typ;                         /* Dateityp                     */
-                                BYTE    db_aedat[3];                    /* Datum der letzen Aenderung   */
+                                sal_uInt8    db_aedat[3];                    /* Datum der letzen Aenderung   */
                                                                         /* JJ MM TT                     */
                                 sal_uInt32   db_anz;                         /* Anzahl der Saetze            */
-                                USHORT  db_kopf;                        /* laenge Kopfsatz-Struktur     */
-                                USHORT  db_slng;                        /* laenge der Daten-Saetze      */
-                                BYTE    db_frei[20];                    /* reserviert                   */
+                                sal_uInt16  db_kopf;                        /* laenge Kopfsatz-Struktur     */
+                                sal_uInt16  db_slng;                        /* laenge der Daten-Saetze      */
+                                sal_uInt8    db_frei[20];                    /* reserviert                   */
                             };
             struct DBFColumn {                       /* Feldbezeichner               */
-                                BYTE    db_fnm[11];                     /* Feldname                     */
-                                BYTE    db_typ;                         /* Feldtyp                      */
-                                UINT32  db_adr;                         /* Feldadresse                  */
-                                BYTE    db_flng;                        /* Feldlaenge                   */
-                                BYTE    db_dez;                         /* Dezimalstellen fuer N        */
-                                BYTE    db_frei2[14];                   /* reserviert                   */
+                                sal_uInt8    db_fnm[11];                     /* Feldname                     */
+                                sal_uInt8    db_typ;                         /* Feldtyp                      */
+                                sal_uInt32  db_adr;                         /* Feldadresse                  */
+                                sal_uInt8    db_flng;                        /* Feldlaenge                   */
+                                sal_uInt8    db_dez;                         /* Dezimalstellen fuer N        */
+                                sal_uInt8    db_frei2[14];                   /* reserviert                   */
                             };
             struct DBFMemoHeader
                             {
                                 DBFMemoType db_typ;                     /* Dateityp                     */
-                                UINT32  db_next;                        /* naechster freier Block       */
-                                USHORT  db_size;                        /* Blockgroesse: dBase 3 fest   */
+                                sal_uInt32  db_next;                        /* naechster freier Block       */
+                                sal_uInt16  db_size;                        /* Blockgroesse: dBase 3 fest   */
                             };
 
             ::std::vector<sal_Int32> m_aTypes;      // holds all type for columns just to avoid to ask the propertyset
@@ -108,15 +108,15 @@ namespace connectivity
             void fillColumns();
             String createTempFile();
             void copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos);
-            BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
-            BOOL CreateMemoFile(const INetURLObject& aFile);
-            BOOL HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;}
-            BOOL ReadMemoHeader();
-            BOOL ReadMemo(ULONG nBlockNo, ORowSetValue& aVariable);
-
-            BOOL WriteMemo(ORowSetValue& aVariable, ULONG& rBlockNr);
-            BOOL WriteBuffer();
-            BOOL UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
+            sal_Bool CreateMemoFile(const INetURLObject& aFile);
+            sal_Bool HasMemoFields() const { return m_aHeader.db_typ > dBaseIV;}
+            sal_Bool ReadMemoHeader();
+            sal_Bool ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable);
+
+            sal_Bool WriteMemo(ORowSetValue& aVariable, sal_uIntPtr& rBlockNr);
+            sal_Bool WriteBuffer();
+            sal_Bool UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
             ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> isUniqueByColumnName(sal_Int32 _nColumnPos);
             void AllocBuffer();
 
@@ -162,19 +162,19 @@ namespace connectivity
             // XRename
             virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
 
-            BOOL    DropImpl();
-            BOOL    CreateImpl();
+            sal_Bool    DropImpl();
+            sal_Bool    CreateImpl();
 
 
-            virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
-            virtual BOOL DeleteRow(const OSQLColumns& _rCols);
-            virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual sal_Bool InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual sal_Bool DeleteRow(const OSQLColumns& _rCols);
+            virtual sal_Bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
 
             virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor);
             virtual void dropColumn(sal_Int32 _nPos);
 
             static String   getEntry(file::OConnection* _pConnection,const ::rtl::OUString& _sURL );
-            static BOOL     Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes );
+            static sal_Bool     Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,sdbcx::OCollection* _pIndexes );
 
             virtual void refreshHeader();
 
diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx
index 91ed713fe0b9..91ed713fe0b9 100644..100755
--- a/connectivity/source/inc/dbase/DTables.hxx
+++ b/connectivity/source/inc/dbase/DTables.hxx
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 97808ff7d838..c075ee322f3f 100644..100755
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -51,14 +51,14 @@ namespace connectivity
         class ONDXKey : public ONDXKey_BASE
         {
             friend class ONDXNode;
-            UINT32          nRecord;                /* Satzzeiger               */
+            sal_uInt32          nRecord;                /* Satzzeiger               */
             ORowSetValue    xValue;                 /* Schluesselwert           */
 
         public:
-            ONDXKey(UINT32 nRec=0);
-            ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec);
-            ONDXKey(const rtl::OUString& aStr, UINT32 nRec = 0);
-            ONDXKey(double aVal, UINT32 nRec = 0);
+            ONDXKey(sal_uInt32 nRec=0);
+            ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec);
+            ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec = 0);
+            ONDXKey(double aVal, sal_uInt32 nRec = 0);
 
             inline ONDXKey(const ONDXKey& rKey);
 
@@ -67,21 +67,21 @@ namespace connectivity
 
             virtual const ORowSetValue& getValue() const;
 
-            UINT32 GetRecord() const        { return nRecord;   }
-            void setRecord(UINT32 _nRec)    { nRecord = _nRec;  }
+            sal_uInt32 GetRecord() const        { return nRecord;   }
+            void setRecord(sal_uInt32 _nRec)    { nRecord = _nRec;  }
             void   ResetRecord()            { nRecord = 0;      }
 
-            BOOL operator == (const ONDXKey& rKey) const;
-            BOOL operator != (const ONDXKey& rKey) const;
-            BOOL operator <  (const ONDXKey& rKey) const;
-            BOOL operator <= (const ONDXKey& rKey) const;
-            BOOL operator >  (const ONDXKey& rKey) const;
-            BOOL operator >= (const ONDXKey& rKey) const;
+            sal_Bool operator == (const ONDXKey& rKey) const;
+            sal_Bool operator != (const ONDXKey& rKey) const;
+            sal_Bool operator <  (const ONDXKey& rKey) const;
+            sal_Bool operator <= (const ONDXKey& rKey) const;
+            sal_Bool operator >  (const ONDXKey& rKey) const;
+            sal_Bool operator >= (const ONDXKey& rKey) const;
 
-            BOOL Load (SvFileStream& rStream, BOOL bText);
-            BOOL Write(SvFileStream& rStream, BOOL bText);
+            sal_Bool Load (SvFileStream& rStream, sal_Bool bText);
+            sal_Bool Write(SvFileStream& rStream, sal_Bool bText);
 
-            static BOOL IsText(sal_Int32 eType);
+            static sal_Bool IsText(sal_Int32 eType);
 
         private:
             StringCompare Compare(const ONDXKey& rKey) const;
@@ -101,18 +101,18 @@ namespace connectivity
             friend  SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
             friend  SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
 
-            UINT32  nPagePos;       // Position in der Indexdatei
+            sal_uInt32  nPagePos;       // Position in der Indexdatei
 
         public:
-            ONDXPagePtr(UINT32 nPos = 0):nPagePos(nPos){}
+            ONDXPagePtr(sal_uInt32 nPos = 0):nPagePos(nPos){}
             ONDXPagePtr(const ONDXPagePtr& rRef);
             ONDXPagePtr(ONDXPage* pRefPage);
 
             ONDXPagePtr& operator=(const ONDXPagePtr& rRef);
             ONDXPagePtr& operator=(ONDXPage* pPageRef);
 
-            UINT32 GetPagePos() const {return nPagePos;}
-            BOOL HasPage() const {return nPagePos != 0;}
+            sal_uInt32 GetPagePos() const {return nPagePos;}
+            sal_Bool HasPage() const {return nPagePos != 0;}
             //  sal_Bool Is() const { return isValid(); }
         };
         //==================================================================
@@ -125,9 +125,9 @@ namespace connectivity
             friend  SvStream& operator << (SvStream &rStream, const ONDXPage&);
             friend  SvStream& operator >> (SvStream &rStream, ONDXPage&);
 
-            UINT32      nPagePos;               // Position in der Indexdatei
-            BOOL        bModified : 1;
-            USHORT      nCount;
+            sal_uInt32      nPagePos;               // Position in der Indexdatei
+            sal_Bool        bModified : 1;
+            sal_uInt16      nCount;
 
             ONDXPagePtr aParent,            // VaterSeite
                         aChild;             // Zeiger auf rechte ChildPage
@@ -136,33 +136,33 @@ namespace connectivity
 
         public:
             // Knoten Operationen
-            USHORT  Count() const {return nCount;}
+            sal_uInt16  Count() const {return nCount;}
 
-            BOOL    Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0);
-            BOOL    Insert(USHORT nIndex, ONDXNode& rNode);
-            BOOL    Append(ONDXNode& rNode);
-            BOOL    Delete(USHORT);
-            void    Remove(USHORT);
-            void    Release(BOOL bSave = TRUE);
-            void    ReleaseFull(BOOL bSave = TRUE);
+            sal_Bool    Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft = 0);
+            sal_Bool    Insert(sal_uInt16 nIndex, ONDXNode& rNode);
+            sal_Bool    Append(ONDXNode& rNode);
+            sal_Bool    Delete(sal_uInt16);
+            void    Remove(sal_uInt16);
+            void    Release(sal_Bool bSave = sal_True);
+            void    ReleaseFull(sal_Bool bSave = sal_True);
 
             // Aufteilen und Zerlegen
             ONDXNode Split(ONDXPage& rPage);
-            void Merge(USHORT nParentNodePos, ONDXPagePtr xPage);
+            void Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage);
 
             // Zugriffsoperationen
-            ONDXNode& operator[] (USHORT nPos);
-            const ONDXNode& operator[] (USHORT nPos) const;
+            ONDXNode& operator[] (sal_uInt16 nPos);
+            const ONDXNode& operator[] (sal_uInt16 nPos) const;
 
-            BOOL IsRoot() const;
-            BOOL IsLeaf() const;
-            BOOL IsModified() const;
-            BOOL HasParent();
-            BOOL HasChild() const;
+            sal_Bool IsRoot() const;
+            sal_Bool IsLeaf() const;
+            sal_Bool IsModified() const;
+            sal_Bool HasParent();
+            sal_Bool HasChild() const;
 
-            BOOL IsFull() const;
+            sal_Bool IsFull() const;
 
-            UINT32 GetPagePos() const {return nPagePos;}
+            sal_uInt32 GetPagePos() const {return nPagePos;}
             ONDXPagePtr& GetChild(ODbaseIndex* pIndex = 0);
 
             // Parent braucht nicht nachgeladen zu werden
@@ -174,8 +174,8 @@ namespace connectivity
             void SetChild(ONDXPagePtr aCh);
             void SetParent(ONDXPagePtr aPa);
 
-            USHORT Search(const ONDXKey& rSearch);
-            USHORT Search(const ONDXPage* pPage);
+            sal_uInt16 Search(const ONDXKey& rSearch);
+            sal_uInt16 Search(const ONDXPage* pPage);
             void   SearchAndReplace(const ONDXKey& rSearch, ONDXKey& rReplace);
 
         protected:
@@ -184,11 +184,11 @@ namespace connectivity
 
             virtual void QueryDelete();
 
-            void SetModified(BOOL bMod) {bModified = bMod;}
-            void SetPagePos(UINT32 nPage) {nPagePos = nPage;}
+            void SetModified(sal_Bool bMod) {bModified = bMod;}
+            void SetPagePos(sal_uInt32 nPage) {nPagePos = nPage;}
 
-            BOOL Find(const ONDXKey&);  // rek. Abstieg
-            USHORT FindPos(const ONDXKey& rKey) const;
+            sal_Bool Find(const ONDXKey&);  // rek. Abstieg
+            sal_uInt16 FindPos(const ONDXKey& rKey) const;
 
 #if OSL_DEBUG_LEVEL > 1
             void PrintPage();
@@ -200,11 +200,11 @@ namespace connectivity
         SvStream& operator << (SvStream &rStream, const ONDXPagePtr&);
         SvStream& operator >> (SvStream &rStream, ONDXPagePtr&);
 
-        inline BOOL ONDXPage::IsRoot() const {return !aParent.Is();}
-        inline BOOL ONDXPage::IsLeaf() const {return !aChild.HasPage();}
-        inline BOOL ONDXPage::IsModified() const {return bModified;}
-        inline BOOL ONDXPage::HasParent() {return aParent.Is();}
-        inline BOOL ONDXPage::HasChild() const {return aChild.HasPage();}
+        inline sal_Bool ONDXPage::IsRoot() const {return !aParent.Is();}
+        inline sal_Bool ONDXPage::IsLeaf() const {return !aChild.HasPage();}
+        inline sal_Bool ONDXPage::IsModified() const {return bModified;}
+        inline sal_Bool ONDXPage::HasParent() {return aParent.Is();}
+        inline sal_Bool ONDXPage::HasChild() const {return aChild.HasPage();}
         inline ONDXPagePtr ONDXPage::GetParent() {return aParent;}
 
         inline void ONDXPage::SetParent(ONDXPagePtr aPa = ONDXPagePtr())
@@ -240,7 +240,7 @@ namespace connectivity
                        :aChild(aPagePtr),aKey(rKey) {}
 
             // verweist der Knoten auf eine Seite
-            BOOL            HasChild() const {return aChild.HasPage();}
+            sal_Bool            HasChild() const {return aChild.HasPage();}
             // Ist ein Index angegeben, kann gegebenfalls die Seite nachgeladen werden
             ONDXPagePtr&    GetChild(ODbaseIndex* pIndex = NULL, ONDXPage* = NULL);
 
@@ -257,14 +257,14 @@ namespace connectivity
         //==================================================================
         // inline implementation
         //==================================================================
-//      inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, UINT32 nRec)
+//      inline ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
 //          : ONDXKey_BASE(eType)
 //          , nRecord(nRec),xValue(rVal)
 //      {
 //      }
 
 
-//      inline ONDXKey::ONDXKey(const rtl::OUString& aStr, UINT32 nRec)
+//      inline ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec)
 //                  : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
 //                   ,nRecord(nRec)
 //      {
@@ -272,14 +272,14 @@ namespace connectivity
 //              xValue = aStr;
 //      }
 
-//      inline ONDXKey::ONDXKey(double aVal, UINT32 nRec)
+//      inline ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
 //                   : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE)
 //                   ,nRecord(nRec)
 //                   ,xValue(aVal)
 //      {
 //      }
 
-//      inline ONDXKey::ONDXKey(UINT32 nRec)
+//      inline ONDXKey::ONDXKey(sal_uInt32 nRec)
 //                   :nRecord(nRec)
 //      {
 //      }
@@ -302,29 +302,29 @@ namespace connectivity
             return *this;
         }
 
-        inline BOOL ONDXKey::operator == (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator == (const ONDXKey& rKey) const
         {
             if(&rKey == this)
                 return sal_True;
             return Compare(rKey) == COMPARE_EQUAL;
         }
-        inline BOOL ONDXKey::operator != (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator != (const ONDXKey& rKey) const
         {
             return !operator== (rKey);
         }
-        inline BOOL ONDXKey::operator <  (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator <  (const ONDXKey& rKey) const
         {
             return Compare(rKey) == COMPARE_LESS;
         }
-        inline BOOL ONDXKey::operator >  (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator >  (const ONDXKey& rKey) const
         {
             return Compare(rKey) == COMPARE_GREATER;
         }
-        inline BOOL ONDXKey::operator <= (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator <= (const ONDXKey& rKey) const
         {
             return !operator > (rKey);
         }
-        inline BOOL ONDXKey::operator >= (const ONDXKey& rKey) const
+        inline sal_Bool ONDXKey::operator >= (const ONDXKey& rKey) const
         {
             return !operator< (rKey);
         }
diff --git a/connectivity/source/inc/diagnose_ex.h b/connectivity/source/inc/diagnose_ex.h
index 52043001c0bb..52043001c0bb 100644..100755
--- a/connectivity/source/inc/diagnose_ex.h
+++ b/connectivity/source/inc/diagnose_ex.h
diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx
index 49afc2d7ef02..49afc2d7ef02 100644..100755
--- a/connectivity/source/inc/file/FCatalog.hxx
+++ b/connectivity/source/inc/file/FCatalog.hxx
diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx
index 1d73de5924e3..9f95ea72b8cd 100644..100755
--- a/connectivity/source/inc/file/FColumns.hxx
+++ b/connectivity/source/inc/file/FColumns.hxx
@@ -50,7 +50,7 @@ namespace connectivity
             OColumns(   OFileTable* _pTable,
                         ::osl::Mutex& _rMutex,
                         const TStringVector &_rVector
-                    ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+                    ) : sdbcx::OCollection(*_pTable,_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
                 ,m_pTable(_pTable)
             {}
         };
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index 244d8055b4a8..244d8055b4a8 100644..100755
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx
index bf4db7268912..bf4db7268912 100644..100755
--- a/connectivity/source/inc/file/FDatabaseMetaData.hxx
+++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx
index 4133e61e1b3d..4133e61e1b3d 100644..100755
--- a/connectivity/source/inc/file/FDateFunctions.hxx
+++ b/connectivity/source/inc/file/FDateFunctions.hxx
diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx
index 337f8488bbd0..337f8488bbd0 100644..100755
--- a/connectivity/source/inc/file/FDriver.hxx
+++ b/connectivity/source/inc/file/FDriver.hxx
diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx
index f98cdb7a2642..f98cdb7a2642 100644..100755
--- a/connectivity/source/inc/file/FNumericFunctions.hxx
+++ b/connectivity/source/inc/file/FNumericFunctions.hxx
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index 79cfd67eda3c..08125b1b9d8d 100644..100755
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -68,7 +68,7 @@ namespace connectivity
             void checkAndResizeParameters(sal_Int32 parameterIndex);
             void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x);
 
-            UINT32 AddParameter(connectivity::OSQLParseNode * pParameter,
+            sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter,
                                 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol);
             void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes);
             void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable);
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index 2701985ca4d3..11c7c124dfa3 100644..100755
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -151,13 +151,13 @@ namespace connectivity
             void construct();
             sal_Bool evaluate();
 
-            BOOL ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
-                                INT32 nOffset = 1,
-                                BOOL bEvaluate = TRUE,
-                                BOOL bRetrieveData = TRUE);
+            sal_Bool ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
+                                sal_Int32 nOffset = 1,
+                                sal_Bool bEvaluate = sal_True,
+                                sal_Bool bRetrieveData = sal_True);
 
             OKeyValue* GetOrderbyKeyValue(OValueRefRow& _rRow);
-            BOOL IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != SQL_COLUMN_NOTFOUND;}
+            sal_Bool IsSorted() const { return !m_aOrderbyColumnNumber.empty() && m_aOrderbyColumnNumber[0] != SQL_COLUMN_NOTFOUND;}
 
             // return true when the select statement is "select count(*) from table"
             inline sal_Bool isCount() const { return m_bIsCount; }
@@ -172,7 +172,7 @@ namespace connectivity
 
             using OResultSet_BASE::rBHelper;
 
-            BOOL Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, BOOL bRetrieveData);
+            sal_Bool Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData);
             virtual sal_Bool fillIndexValues(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> &_xIndex);
 
             // OPropertyArrayUsageHelper
@@ -285,7 +285,7 @@ namespace connectivity
 
             // special methods
             inline sal_Int32 mapColumn(sal_Int32    column);
-            virtual BOOL OpenImpl();
+            virtual sal_Bool OpenImpl();
             virtual void doTableSpecials(const OSQLTable& _xTable);
 
             inline sal_Int32 getRowCountResult() const { return m_nRowCountResult; }
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index e4824f5044e3..e4824f5044e3 100644..100755
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index b1b5b3bdf465..de7807079ab7 100644..100755
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -135,8 +135,8 @@ namespace connectivity
             void GetAssignValues();
             void SetAssignValue(const String& aColumnName,
                                    const String& aValue,
-                                   BOOL bSetNull = FALSE,
-                                   UINT32 nParameter=SQL_NO_PARAMETER);
+                                   sal_Bool bSetNull = sal_False,
+                                   sal_uInt32 nParameter=SQL_NO_PARAMETER);
             void ParseAssignValues( const ::std::vector< String>& aColumnNameList,
                                     connectivity::OSQLParseNode* pRow_Value_Constructor_Elem,xub_StrLen nIndex);
 
diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx
index 6b3a6bc88c3e..6b3a6bc88c3e 100644..100755
--- a/connectivity/source/inc/file/FStringFunctions.hxx
+++ b/connectivity/source/inc/file/FStringFunctions.hxx
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index 687f96bb60bf..23a1086234f9 100644..100755
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -86,9 +86,9 @@ namespace connectivity
             virtual sal_Bool fetchRow(OValueRefRow& _rRow,const OSQLColumns& _rCols, sal_Bool _bUseTableDefs,sal_Bool bRetrieveData) = 0;
 
             ::rtl::Reference<OSQLColumns> getTableColumns() const {return m_aColumns;}
-            virtual BOOL InsertRow(OValueRefVector& rRow, BOOL bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
-            virtual BOOL DeleteRow(const OSQLColumns& _rCols);
-            virtual BOOL UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual sal_Bool InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
+            virtual sal_Bool DeleteRow(const OSQLColumns& _rCols);
+            virtual sal_Bool UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xCols);
             virtual void addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& descriptor);
             virtual void dropColumn(sal_Int32 _nPos);
             // refresh the header of file based tables to see changes done by someone
diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx
index e85fd51102bd..711d3ad88be4 100644..100755
--- a/connectivity/source/inc/file/FTables.hxx
+++ b/connectivity/source/inc/file/FTables.hxx
@@ -47,7 +47,7 @@ namespace connectivity
             virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
         public:
             OTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
-                const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->storesMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
+                const TStringVector &_rVector) : sdbcx::OCollection(_rParent,_rMetaData->supportsMixedCaseQuotedIdentifiers(),_rMutex,_rVector)
                 ,m_xMetaData(_rMetaData)
             {}
 
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index 60eb3bfae559..386807c05391 100644..100755
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -82,9 +82,9 @@ namespace connectivity
             void dispose();
             void start(OSQLParseNode* pSQLParseNode);
             void clean();
-            virtual BOOL hasRestriction() const;
-            virtual BOOL hasFunctions() const;
-            inline BOOL evaluateRestriction()   { return m_aInterpreter->start(); }
+            virtual sal_Bool hasRestriction() const;
+            virtual sal_Bool hasFunctions() const;
+            inline sal_Bool evaluateRestriction()   { return m_aInterpreter->start(); }
             void setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping);
             void setOrigColumns(const OFileColumns& rCols);
             virtual OOperandAttr* createOperandAttr(sal_Int32 _nPos,
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index ce489a34832d..ce489a34832d 100644..100755
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 95bdd48eda56..8a09061d3781 100644..100755
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -110,7 +110,7 @@ namespace connectivity
 
             inline void startSelection(ORowSetValueDecoratorRef& _rVal)
             {
-                return evaluateSelection(m_rCompiler->m_aCodeList,_rVal);
+                evaluateSelection(m_rCompiler->m_aCodeList,_rVal);
             }
 
 
diff --git a/connectivity/source/inc/file/filedllapi.hxx b/connectivity/source/inc/file/filedllapi.hxx
index ac826dc1040e..ac826dc1040e 100644..100755
--- a/connectivity/source/inc/file/filedllapi.hxx
+++ b/connectivity/source/inc/file/filedllapi.hxx
diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx
index cd4ace069420..cd4ace069420 100644..100755
--- a/connectivity/source/inc/file/quotedstring.hxx
+++ b/connectivity/source/inc/file/quotedstring.hxx
diff --git a/connectivity/source/inc/flat/ECatalog.hxx b/connectivity/source/inc/flat/ECatalog.hxx
index 18bf218e2c28..18bf218e2c28 100644..100755
--- a/connectivity/source/inc/flat/ECatalog.hxx
+++ b/connectivity/source/inc/flat/ECatalog.hxx
diff --git a/connectivity/source/inc/flat/EColumns.hxx b/connectivity/source/inc/flat/EColumns.hxx
index 63adc8fffbb4..63adc8fffbb4 100644..100755
--- a/connectivity/source/inc/flat/EColumns.hxx
+++ b/connectivity/source/inc/flat/EColumns.hxx
diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index 423e625f3cfd..23c4d4006d47 100644..100755
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -39,6 +39,7 @@ namespace connectivity
         class OFlatConnection : public file::OConnection
         {
         private:
+            sal_Int32   m_nMaxRowsToScan;
             sal_Bool    m_bHeaderLine;          // column names in first row
             sal_Unicode m_cFieldDelimiter;      // look at the name
             sal_Unicode m_cStringDelimiter;     // delimiter for strings m_cStringDelimiter blabla m_cStringDelimiter
@@ -56,6 +57,7 @@ namespace connectivity
             inline sal_Unicode  getStringDelimiter()    const { return m_cStringDelimiter;  }
             inline sal_Unicode  getDecimalDelimiter()   const { return m_cDecimalDelimiter; }
             inline sal_Unicode  getThousandDelimiter()  const { return m_cThousandDelimiter;}
+            inline sal_Int32    getMaxRowsToScan()      const { return m_nMaxRowsToScan;}
             // XServiceInfo
             DECLARE_SERVICE_INFO();
 
diff --git a/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
index 14400139acf3..14400139acf3 100644..100755
--- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx
+++ b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx
index 617b4fe47c21..617b4fe47c21 100644..100755
--- a/connectivity/source/inc/flat/EDriver.hxx
+++ b/connectivity/source/inc/flat/EDriver.hxx
diff --git a/connectivity/source/inc/flat/EPreparedStatement.hxx b/connectivity/source/inc/flat/EPreparedStatement.hxx
index 16ab510838f2..16ab510838f2 100644..100755
--- a/connectivity/source/inc/flat/EPreparedStatement.hxx
+++ b/connectivity/source/inc/flat/EPreparedStatement.hxx
diff --git a/connectivity/source/inc/flat/EResultSet.hxx b/connectivity/source/inc/flat/EResultSet.hxx
index 9bafb5d9ecd0..9bafb5d9ecd0 100644..100755
--- a/connectivity/source/inc/flat/EResultSet.hxx
+++ b/connectivity/source/inc/flat/EResultSet.hxx
diff --git a/connectivity/source/inc/flat/EStatement.hxx b/connectivity/source/inc/flat/EStatement.hxx
index c38a7874a101..c38a7874a101 100644..100755
--- a/connectivity/source/inc/flat/EStatement.hxx
+++ b/connectivity/source/inc/flat/EStatement.hxx
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index 24b6ba412b59..59d7dfb354c6 100644..100755
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -34,6 +34,7 @@
 #include "connectivity/CommonTools.hxx"
 #include <tools/urlobj.hxx>
 #include "file/quotedstring.hxx"
+#include <unotools/syslocale.hxx>
 
 namespace connectivity
 {
@@ -66,8 +67,11 @@ namespace connectivity
             bool                            m_bNeedToReadLine;
         private:
             void fillColumns(const ::com::sun::star::lang::Locale& _aLocale);
-            BOOL CreateFile(const INetURLObject& aFile, BOOL& bCreateMemo);
+            sal_Bool CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo);
             sal_Bool readLine(sal_Int32& _rnCurrentPos);
+            void impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,xub_StrLen& nStartPosFirstLine,xub_StrLen& nStartPosFirstLine2
+                                             ,sal_Int32& io_nType,sal_Int32& io_nPrecisions,sal_Int32& io_nScales,String& o_sTypeName
+                                             ,const sal_Unicode cDecimalDelimiter,const sal_Unicode cThousandDelimiter,const CharClass& aCharClass);
         public:
             virtual void refreshColumns();
 
diff --git a/connectivity/source/inc/flat/ETables.hxx b/connectivity/source/inc/flat/ETables.hxx
index 818dbc8b38e4..818dbc8b38e4 100644..100755
--- a/connectivity/source/inc/flat/ETables.hxx
+++ b/connectivity/source/inc/flat/ETables.hxx
diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx
index f46e19c022fd..f46e19c022fd 100644..100755
--- a/connectivity/source/inc/hsqldb/HCatalog.hxx
+++ b/connectivity/source/inc/hsqldb/HCatalog.hxx
diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx
index 5078e3566bfe..5078e3566bfe 100644..100755
--- a/connectivity/source/inc/hsqldb/HColumns.hxx
+++ b/connectivity/source/inc/hsqldb/HColumns.hxx
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index f86fdb9f4432..f86fdb9f4432 100644..100755
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index 2ef4164899c7..2ef4164899c7 100644..100755
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.hxx
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.h b/connectivity/source/inc/hsqldb/HStorageAccess.h
index 01d42a8f38f5..01d42a8f38f5 100644..100755
--- a/connectivity/source/inc/hsqldb/HStorageAccess.h
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.h
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index 079d8c7d0ec7..079d8c7d0ec7 100644..100755
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx
index 5f94b03617da..5f94b03617da 100644..100755
--- a/connectivity/source/inc/hsqldb/HStorageMap.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx
index ef11cc13a4df..ef11cc13a4df 100644..100755
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx
index 377868453b6e..377868453b6e 100644..100755
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ b/connectivity/source/inc/hsqldb/HTables.hxx
diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx
index aff601e33bd8..aff601e33bd8 100644..100755
--- a/connectivity/source/inc/hsqldb/HTools.hxx
+++ b/connectivity/source/inc/hsqldb/HTools.hxx
diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx
index f5df521ade33..f5df521ade33 100644..100755
--- a/connectivity/source/inc/hsqldb/HUser.hxx
+++ b/connectivity/source/inc/hsqldb/HUser.hxx
diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx
index 0626c92e903c..0626c92e903c 100644..100755
--- a/connectivity/source/inc/hsqldb/HUsers.hxx
+++ b/connectivity/source/inc/hsqldb/HUsers.hxx
diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx
index 495c63e437cd..495c63e437cd 100644..100755
--- a/connectivity/source/inc/hsqldb/HView.hxx
+++ b/connectivity/source/inc/hsqldb/HView.hxx
diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx
index a8d9b83c7b17..a8d9b83c7b17 100644..100755
--- a/connectivity/source/inc/hsqldb/HViews.hxx
+++ b/connectivity/source/inc/hsqldb/HViews.hxx
diff --git a/connectivity/source/inc/hsqldb/StorageFileAccess.h b/connectivity/source/inc/hsqldb/StorageFileAccess.h
index c99a16f6df61..c99a16f6df61 100644..100755
--- a/connectivity/source/inc/hsqldb/StorageFileAccess.h
+++ b/connectivity/source/inc/hsqldb/StorageFileAccess.h
diff --git a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
index 2c635de5a12d..2c635de5a12d 100644..100755
--- a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
+++ b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
diff --git a/connectivity/source/inc/internalnode.hxx b/connectivity/source/inc/internalnode.hxx
index 08a29151623d..08a29151623d 100644..100755
--- a/connectivity/source/inc/internalnode.hxx
+++ b/connectivity/source/inc/internalnode.hxx
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index fc6661c27eaa..fc6661c27eaa 100644..100755
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx
index 4aeacbe7b62d..4aeacbe7b62d 100644..100755
--- a/connectivity/source/inc/java/GlobalRef.hxx
+++ b/connectivity/source/inc/java/GlobalRef.hxx
diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx
index fb4cb6588635..fb4cb6588635 100644..100755
--- a/connectivity/source/inc/java/LocalRef.hxx
+++ b/connectivity/source/inc/java/LocalRef.hxx
diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx
index 20837abf136d..20837abf136d 100644..100755
--- a/connectivity/source/inc/java/io/InputStream.hxx
+++ b/connectivity/source/inc/java/io/InputStream.hxx
diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx
index 0e0a3e3e8f59..0e0a3e3e8f59 100644..100755
--- a/connectivity/source/inc/java/io/Reader.hxx
+++ b/connectivity/source/inc/java/io/Reader.hxx
diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx
index 68b6d9adfe0f..68b6d9adfe0f 100644..100755
--- a/connectivity/source/inc/java/lang/Boolean.hxx
+++ b/connectivity/source/inc/java/lang/Boolean.hxx
diff --git a/connectivity/source/inc/java/lang/Class.hxx b/connectivity/source/inc/java/lang/Class.hxx
index 69af774a380d..69af774a380d 100644..100755
--- a/connectivity/source/inc/java/lang/Class.hxx
+++ b/connectivity/source/inc/java/lang/Class.hxx
diff --git a/connectivity/source/inc/java/lang/Exception.hxx b/connectivity/source/inc/java/lang/Exception.hxx
index 5e4111a54c6e..5e4111a54c6e 100644..100755
--- a/connectivity/source/inc/java/lang/Exception.hxx
+++ b/connectivity/source/inc/java/lang/Exception.hxx
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index 1fb37bd2cc23..1fb37bd2cc23 100644..100755
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx
index 273109fd67f0..273109fd67f0 100644..100755
--- a/connectivity/source/inc/java/lang/String.hxx
+++ b/connectivity/source/inc/java/lang/String.hxx
diff --git a/connectivity/source/inc/java/lang/Throwable.hxx b/connectivity/source/inc/java/lang/Throwable.hxx
index 09b047ddf1ba..09b047ddf1ba 100644..100755
--- a/connectivity/source/inc/java/lang/Throwable.hxx
+++ b/connectivity/source/inc/java/lang/Throwable.hxx
diff --git a/connectivity/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx
index 86cd9d57f9bd..86cd9d57f9bd 100644..100755
--- a/connectivity/source/inc/java/math/BigDecimal.hxx
+++ b/connectivity/source/inc/java/math/BigDecimal.hxx
diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx
index ecfd94799513..ecfd94799513 100644..100755
--- a/connectivity/source/inc/java/sql/Array.hxx
+++ b/connectivity/source/inc/java/sql/Array.hxx
diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx
index da44418533c1..da44418533c1 100644..100755
--- a/connectivity/source/inc/java/sql/Blob.hxx
+++ b/connectivity/source/inc/java/sql/Blob.hxx
diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx
index 1269af2543bf..1269af2543bf 100644..100755
--- a/connectivity/source/inc/java/sql/CallableStatement.hxx
+++ b/connectivity/source/inc/java/sql/CallableStatement.hxx
diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx
index 1b861eeebed7..1b861eeebed7 100644..100755
--- a/connectivity/source/inc/java/sql/Clob.hxx
+++ b/connectivity/source/inc/java/sql/Clob.hxx
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index 899e89b86afc..899e89b86afc 100644..100755
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
diff --git a/connectivity/source/inc/java/sql/ConnectionLog.hxx b/connectivity/source/inc/java/sql/ConnectionLog.hxx
index 4985aa244eb6..4985aa244eb6 100644..100755
--- a/connectivity/source/inc/java/sql/ConnectionLog.hxx
+++ b/connectivity/source/inc/java/sql/ConnectionLog.hxx
diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
index 04e85349440e..04e85349440e 100644..100755
--- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
+++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx
index 4e4b9e8ab7e3..4e4b9e8ab7e3 100644..100755
--- a/connectivity/source/inc/java/sql/Driver.hxx
+++ b/connectivity/source/inc/java/sql/Driver.hxx
diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
index 3b54087b7e9e..3b54087b7e9e 100644..100755
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index f621f9ce2869..f621f9ce2869 100644..100755
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx
index 749b57a1db51..749b57a1db51 100644..100755
--- a/connectivity/source/inc/java/sql/PreparedStatement.hxx
+++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx
diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx
index f7410d46e2c8..f7410d46e2c8 100644..100755
--- a/connectivity/source/inc/java/sql/Ref.hxx
+++ b/connectivity/source/inc/java/sql/Ref.hxx
diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx
index 272661bdf30d..272661bdf30d 100644..100755
--- a/connectivity/source/inc/java/sql/ResultSet.hxx
+++ b/connectivity/source/inc/java/sql/ResultSet.hxx
diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
index e859afee76de..e859afee76de 100644..100755
--- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
+++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx
index 21822162ef5f..21822162ef5f 100644..100755
--- a/connectivity/source/inc/java/sql/SQLException.hxx
+++ b/connectivity/source/inc/java/sql/SQLException.hxx
diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx
index c77c0e9f6ee9..c77c0e9f6ee9 100644..100755
--- a/connectivity/source/inc/java/sql/SQLWarning.hxx
+++ b/connectivity/source/inc/java/sql/SQLWarning.hxx
diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx
index f7cf48e3e3ee..f7cf48e3e3ee 100644..100755
--- a/connectivity/source/inc/java/sql/Timestamp.hxx
+++ b/connectivity/source/inc/java/sql/Timestamp.hxx
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index 1efaa76a861b..1efaa76a861b 100644..100755
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
diff --git a/connectivity/source/inc/java/util/Date.hxx b/connectivity/source/inc/java/util/Date.hxx
index d7be97f33519..d7be97f33519 100644..100755
--- a/connectivity/source/inc/java/util/Date.hxx
+++ b/connectivity/source/inc/java/util/Date.hxx
diff --git a/connectivity/source/inc/java/util/Property.hxx b/connectivity/source/inc/java/util/Property.hxx
index b31961b7e46f..b31961b7e46f 100644..100755
--- a/connectivity/source/inc/java/util/Property.hxx
+++ b/connectivity/source/inc/java/util/Property.hxx
diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx
index 42e884619163..42e884619163 100644..100755
--- a/connectivity/source/inc/mysql/YCatalog.hxx
+++ b/connectivity/source/inc/mysql/YCatalog.hxx
diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx
index 85c3b3b5eb7b..85c3b3b5eb7b 100644..100755
--- a/connectivity/source/inc/mysql/YColumns.hxx
+++ b/connectivity/source/inc/mysql/YColumns.hxx
diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx
index 770afe34702e..770afe34702e 100644..100755
--- a/connectivity/source/inc/mysql/YDriver.hxx
+++ b/connectivity/source/inc/mysql/YDriver.hxx
diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx
index e5b44479ee14..e5b44479ee14 100644..100755
--- a/connectivity/source/inc/mysql/YTable.hxx
+++ b/connectivity/source/inc/mysql/YTable.hxx
diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx
index 7a3d62afa48f..7a3d62afa48f 100644..100755
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx
index 145fffc7a815..145fffc7a815 100644..100755
--- a/connectivity/source/inc/mysql/YUser.hxx
+++ b/connectivity/source/inc/mysql/YUser.hxx
diff --git a/connectivity/source/inc/mysql/YUsers.hxx b/connectivity/source/inc/mysql/YUsers.hxx
index c7d71a897c67..c7d71a897c67 100644..100755
--- a/connectivity/source/inc/mysql/YUsers.hxx
+++ b/connectivity/source/inc/mysql/YUsers.hxx
diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx
index 038acfe5353b..038acfe5353b 100644..100755
--- a/connectivity/source/inc/mysql/YViews.hxx
+++ b/connectivity/source/inc/mysql/YViews.hxx
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index 2310a2e9352b..2310a2e9352b 100644..100755
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index c5dbe644705b..c5dbe644705b 100644..100755
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
index 08d4f91f3a94..08d4f91f3a94 100644..100755
--- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 1ae6042ca04f..1ae6042ca04f 100644..100755
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
diff --git a/connectivity/source/inc/odbc/ODefs3.hxx b/connectivity/source/inc/odbc/ODefs3.hxx
index 4eec4e8157c4..4eec4e8157c4 100644..100755
--- a/connectivity/source/inc/odbc/ODefs3.hxx
+++ b/connectivity/source/inc/odbc/ODefs3.hxx
diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx
index 7b28a196ee72..7b28a196ee72 100644..100755
--- a/connectivity/source/inc/odbc/ODriver.hxx
+++ b/connectivity/source/inc/odbc/ODriver.hxx
diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx
index 33633d1e5696..bd53c4b55308 100644..100755
--- a/connectivity/source/inc/odbc/OFunctiondefs.hxx
+++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx
@@ -30,7 +30,7 @@
 #ifndef _CONNECTIVITY_OFUNCTIONDEFS_HXX_
 #define _CONNECTIVITY_OFUNCTIONDEFS_HXX_
 
-#if defined(WIN) || defined(WNT)
+#if defined(WNT)
 
 #ifdef _MSC_VER
 #pragma warning(push)
diff --git a/connectivity/source/inc/odbc/OFunctions.hxx b/connectivity/source/inc/odbc/OFunctions.hxx
index fc61134bae74..fc61134bae74 100644..100755
--- a/connectivity/source/inc/odbc/OFunctions.hxx
+++ b/connectivity/source/inc/odbc/OFunctions.hxx
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index 8c413555b17a..8c413555b17a 100644..100755
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index bbb39209496e..bbb39209496e 100644..100755
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 213db25288dc..213db25288dc 100644..100755
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 3532156e7d94..3532156e7d94 100644..100755
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
index 7f48373e22f4..7f48373e22f4 100644..100755
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
diff --git a/connectivity/source/inc/odbc/odbcbasedllapi.hxx b/connectivity/source/inc/odbc/odbcbasedllapi.hxx
index e533ecdcdfd9..e533ecdcdfd9 100644..100755
--- a/connectivity/source/inc/odbc/odbcbasedllapi.hxx
+++ b/connectivity/source/inc/odbc/odbcbasedllapi.hxx
diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx
index f9cce49cd62d..f9cce49cd62d 100644..100755
--- a/connectivity/source/inc/propertyids.hxx
+++ b/connectivity/source/inc/propertyids.hxx
diff --git a/connectivity/source/inc/resource/adabas_res.hrc b/connectivity/source/inc/resource/adabas_res.hrc
index a5911dcd0e98..a5911dcd0e98 100644..100755
--- a/connectivity/source/inc/resource/adabas_res.hrc
+++ b/connectivity/source/inc/resource/adabas_res.hrc
diff --git a/connectivity/source/inc/resource/ado_res.hrc b/connectivity/source/inc/resource/ado_res.hrc
index 717e194ca3a4..717e194ca3a4 100644..100755
--- a/connectivity/source/inc/resource/ado_res.hrc
+++ b/connectivity/source/inc/resource/ado_res.hrc
diff --git a/connectivity/source/inc/resource/calc_res.hrc b/connectivity/source/inc/resource/calc_res.hrc
index e71901814140..e71901814140 100644..100755
--- a/connectivity/source/inc/resource/calc_res.hrc
+++ b/connectivity/source/inc/resource/calc_res.hrc
diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc
index ac7cb89a630e..ac7cb89a630e 100644..100755
--- a/connectivity/source/inc/resource/common_res.hrc
+++ b/connectivity/source/inc/resource/common_res.hrc
diff --git a/connectivity/source/inc/resource/conn_shared_res.hrc b/connectivity/source/inc/resource/conn_shared_res.hrc
index 981f5a89b4df..981f5a89b4df 100644..100755
--- a/connectivity/source/inc/resource/conn_shared_res.hrc
+++ b/connectivity/source/inc/resource/conn_shared_res.hrc
diff --git a/connectivity/source/inc/resource/dbase_res.hrc b/connectivity/source/inc/resource/dbase_res.hrc
index d4b31e614ced..d4b31e614ced 100644..100755
--- a/connectivity/source/inc/resource/dbase_res.hrc
+++ b/connectivity/source/inc/resource/dbase_res.hrc
diff --git a/connectivity/source/inc/resource/evoab2_res.hrc b/connectivity/source/inc/resource/evoab2_res.hrc
index ebe7170beb96..ebe7170beb96 100644..100755
--- a/connectivity/source/inc/resource/evoab2_res.hrc
+++ b/connectivity/source/inc/resource/evoab2_res.hrc
diff --git a/connectivity/source/inc/resource/file_res.hrc b/connectivity/source/inc/resource/file_res.hrc
index bbc451920ef4..bbc451920ef4 100644..100755
--- a/connectivity/source/inc/resource/file_res.hrc
+++ b/connectivity/source/inc/resource/file_res.hrc
diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc
index 640ed8f5ce81..640ed8f5ce81 100644..100755
--- a/connectivity/source/inc/resource/hsqldb_res.hrc
+++ b/connectivity/source/inc/resource/hsqldb_res.hrc
diff --git a/connectivity/source/inc/resource/jdbc_log.hrc b/connectivity/source/inc/resource/jdbc_log.hrc
index ff2c483f0948..ff2c483f0948 100644..100755
--- a/connectivity/source/inc/resource/jdbc_log.hrc
+++ b/connectivity/source/inc/resource/jdbc_log.hrc
diff --git a/connectivity/source/inc/resource/kab_res.hrc b/connectivity/source/inc/resource/kab_res.hrc
index b03eecdb2b90..b03eecdb2b90 100644..100755
--- a/connectivity/source/inc/resource/kab_res.hrc
+++ b/connectivity/source/inc/resource/kab_res.hrc
diff --git a/connectivity/source/inc/resource/macab_res.hrc b/connectivity/source/inc/resource/macab_res.hrc
index 74d64aa28ad8..74d64aa28ad8 100644..100755
--- a/connectivity/source/inc/resource/macab_res.hrc
+++ b/connectivity/source/inc/resource/macab_res.hrc
diff --git a/connectivity/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc
index 01e93ae17fd5..01e93ae17fd5 100644..100755
--- a/connectivity/source/inc/resource/mozab_res.hrc
+++ b/connectivity/source/inc/resource/mozab_res.hrc
diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx
index aaac66c20539..aaac66c20539 100644..100755
--- a/connectivity/source/inc/resource/sharedresources.hxx
+++ b/connectivity/source/inc/resource/sharedresources.hxx
diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx
index 87ab6e783337..87ab6e783337 100644..100755
--- a/connectivity/source/inc/sqlscan.hxx
+++ b/connectivity/source/inc/sqlscan.hxx
diff --git a/connectivity/source/manager/exports.dxp b/connectivity/source/manager/exports.dxp
index 9630d7e06768..f0e1c69934bc 100644..100755
--- a/connectivity/source/manager/exports.dxp
+++ b/connectivity/source/manager/exports.dxp
@@ -1,3 +1,2 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk
index 52ec191ec836..4880407952f6 100644..100755
--- a/connectivity/source/manager/makefile.mk
+++ b/connectivity/source/manager/makefile.mk
@@ -76,4 +76,10 @@ DEF1EXPORTFILE=	exports.dxp
 
 .INCLUDE : target.mk
 
+ALLTAR : $(MISC)/sdbc2.component
 
+$(MISC)/sdbc2.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sdbc2.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sdbc2.component
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index e541cc2f5dec..e541cc2f5dec 100644..100755
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx
index 2bd22dd6cf68..2bd22dd6cf68 100644..100755
--- a/connectivity/source/manager/mdrivermanager.hxx
+++ b/connectivity/source/manager/mdrivermanager.hxx
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index 136f9f754660..5dfaf0441b14 100644..100755
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -37,7 +37,6 @@
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
 
 //==========================================================================
 //= registration
@@ -52,38 +51,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const
 }
 
 //---------------------------------------------------------------------------------------
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey)
-{
-
-
-    sal_Bool bReturn = sal_False;
-
-    try
-    {
-        ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" ));
-        sMainKeyName += ::drivermanager::OSDBCDriverManager::getImplementationName_static();
-        sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
-        Reference< XRegistryKey > xMainKey = _pRegistryKey->createKey(sMainKeyName);
-        if (xMainKey.is())
-        {
-            Sequence< ::rtl::OUString > sServices(::drivermanager::OSDBCDriverManager::getSupportedServiceNames_static());
-            const ::rtl::OUString* pBegin = sServices.getConstArray();
-            const ::rtl::OUString* pEnd = pBegin + sServices.getLength();
-            for (;pBegin != pEnd ; ++pBegin)
-                xMainKey->createKey(*pBegin);
-            bReturn = sal_True;
-        }
-    }
-    catch(InvalidRegistryException&)
-    {
-    }
-    catch(InvalidValueException&)
-    {
-    }
-    return bReturn;
-}
-
-//---------------------------------------------------------------------------------------
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
 {
     void* pRet = NULL;
diff --git a/connectivity/source/manager/sdbc.mxp.map b/connectivity/source/manager/sdbc.mxp.map
index 14e33ebafb65..431725adbbec 100644..100755
--- a/connectivity/source/manager/sdbc.mxp.map
+++ b/connectivity/source/manager/sdbc.mxp.map
@@ -1,5 +1,4 @@
 component_getImplementationEnvironment
-component_writeInfo
 component_getFactory
 __mh_dylib_header
 ___builtin_delete
diff --git a/connectivity/source/manager/sdbc2.component b/connectivity/source/manager/sdbc2.component
new file mode 100755
index 000000000000..6cce2b1d9fde
--- /dev/null
+++ b/connectivity/source/manager/sdbc2.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.sdbc.OSDBCDriverManager">
+    <service name="com.sun.star.sdbc.DriverManager"/>
+  </implementation>
+</component>
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 91a12b73f1cd..cff8c5d93fd9 100644..100755
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -32,7 +32,9 @@
 #include "connectivity/PColumn.hxx"
 #include "connectivity/dbtools.hxx"
 #include "TConnection.hxx"
+
 #include <comphelper/types.hxx>
+#include <tools/diagnose_ex.h>
 
 using namespace ::comphelper;
 using namespace connectivity;
@@ -152,7 +154,7 @@ OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSe
         _rxResMetaData->getColumnType( _nColumnPos ),
         _rxResMetaData->isAutoIncrement( _nColumnPos ),
         _rxResMetaData->isCurrency( _nColumnPos ),
-        _rxDBMetaData->storesMixedCaseQuotedIdentifiers()
+        _rxDBMetaData->supportsMixedCaseQuotedIdentifiers()
     );
     pColumn->setTableName(  ::dbtools::composeTableName( _rxDBMetaData,
         _rxResMetaData->getCatalogName( _nColumnPos ),
@@ -190,38 +192,85 @@ void OParseColumn::construct()
 // -----------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper & SAL_CALL OParseColumn::getInfoHelper()
 {
-    OSL_ENSURE( !isNew(), "OParseColumn::OOrderColumn: a *new* OrderColumn?" );
+    OSL_ENSURE( !isNew(), "OParseColumn::getInfoHelper: a *new* ParseColumn?" );
     return *OParseColumn_PROP::getArrayHelper();
 }
+
 // -----------------------------------------------------------------------------
-OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn
-                                     ,sal_Bool  _bCase
-                                     ,sal_Bool _bAscending)
-    : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))
-                                ,   getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
-                                ,   getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)))
-                                ,   getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION)))
-                                ,   getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))
-                                ,   getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))
-                                ,   getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))
-                                ,   getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))
-                                ,   getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)))
-                                ,   sal_False
-                                ,   getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)))
-                                ,   _bCase
-                                )
-    , m_bAscending(_bAscending)
+namespace
+{
+    ::rtl::OUString lcl_getColumnTableName( const Reference< XPropertySet >& i_parseColumn )
+    {
+        ::rtl::OUString sColumnTableName;
+        try
+        {
+            OSL_VERIFY( i_parseColumn->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_TABLENAME ) ) >>= sColumnTableName );
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return sColumnTableName;
+    }
+}
+
+// -----------------------------------------------------------------------------
+OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, const ::rtl::OUString& i_rOriginatingTableName,
+                            sal_Bool    _bCase, sal_Bool _bAscending )
+    : connectivity::sdbcx::OColumn(
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))),
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))),
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))),
+        getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))),
+        sal_False,
+        getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))),
+        _bCase
+    )
+    ,m_bAscending(_bAscending)
+    ,m_sTableName( i_rOriginatingTableName )
 {
     construct();
 }
+
+// -----------------------------------------------------------------------------
+OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, sal_Bool _bCase, sal_Bool _bAscending )
+    : connectivity::sdbcx::OColumn(
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))),
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE))),
+        getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))),
+        getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))),
+        getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))),
+        sal_False,
+        getBOOL(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))),
+        _bCase
+    )
+    ,m_bAscending(_bAscending)
+    ,m_sTableName( lcl_getColumnTableName( _xColumn ) )
+{
+    construct();
+}
+
 // -------------------------------------------------------------------------
 OOrderColumn::~OOrderColumn()
 {
 }
+
 // -------------------------------------------------------------------------
 void OOrderColumn::construct()
 {
-    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING),PROPERTY_ID_ISASCENDING,0,&m_bAscending,     ::getCppuType(reinterpret_cast< sal_Bool*>(NULL)));
+    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING,
+        PropertyAttribute::READONLY,  const_cast< sal_Bool* >( &m_bAscending ),    ::getCppuType( reinterpret_cast< sal_Bool* >( NULL ) ) );
+    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME),   PROPERTY_ID_TABLENAME,
+        PropertyAttribute::READONLY,  const_cast< ::rtl::OUString* >( &m_sTableName ),  ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
 }
 // -----------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper() const
@@ -231,17 +280,14 @@ void OOrderColumn::construct()
 // -----------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper & SAL_CALL OOrderColumn::getInfoHelper()
 {
-    OSL_ENSURE( !isNew(), "OOrderColumn::OOrderColumn: a *new* OrderColumn?" );
+    OSL_ENSURE( !isNew(), "OOrderColumn::getInfoHelper: a *new* OrderColumn?" );
     return *OOrderColumn_PROP::getArrayHelper();
 }
 // -----------------------------------------------------------------------------
 ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OOrderColumn::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);
-    if ( m_bOrder )
-        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OrderColumn"));
-    else
-        aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.GroupColumn"));
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.OrderColumn"));
 
     return aSupported;
 }
diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx
index db1f1585b7b7..db1f1585b7b7 100644..100755
--- a/connectivity/source/parse/internalnode.cxx
+++ b/connectivity/source/parse/internalnode.cxx
diff --git a/connectivity/source/parse/makefile.mk b/connectivity/source/parse/makefile.mk
index 510fbb2fc28e..510fbb2fc28e 100644..100755
--- a/connectivity/source/parse/makefile.mk
+++ b/connectivity/source/parse/makefile.mk
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index dbfbd7ad1322..dbfbd7ad1322 100644..100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l
index c959230c0da9..c959230c0da9 100644..100755
--- a/connectivity/source/parse/sqlflex.l
+++ b/connectivity/source/parse/sqlflex.l
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 1f8ef88242d2..59c7287fcdd8 100644..100755
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -94,7 +94,7 @@ namespace connectivity
             OSL_PRECOND( m_xConnection.is(), "OSQLParseTreeIteratorImpl::OSQLParseTreeIteratorImpl: invalid connection!" );
             m_xDatabaseMetaData = m_xConnection->getMetaData();
 
-            m_bIsCaseSensitive = m_xDatabaseMetaData.is() && m_xDatabaseMetaData->storesMixedCaseQuotedIdentifiers();
+            m_bIsCaseSensitive = m_xDatabaseMetaData.is() && m_xDatabaseMetaData->supportsMixedCaseQuotedIdentifiers();
             m_pTables.reset( new OSQLTables( m_bIsCaseSensitive ) );
             m_pSubTables.reset( new OSQLTables( m_bIsCaseSensitive ) );
 
@@ -1911,12 +1911,12 @@ void OSQLParseTreeIterator::setOrderByColumnName(const ::rtl::OUString & rColumn
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "parse", "Ocke.Janssen@sun.com", "OSQLParseTreeIterator::setOrderByColumnName" );
     Reference<XPropertySet> xColumn = findColumn( rColumnName, rTableRange, false );
     if ( xColumn.is() )
-        m_aOrderColumns->get().push_back(new OOrderColumn(xColumn,isCaseSensitive(),bAscending));
+        m_aOrderColumns->get().push_back(new OOrderColumn( xColumn, rTableRange, isCaseSensitive(), bAscending ) );
     else
     {
         sal_Int32 nId = rColumnName.toInt32();
         if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->get().size()) )
-            m_aOrderColumns->get().push_back(new OOrderColumn((m_aSelectColumns->get())[nId-1],isCaseSensitive(),bAscending));
+            m_aOrderColumns->get().push_back( new OOrderColumn( ( m_aSelectColumns->get() )[nId-1], isCaseSensitive(), bAscending ) );
     }
 
 #ifdef SQL_TEST_PARSETREEITERATOR
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index c69017e0744b..c69017e0744b 100644..100755
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
diff --git a/connectivity/source/parse/wrap_sqlbison.cxx b/connectivity/source/parse/wrap_sqlbison.cxx
index e58391867233..e58391867233 100644..100755
--- a/connectivity/source/parse/wrap_sqlbison.cxx
+++ b/connectivity/source/parse/wrap_sqlbison.cxx
diff --git a/connectivity/source/parse/wrap_sqlflex.cxx b/connectivity/source/parse/wrap_sqlflex.cxx
index a423977f61d3..a423977f61d3 100644..100755
--- a/connectivity/source/parse/wrap_sqlflex.cxx
+++ b/connectivity/source/parse/wrap_sqlflex.cxx
diff --git a/connectivity/source/resource/conn_error_message.src b/connectivity/source/resource/conn_error_message.src
index 7a5267f33058..7a5267f33058 100644..100755
--- a/connectivity/source/resource/conn_error_message.src
+++ b/connectivity/source/resource/conn_error_message.src
diff --git a/connectivity/source/resource/conn_log_res.src b/connectivity/source/resource/conn_log_res.src
index ea5bb9d00072..ea5bb9d00072 100644..100755
--- a/connectivity/source/resource/conn_log_res.src
+++ b/connectivity/source/resource/conn_log_res.src
diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index db754477ce89..db754477ce89 100644..100755
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
diff --git a/connectivity/source/resource/makefile.mk b/connectivity/source/resource/makefile.mk
index b4944187dc2a..b4944187dc2a 100644..100755
--- a/connectivity/source/resource/makefile.mk
+++ b/connectivity/source/resource/makefile.mk
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 482e3d0f20a5..482e3d0f20a5 100644..100755
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index 8ea37b7cb216..8ea37b7cb216 100644..100755
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index b620f398cc84..b620f398cc84 100644..100755
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index 0d8827f8fc8d..0d8827f8fc8d 100644..100755
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx
index 90a83e6170e8..90a83e6170e8 100644..100755
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index 5c5bfb326ffd..5c5bfb326ffd 100644..100755
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index 3326952d231d..3326952d231d 100644..100755
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index ac75c14ef778..ac75c14ef778 100644..100755
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index a6ae492de35b..a6ae492de35b 100644..100755
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 5a8baf11f62c..5a8baf11f62c 100644..100755
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index 4f12f0daa4e1..4f12f0daa4e1 100644..100755
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index 7bcdd52f8541..7bcdd52f8541 100644..100755
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index 2f92e2fb55b4..2f92e2fb55b4 100644..100755
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
diff --git a/connectivity/source/sdbcx/makefile.mk b/connectivity/source/sdbcx/makefile.mk
index c036e83db58b..c036e83db58b 100644..100755
--- a/connectivity/source/sdbcx/makefile.mk
+++ b/connectivity/source/sdbcx/makefile.mk
diff --git a/connectivity/source/simpledbt/charset_s.cxx b/connectivity/source/simpledbt/charset_s.cxx
index 7cd445072cae..7cd445072cae 100644..100755
--- a/connectivity/source/simpledbt/charset_s.cxx
+++ b/connectivity/source/simpledbt/charset_s.cxx
diff --git a/connectivity/source/simpledbt/charset_s.hxx b/connectivity/source/simpledbt/charset_s.hxx
index aaafb15fdcc8..aaafb15fdcc8 100644..100755
--- a/connectivity/source/simpledbt/charset_s.hxx
+++ b/connectivity/source/simpledbt/charset_s.hxx
diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx
index d3e8f52afb3a..d3e8f52afb3a 100644..100755
--- a/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/connectivity/source/simpledbt/dbtfactory.cxx
diff --git a/connectivity/source/simpledbt/dbtfactory.hxx b/connectivity/source/simpledbt/dbtfactory.hxx
index f08ed57b4daf..f08ed57b4daf 100644..100755
--- a/connectivity/source/simpledbt/dbtfactory.hxx
+++ b/connectivity/source/simpledbt/dbtfactory.hxx
diff --git a/connectivity/source/simpledbt/makefile.mk b/connectivity/source/simpledbt/makefile.mk
index 96bce967d33c..96bce967d33c 100644..100755
--- a/connectivity/source/simpledbt/makefile.mk
+++ b/connectivity/source/simpledbt/makefile.mk
diff --git a/connectivity/source/simpledbt/parsenode_s.cxx b/connectivity/source/simpledbt/parsenode_s.cxx
index 78e01e5e3cd4..78e01e5e3cd4 100644..100755
--- a/connectivity/source/simpledbt/parsenode_s.cxx
+++ b/connectivity/source/simpledbt/parsenode_s.cxx
diff --git a/connectivity/source/simpledbt/parsenode_s.hxx b/connectivity/source/simpledbt/parsenode_s.hxx
index 7459d1d0ceab..7459d1d0ceab 100644..100755
--- a/connectivity/source/simpledbt/parsenode_s.hxx
+++ b/connectivity/source/simpledbt/parsenode_s.hxx
diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx
index 498976a19f6d..498976a19f6d 100644..100755
--- a/connectivity/source/simpledbt/parser_s.cxx
+++ b/connectivity/source/simpledbt/parser_s.cxx
diff --git a/connectivity/source/simpledbt/parser_s.hxx b/connectivity/source/simpledbt/parser_s.hxx
index 1658f7ae0fce..1658f7ae0fce 100644..100755
--- a/connectivity/source/simpledbt/parser_s.hxx
+++ b/connectivity/source/simpledbt/parser_s.hxx
diff --git a/connectivity/source/simpledbt/refbase.cxx b/connectivity/source/simpledbt/refbase.cxx
index d4788bbe6a3e..d4788bbe6a3e 100644..100755
--- a/connectivity/source/simpledbt/refbase.cxx
+++ b/connectivity/source/simpledbt/refbase.cxx
diff --git a/connectivity/source/simpledbt/refbase.hxx b/connectivity/source/simpledbt/refbase.hxx
index 11d2a0d54966..11d2a0d54966 100644..100755
--- a/connectivity/source/simpledbt/refbase.hxx
+++ b/connectivity/source/simpledbt/refbase.hxx
diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx
index 56b211be249e..e6575e8d7560 100644..100755
--- a/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_connectivity.hxx"
 #include <connectivity/virtualdbtools.hxx>
 #include "staticdbtools_s.hxx"
-#include <connectivity/dbconversion.hxx>
+#include "connectivity/dbconversion.hxx"
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/sdb/SQLContext.hpp>
 
@@ -62,23 +62,23 @@ namespace connectivity
     }
 
     //----------------------------------------------------------------
-    double ODataAccessStaticTools::getValue(const Reference< XColumn>& _rxVariant, const Date& rNullDate, sal_Int16 nKeyType) const
+    double ODataAccessStaticTools::getValue(const Reference< XColumn>& _rxVariant, const Date& rNullDate ) const
     {
-        return ::dbtools::DBTypeConversion::getValue(_rxVariant, rNullDate, nKeyType);
+        return ::dbtools::DBTypeConversion::getValue( _rxVariant, rNullDate );
     }
 
     //----------------------------------------------------------------
-    ::rtl::OUString ODataAccessStaticTools::getValue(const Reference< XColumn >& _rxColumn, const Reference< XNumberFormatter >& _rxFormatter,
+    ::rtl::OUString ODataAccessStaticTools::getFormattedValue(const Reference< XColumn >& _rxColumn, const Reference< XNumberFormatter >& _rxFormatter,
         const Date& _rNullDate, sal_Int32 _nKey, sal_Int16 _nKeyType) const
     {
-        return ::dbtools::DBTypeConversion::getValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType);
+        return ::dbtools::DBTypeConversion::getFormattedValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType);
     }
 
     //----------------------------------------------------------------
-    ::rtl::OUString ODataAccessStaticTools::getValue( const Reference< XPropertySet>& _rxColumn, const Reference< XNumberFormatter>& _rxFormatter,
+    ::rtl::OUString ODataAccessStaticTools::getFormattedValue( const Reference< XPropertySet>& _rxColumn, const Reference< XNumberFormatter>& _rxFormatter,
         const Locale& _rLocale, const Date& _rNullDate ) const
     {
-        return ::dbtools::DBTypeConversion::getValue( _rxColumn, _rxFormatter, _rLocale, _rNullDate );
+        return ::dbtools::DBTypeConversion::getFormattedValue( _rxColumn, _rxFormatter, _rLocale, _rNullDate );
     }
 
     //----------------------------------------------------------------
diff --git a/connectivity/source/simpledbt/staticdbtools_s.hxx b/connectivity/source/simpledbt/staticdbtools_s.hxx
index 497893b7cd63..c5fbf32aa310 100644..100755
--- a/connectivity/source/simpledbt/staticdbtools_s.hxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.hxx
@@ -55,11 +55,10 @@ namespace connectivity
         // ------------------------------------------------
         virtual double getValue(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant,
-            const ::com::sun::star::util::Date& rNullDate,
-            sal_Int16 nKeyType) const;
+            const ::com::sun::star::util::Date& rNullDate ) const;
 
         // ------------------------------------------------
-        virtual ::rtl::OUString getValue(
+        virtual ::rtl::OUString getFormattedValue(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn,
             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
             const ::com::sun::star::util::Date& _rNullDate,
@@ -67,7 +66,7 @@ namespace connectivity
             sal_Int16 _nKeyType) const;
 
         // ------------------------------------------------
-        virtual ::rtl::OUString getValue(
+        virtual ::rtl::OUString getFormattedValue(
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn,
             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter,
             const ::com::sun::star::lang::Locale& _rLocale,
author	Jan Holesovsky <kendy@suse.cz>	2011-03-18 15:49:47 +0100
committer	Jan Holesovsky <kendy@suse.cz>	2011-03-18 15:49:47 +0100
commit	091e4aee3386f3bfee081dc8646494e0eb97f88a (patch)
tree	dd79298b4e8729ca7dc874274d4a33ea88fe107d /connectivity/source
parent	f0681adbf092e2b455db52535f2df882bc87343a (diff)
parent	224bd63b3fa459baa0a6bb5cd03f5dc2ca475d82 (diff)