dba33b: merge CWS head with head resulting from pulling DEV300_m67

18 files changed, 514 insertions, 371 deletions

diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx
index bd86e9ce4397..da68443bb68e 100755
--- a/connectivity/inc/connectivity/DriversConfig.hxx
+++ b/connectivity/inc/connectivity/DriversConfig.hxx
@@ -1,92 +1,95 @@
-/*************************************************************************

- *

- *  OpenOffice.org - a multi-platform office productivity suite

- *

- *  $RCSfile: makefile,v $

- *

- *  $Revision: 1.1 $

- *

- *  last change: $Author: st $ $Date: 2000/11/22 02:32:00 $

- *

- *  The Contents of this file are made available subject to

- *  the terms of GNU Lesser General Public License Version 2.1.

- *

- *

- *    GNU Lesser General Public License Version 2.1

- *    =============================================

- *    Copyright 2005 by Sun Microsystems, Inc.

- *    901 San Antonio Road, Palo Alto, CA 94303, USA

- *

- *    This library is free software; you can redistribute it and/or

- *    modify it under the terms of the GNU Lesser General Public

- *    License version 2.1, as published by the Free Software Foundation.

- *

- *    This library 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 for more details.

- *

- *    You should have received a copy of the GNU Lesser General Public

- *    License along with this library; if not, write to the Free Software

- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,

- *    MA  02111-1307  USA

- *

- ************************************************************************/

-#ifndef CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED

-#define CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED

-

-#include <comphelper/stl_types.hxx>

-#include <com/sun/star/lang/XMultiServiceFactory.hpp>

-#include <com/sun/star/beans/NamedValue.hpp>

-#include <com/sun/star/uno/Sequence.h>

-#include "connectivity/dbtoolsdllapi.hxx"

-#include <salhelper/singletonref.hxx>

-#include <comphelper/namedvaluecollection.hxx>

-#include <unotools/confignode.hxx>

-

-namespace connectivity

-{

-    typedef struct

-    {

-        ::comphelper::NamedValueCollection aProperties;

-        ::comphelper::NamedValueCollection aFeatures;

-        ::comphelper::NamedValueCollection aMetaData;

-        ::rtl::OUString sDriverFactory;

-        ::rtl::OUString sDriverTypeDisplayName;

-    } TInstalledDriver;

-    DECLARE_STL_USTRINGACCESS_MAP( TInstalledDriver, TInstalledDrivers);

-

+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: makefile,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: st $ $Date: 2000/11/22 02:32:00 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+#ifndef CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
+#define CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
+
+#include <comphelper/stl_types.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/uno/Sequence.h>
+#include "connectivity/dbtoolsdllapi.hxx"
+#include <salhelper/singletonref.hxx>
+#include <comphelper/namedvaluecollection.hxx>
+#include <unotools/confignode.hxx>
+
+namespace connectivity
+{
+    typedef struct
+    {
+        ::comphelper::NamedValueCollection aProperties;
+        ::comphelper::NamedValueCollection aFeatures;
+        ::comphelper::NamedValueCollection aMetaData;
+        ::rtl::OUString sDriverFactory;
+        ::rtl::OUString sDriverTypeDisplayName;
+    } TInstalledDriver;
+    DECLARE_STL_USTRINGACCESS_MAP( TInstalledDriver, TInstalledDrivers);
+
     class DriversConfigImpl
     {
-        ::utl::OConfigurationTreeRoot m_aInstalled;
+        mutable ::utl::OConfigurationTreeRoot   m_aInstalled;
+        mutable TInstalledDrivers       m_aDrivers;
+        void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const;
     public:
         DriversConfigImpl();
-        void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,TInstalledDrivers& _rDrivers);
-    };

-    //

-    // Allows to access all driver which are located in the configuration

-    //

-    class OOO_DLLPUBLIC_DBTOOLS DriversConfig

-    {

-        typedef salhelper::SingletonRef<DriversConfigImpl> OSharedConfigNode;

-        

-        const ::comphelper::NamedValueCollection& impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const;

-    public:

-        DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);

-        ~DriversConfig();

-

-        DriversConfig( const DriversConfig& );

-        DriversConfig& operator=( const DriversConfig& );

-

-        ::rtl::OUString getDriverFactoryName(const ::rtl::OUString& _sUrl) const;

-        ::rtl::OUString getDriverTypeDisplayName(const ::rtl::OUString& _sUrl) const;

-        const ::comphelper::NamedValueCollection& getProperties(const ::rtl::OUString& _sURL) const;

-        const ::comphelper::NamedValueCollection& getFeatures(const ::rtl::OUString& _sURL) const;

-        const ::comphelper::NamedValueCollection& getMetaData(const ::rtl::OUString& _sURL) const;

-        ::com::sun::star::uno::Sequence< ::rtl::OUString > getURLs() const;

-    private:

-        TInstalledDrivers   m_aDrivers;

-        OSharedConfigNode   m_aNode;

-    };

-}

-#endif // CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED

+
+        const TInstalledDrivers& getInstalledDrivers(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const { Load(_rxORB); return m_aDrivers; }
+    };
+    //
+    // Allows to access all driver which are located in the configuration
+    //
+    class OOO_DLLPUBLIC_DBTOOLS DriversConfig
+    {
+        typedef salhelper::SingletonRef<DriversConfigImpl> OSharedConfigNode;
+
+        const ::comphelper::NamedValueCollection& impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const;
+    public:
+        DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);
+        ~DriversConfig();
+
+        DriversConfig( const DriversConfig& );
+        DriversConfig& operator=( const DriversConfig& );
+
+        ::rtl::OUString getDriverFactoryName(const ::rtl::OUString& _sUrl) const;
+        ::rtl::OUString getDriverTypeDisplayName(const ::rtl::OUString& _sUrl) const;
+        const ::comphelper::NamedValueCollection& getProperties(const ::rtl::OUString& _sURL) const;
+        const ::comphelper::NamedValueCollection& getFeatures(const ::rtl::OUString& _sURL) const;
+        const ::comphelper::NamedValueCollection& getMetaData(const ::rtl::OUString& _sURL) const;
+        ::com::sun::star::uno::Sequence< ::rtl::OUString > getURLs() const;
+    private:
+        OSharedConfigNode   m_aNode;
+        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
+    };
+}
+#endif // CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED
diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index 4196e8d843d9..22a169f4025d 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -44,9 +44,15 @@
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
+#include <com/sun/star/sdb/XColumn.hpp>
 
 namespace connectivity
 {
+    namespace detail
+    {
+        class IValueSource;
+    }
+
     class OOO_DLLPUBLIC_DBTOOLS ORowSetValue
     {
         union
@@ -361,6 +367,12 @@ namespace connectivity
                   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow);
 
         void fill(const ::com::sun::star::uno::Any& _rValue);
+
+        void fill( const sal_Int32 _nType,
+                   const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn );
+
+    private:
+        void impl_fill( const sal_Int32 _nType, sal_Bool _bNullable, const detail::IValueSource& _rValueSource );
     };
 
     /// ORowSetValueDecorator decorates a ORowSetValue so the value is "refcounted"
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index e1a38c71b5fe..4cfab247c10f 100644
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
@@ -188,6 +188,12 @@ namespace dbtools
         /** determines whether in the application UI, empty table folders (aka catalogs/schemas) should be displayed
         */
         bool displayEmptyTableFolders() const;
+
+        /** determines that threads are supported.
+        *
+        * \return <TRUE/> when threads are supported, otherwise <FALSE/>
+        */
+        bool supportsThreads() const;
     };
 
 //........................................................................
diff --git a/connectivity/qa/connectivity/tools/DbaseDatabase.java b/connectivity/qa/connectivity/tools/DbaseDatabase.java
index 9c1d6ea47411..8846c3995f56 100755
--- a/connectivity/qa/connectivity/tools/DbaseDatabase.java
+++ b/connectivity/qa/connectivity/tools/DbaseDatabase.java
@@ -65,7 +65,8 @@ public class DbaseDatabase extends AbstractDatabase
     private void createDBDocument() throws Exception
     {
         final File documentFile = File.createTempFile("dbase", ".odb");
-        documentFile.deleteOnExit();
+        if ( documentFile.exists() )
+            documentFile.delete();
         final File subPath = new File(documentFile.getParent() + File.separator + documentFile.getName().replaceAll(".odb", "") + File.separator );
         subPath.mkdir();
         //subPath.deleteOnExit();
diff --git a/connectivity/qa/connectivity/tools/HsqlDatabase.java b/connectivity/qa/connectivity/tools/HsqlDatabase.java
index 7440d3865bb2..896eed1525e9 100644
--- a/connectivity/qa/connectivity/tools/HsqlDatabase.java
+++ b/connectivity/qa/connectivity/tools/HsqlDatabase.java
@@ -72,7 +72,8 @@ public class HsqlDatabase extends AbstractDatabase
     private void createDBDocument() throws Exception
     {
         final File documentFile = File.createTempFile("testdb", ".odb");
-        documentFile.deleteOnExit();
+        if ( documentFile.exists() )
+            documentFile.delete();
         m_databaseDocumentFile = URLHelper.getFileURLFromSystemPath(documentFile);
 
         m_databaseDocument = (XOfficeDatabaseDocument) UnoRuntime.queryInterface(
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index a72816d6427b..30c822b6f169 100755
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -112,32 +112,35 @@ DriversConfigImpl::DriversConfigImpl()
 {
 }
 // -----------------------------------------------------------------------------
-void DriversConfigImpl::Load(const uno::Reference< lang::XMultiServiceFactory >& _rxORB,TInstalledDrivers& _rDrivers)
+void DriversConfigImpl::Load(const uno::Reference< lang::XMultiServiceFactory >& _rxORB) const
 {
-    if ( !m_aInstalled.isValid() )
+    if ( m_aDrivers.empty() )
     {
-        static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess.Drivers/Installed")); ///Installed
-        m_aInstalled = ::utl::OConfigurationTreeRoot::createWithServiceFactory(_rxORB, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
-    }
-
-    if ( m_aInstalled.isValid() )
-    {
-        const uno::Sequence< ::rtl::OUString > aURLPatterns = m_aInstalled.getNodeNames();
-        const ::rtl::OUString* pPatternIter = aURLPatterns.getConstArray();
-        const ::rtl::OUString* pPatternEnd  = pPatternIter + aURLPatterns.getLength();
-        for (;pPatternIter != pPatternEnd ; ++pPatternIter)
+        if ( !m_aInstalled.isValid() )
         {
-            TInstalledDriver aInstalledDriver;
-            lcl_readURLPatternNode(m_aInstalled,*pPatternIter,aInstalledDriver);
-            if ( aInstalledDriver.sDriverFactory.getLength() )
-                _rDrivers.insert(TInstalledDrivers::value_type(*pPatternIter,aInstalledDriver));
+            static const ::rtl::OUString s_sNodeName(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.DataAccess.Drivers/Installed")); ///Installed
+            m_aInstalled = ::utl::OConfigurationTreeRoot::createWithServiceFactory(_rxORB, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
         }
+
+        if ( m_aInstalled.isValid() )
+        {
+            const uno::Sequence< ::rtl::OUString > aURLPatterns = m_aInstalled.getNodeNames();
+            const ::rtl::OUString* pPatternIter = aURLPatterns.getConstArray();
+            const ::rtl::OUString* pPatternEnd  = pPatternIter + aURLPatterns.getLength();
+            for (;pPatternIter != pPatternEnd ; ++pPatternIter)
+            {
+                TInstalledDriver aInstalledDriver;
+                lcl_readURLPatternNode(m_aInstalled,*pPatternIter,aInstalledDriver);
+                if ( aInstalledDriver.sDriverFactory.getLength() )
+                    m_aDrivers.insert(TInstalledDrivers::value_type(*pPatternIter,aInstalledDriver));
+            }
+        } // if ( m_aInstalled.isValid() )
     }
 }
 // -----------------------------------------------------------------------------
 DriversConfig::DriversConfig(const uno::Reference< lang::XMultiServiceFactory >& _rxORB)
+:m_xORB(_rxORB)
 {
-    m_aNode->Load(_rxORB,m_aDrivers);
 }
 
 // -----------------------------------------------------------------------------
@@ -156,7 +159,6 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
 {

     if ( this != &_rhs )

     {

-        m_aDrivers = _rhs.m_aDrivers;

         m_aNode = _rhs.m_aNode;

     }

     return *this;

@@ -165,10 +167,11 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
 // -----------------------------------------------------------------------------
 ::rtl::OUString DriversConfig::getDriverFactoryName(const ::rtl::OUString& _sURL) const
 {
+    const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
     ::rtl::OUString sRet;
     ::rtl::OUString sOldPattern;
-    TInstalledDrivers::const_iterator aIter = m_aDrivers.begin();
-    TInstalledDrivers::const_iterator aEnd = m_aDrivers.end();
+    TInstalledDrivers::const_iterator aIter = rDrivers.begin();
+    TInstalledDrivers::const_iterator aEnd = rDrivers.end();
     for(;aIter != aEnd;++aIter)
     {
         WildCard aWildCard(aIter->first);
@@ -184,10 +187,11 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
 // -----------------------------------------------------------------------------
 ::rtl::OUString DriversConfig::getDriverTypeDisplayName(const ::rtl::OUString& _sURL) const
 {
+    const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
     ::rtl::OUString sRet;
     ::rtl::OUString sOldPattern;
-    TInstalledDrivers::const_iterator aIter = m_aDrivers.begin();
-    TInstalledDrivers::const_iterator aEnd = m_aDrivers.end();
+    TInstalledDrivers::const_iterator aIter = rDrivers.begin();
+    TInstalledDrivers::const_iterator aEnd = rDrivers.end();
     for(;aIter != aEnd;++aIter)
     {
         WildCard aWildCard(aIter->first);
@@ -218,10 +222,11 @@ const ::comphelper::NamedValueCollection& DriversConfig::getMetaData(const ::rtl
 // -----------------------------------------------------------------------------
 const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const
 {
+    const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
     const ::comphelper::NamedValueCollection* pRet = NULL;
     ::rtl::OUString sOldPattern;
-    TInstalledDrivers::const_iterator aIter = m_aDrivers.begin();
-    TInstalledDrivers::const_iterator aEnd = m_aDrivers.end();
+    TInstalledDrivers::const_iterator aIter = rDrivers.begin();
+    TInstalledDrivers::const_iterator aEnd = rDrivers.end();
     for(;aIter != aEnd;++aIter)
     {
         WildCard aWildCard(aIter->first);
@@ -252,10 +257,11 @@ const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const ::rtl::O
 // -----------------------------------------------------------------------------
 uno::Sequence< ::rtl::OUString > DriversConfig::getURLs() const
 {
-    uno::Sequence< ::rtl::OUString > aRet(m_aDrivers.size());
+    const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
+    uno::Sequence< ::rtl::OUString > aRet(rDrivers.size());
     ::rtl::OUString* pIter = aRet.getArray();
-    TInstalledDrivers::const_iterator aIter = m_aDrivers.begin();
-    TInstalledDrivers::const_iterator aEnd = m_aDrivers.end();
+    TInstalledDrivers::const_iterator aIter = rDrivers.begin();
+    TInstalledDrivers::const_iterator aEnd = rDrivers.end();
     for(;aIter != aEnd;++aIter,++pIter)
     {
         *pIter = aIter->first;
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index b2cbc42ed2ff..7f6a8d0f5d03 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -40,13 +40,16 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/logfile.hxx>
 
-using namespace connectivity;
-using namespace dbtools;
+using namespace ::dbtools;
 using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::io;
 
+namespace connectivity
+{
+
 namespace {
     static sal_Bool isStorageCompatible(sal_Int32 _eType1, sal_Int32 _eType2)
     {
@@ -1897,6 +1900,113 @@ void ORowSetValue::setSigned(sal_Bool _bMod)
         }
     }
 }
+
+// -----------------------------------------------------------------------------
+namespace detail
+{
+    class SAL_NO_VTABLE IValueSource
+    {
+    public:
+        virtual ::rtl::OUString             getString() const = 0;
+        virtual sal_Bool                    getBoolean() const = 0;
+        virtual sal_Int8                    getByte() const = 0;
+        virtual sal_Int16                   getShort() const = 0;
+        virtual sal_Int32                   getInt() const = 0;
+        virtual sal_Int64                   getLong() const = 0;
+        virtual float                       getFloat() const = 0;
+        virtual double                      getDouble() const = 0;
+        virtual Date                        getDate() const = 0;
+        virtual Time                        getTime() const = 0;
+        virtual DateTime                    getTimestamp() const = 0;
+        virtual Sequence< sal_Int8 >        getBytes() const = 0;
+        virtual Reference< XInputStream >   getBinaryStream() const = 0;
+        virtual Reference< XInputStream >   getCharacterStream() const = 0;
+        virtual Reference< XBlob >          getBlob() const = 0;
+        virtual Reference< XClob >          getClob() const = 0;
+        virtual sal_Bool                    wasNull() const = 0;
+
+        virtual ~IValueSource() { }
+    };
+
+    class RowValue : public IValueSource
+    {
+    public:
+        RowValue( const Reference< XRow >& _xRow, const sal_Int32 _nPos )
+            :m_xRow( _xRow )
+            ,m_nPos( _nPos )
+        {
+        }
+
+        // IValueSource
+        virtual ::rtl::OUString             getString() const           { return m_xRow->getString( m_nPos ); };
+        virtual sal_Bool                    getBoolean() const          { return m_xRow->getBoolean( m_nPos ); };
+        virtual sal_Int8                    getByte() const             { return m_xRow->getByte( m_nPos ); };
+        virtual sal_Int16                   getShort() const            { return m_xRow->getShort( m_nPos ); }
+        virtual sal_Int32                   getInt() const              { return m_xRow->getInt( m_nPos ); }
+        virtual sal_Int64                   getLong() const             { return m_xRow->getLong( m_nPos ); }
+        virtual float                       getFloat() const            { return m_xRow->getFloat( m_nPos ); };
+        virtual double                      getDouble() const           { return m_xRow->getDouble( m_nPos ); };
+        virtual Date                        getDate() const             { return m_xRow->getDate( m_nPos ); };
+        virtual Time                        getTime() const             { return m_xRow->getTime( m_nPos ); };
+        virtual DateTime                    getTimestamp() const        { return m_xRow->getTimestamp( m_nPos ); };
+        virtual Sequence< sal_Int8 >        getBytes() const            { return m_xRow->getBytes( m_nPos ); };
+        virtual Reference< XInputStream >   getBinaryStream() const     { return m_xRow->getBinaryStream( m_nPos ); };
+        virtual Reference< XInputStream >   getCharacterStream() const  { return m_xRow->getCharacterStream( m_nPos ); };
+        virtual Reference< XBlob >          getBlob() const             { return m_xRow->getBlob( m_nPos ); };
+        virtual Reference< XClob >          getClob() const             { return m_xRow->getClob( m_nPos ); };
+        virtual sal_Bool                    wasNull() const             { return m_xRow->wasNull( ); };
+
+    private:
+        const Reference< XRow > m_xRow;
+        const sal_Int32         m_nPos;
+    };
+
+    class ColumnValue : public IValueSource
+    {
+    public:
+        ColumnValue( const Reference< XColumn >& _rxColumn )
+            :m_xColumn( _rxColumn )
+        {
+        }
+
+        // IValueSource
+        virtual ::rtl::OUString             getString() const           { return m_xColumn->getString(); };
+        virtual sal_Bool                    getBoolean() const          { return m_xColumn->getBoolean(); };
+        virtual sal_Int8                    getByte() const             { return m_xColumn->getByte(); };
+        virtual sal_Int16                   getShort() const            { return m_xColumn->getShort(); }
+        virtual sal_Int32                   getInt() const              { return m_xColumn->getInt(); }
+        virtual sal_Int64                   getLong() const             { return m_xColumn->getLong(); }
+        virtual float                       getFloat() const            { return m_xColumn->getFloat(); };
+        virtual double                      getDouble() const           { return m_xColumn->getDouble(); };
+        virtual Date                        getDate() const             { return m_xColumn->getDate(); };
+        virtual Time                        getTime() const             { return m_xColumn->getTime(); };
+        virtual DateTime                    getTimestamp() const        { return m_xColumn->getTimestamp(); };
+        virtual Sequence< sal_Int8 >        getBytes() const            { return m_xColumn->getBytes(); };
+        virtual Reference< XInputStream >   getBinaryStream() const     { return m_xColumn->getBinaryStream(); };
+        virtual Reference< XInputStream >   getCharacterStream() const  { return m_xColumn->getCharacterStream(); };
+        virtual Reference< XBlob >          getBlob() const             { return m_xColumn->getBlob(); };
+        virtual Reference< XClob >          getClob() const             { return m_xColumn->getClob(); };
+        virtual sal_Bool                    wasNull() const             { return m_xColumn->wasNull(); };
+
+    private:
+        const Reference< XColumn >  m_xColumn;
+    };
+}
+
+// -----------------------------------------------------------------------------
+void ORowSetValue::fill( const sal_Int32 _nType, const Reference< XColumn >& _rxColumn )
+{
+    detail::ColumnValue aColumnValue( _rxColumn );
+    impl_fill( _nType, sal_True, aColumnValue );
+}
+
+// -----------------------------------------------------------------------------
+void ORowSetValue::fill( sal_Int32 _nPos, sal_Int32 _nType, sal_Bool  _bNullable, const Reference< XRow>& _xRow )
+{
+    detail::RowValue aRowValue( _xRow, _nPos );
+    impl_fill( _nType, _bNullable, aRowValue );
+}
+
 // -----------------------------------------------------------------------------
 void ORowSetValue::fill(sal_Int32 _nPos,
                      sal_Int32 _nType,
@@ -1907,10 +2017,8 @@ void ORowSetValue::fill(sal_Int32 _nPos,
 }
 
 // -----------------------------------------------------------------------------
-void ORowSetValue::fill(sal_Int32 _nPos,
-                     sal_Int32 _nType,
-                     sal_Bool  _bNullable,
-                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow)
+void ORowSetValue::impl_fill( const sal_Int32 _nType, sal_Bool _bNullable, const detail::IValueSource& _rValueSource )
+
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::fill (2)" );
     sal_Bool bReadData = sal_True;
@@ -1921,63 +2029,63 @@ void ORowSetValue::fill(sal_Int32 _nPos,
     case DataType::DECIMAL:
     case DataType::NUMERIC:
     case DataType::LONGVARCHAR:
-        (*this) = _xRow->getString(_nPos);
+        (*this) = _rValueSource.getString();
         break;
     case DataType::BIGINT:
         if ( isSigned() )
-            (*this) = _xRow->getLong(_nPos);
+            (*this) = _rValueSource.getLong();
         else
-            (*this) = _xRow->getString(_nPos);
+            (*this) = _rValueSource.getString();
         break;
     case DataType::FLOAT:
-        (*this) = _xRow->getFloat(_nPos);
+        (*this) = _rValueSource.getFloat();
         break;
     case DataType::DOUBLE:
     case DataType::REAL:
-        (*this) = _xRow->getDouble(_nPos);
+        (*this) = _rValueSource.getDouble();
         break;
     case DataType::DATE:
-        (*this) = _xRow->getDate(_nPos);
+        (*this) = _rValueSource.getDate();
         break;
     case DataType::TIME:
-        (*this) = _xRow->getTime(_nPos);
+        (*this) = _rValueSource.getTime();
         break;
     case DataType::TIMESTAMP:
-        (*this) = _xRow->getTimestamp(_nPos);
+        (*this) = _rValueSource.getTimestamp();
         break;
     case DataType::BINARY:
     case DataType::VARBINARY:
     case DataType::LONGVARBINARY:
-        (*this) = _xRow->getBytes(_nPos);
+        (*this) = _rValueSource.getBytes();
         break;
     case DataType::BIT:
     case DataType::BOOLEAN:
-        (*this) = _xRow->getBoolean(_nPos);
+        (*this) = _rValueSource.getBoolean();
         break;
     case DataType::TINYINT:
         if ( isSigned() )
-            (*this) = _xRow->getByte(_nPos);
+            (*this) = _rValueSource.getByte();
         else
-            (*this) = _xRow->getShort(_nPos);
+            (*this) = _rValueSource.getShort();
         break;
     case DataType::SMALLINT:
         if ( isSigned() )
-            (*this) = _xRow->getShort(_nPos);
+            (*this) = _rValueSource.getShort();
         else
-            (*this) = _xRow->getInt(_nPos);
+            (*this) = _rValueSource.getInt();
         break;
     case DataType::INTEGER:
         if ( isSigned() )
-            (*this) = _xRow->getInt(_nPos);
+            (*this) = _rValueSource.getInt();
         else
-            (*this) = _xRow->getLong(_nPos);
+            (*this) = _rValueSource.getLong();
         break;
     case DataType::CLOB:
-        (*this) = ::com::sun::star::uno::makeAny(_xRow->getClob(_nPos));
+        (*this) = ::com::sun::star::uno::makeAny(_rValueSource.getClob());
         setTypeKind(DataType::CLOB);
         break;
     case DataType::BLOB:
-        (*this) = ::com::sun::star::uno::makeAny(_xRow->getBlob(_nPos));
+        (*this) = ::com::sun::star::uno::makeAny(_rValueSource.getBlob());
         setTypeKind(DataType::BLOB);
         break;
     case DataType::OTHER:
@@ -1989,7 +2097,7 @@ void ORowSetValue::fill(sal_Int32 _nPos,
         bReadData = false;
         break;
     }
-    if ( bReadData && _bNullable && _xRow->wasNull() )
+    if ( bReadData && _bNullable && _rValueSource.wasNull() )
         setNull();
     setTypeKind(_nType);
 }
@@ -2158,3 +2266,5 @@ void ORowSetValue::fill(const Any& _rValue)
             break;
     }
 }
+
+}   // namespace connectivity
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index b3cbb4ae67c7..4c3f3db8b754 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -145,6 +145,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQ
                 }
             }
 
+            ::connectivity::ODatabaseMetaDataResultSet::ORows aTypeInfoRows;
             while( xRet->next() )
             {
                 ::connectivity::ODatabaseMetaDataResultSet::ORow aRow;
@@ -169,8 +170,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQ
                     else
                         ++aIter;
                 }
-                m_aTypeInfoRows.push_back(aRow);
+                aTypeInfoRows.push_back(aRow);
             }
+            m_aTypeInfoRows = aTypeInfoRows;
         }
     }
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index d148e5ca5a72..d30161da497c 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -428,6 +428,22 @@ namespace dbtools
 #endif
         return doDisplay;
     }
+    //--------------------------------------------------------------------
+    bool DatabaseMetaData::supportsThreads() const
+    {
+        bool bSupported( true );
+        try
+        {
+            Reference< XDatabaseMetaData > xMeta( m_pImpl->xConnectionMetaData, UNO_SET_THROW );
+            ::rtl::OUString sConnectionURL( xMeta->getURL() );
+            bSupported = sConnectionURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "sdbc:mysql:mysqlc" ) ) != 0;
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return bSupported;
+    }
 
 //........................................................................
 } // namespace dbtools
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index abd2d3b51e44..765c42eeeae2 100644
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -152,7 +152,6 @@ namespace connectivity
                         // Vorzeitiger Abbruch der Schleife moeglich, denn
                         // wir haben, was wir wollten.
                         nStartPos = i+1;
-                        *pData = 0;
                         break;
                     }
                     else
@@ -161,6 +160,7 @@ namespace connectivity
                     }
                 }
             } // for( xub_StrLen i = nStartPos; i < nLen; ++i )
+            *pData = 0;
             _rStr.ReleaseBufferAccess(xub_StrLen(pData - pStart));
         }
     }
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 1e80a96cf682..7e97d27e1d86 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -55,6 +55,7 @@
 #include <connectivity/dbexception.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <unotools/confignode.hxx>
+#include <unotools/ucbstreamhelper.hxx>
 #include "resource/hsqldb_res.hrc"
 #include "resource/sharedresources.hxx"
 
@@ -70,6 +71,8 @@ namespace connectivity
     using namespace ::com::sun::star::frame;
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::embed;
+    using namespace ::com::sun::star::io;
+    using namespace ::com::sun::star::task;
     using namespace ::com::sun::star::reflection;
 
     namespace hsqldb
@@ -260,6 +263,50 @@ namespace connectivity
                 );
                 aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) );
 
+                const ::rtl::OUString sProperties( RTL_CONSTASCII_USTRINGPARAM( "properties" ) );
+                ::rtl::OUString sMessage;
+                try
+                {
+                    if ( !bIsNewDatabase && xStorage->isStreamElement(sProperties) )
+                    {
+                        Reference<XStream > xStream = xStorage->openStreamElement(sProperties,ElementModes::READ);
+                        if ( xStream.is() )
+                        {
+                            ::std::auto_ptr<SvStream> pStream( ::utl::UcbStreamHelper::CreateStream(xStream) );
+                            if ( pStream.get() )
+                            {
+                                ByteString sLine;
+                                while ( pStream->ReadLine(sLine) )
+                                {
+                                    if ( sLine.Equals("version=",0,sizeof("version=")-1) )
+                                    {
+                                        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 ) )
+                                        {
+                                            ::connectivity::SharedResources aResources;
+                                            sMessage = aResources.getResourceString(STR_ERROR_NEW_VERSION);
+                                        }
+                                        break;
+                                    }
+                                }
+                            }
+                        } // if ( xStream.is() )
+                        ::comphelper::disposeComponent(xStream);
+                    }
+                }
+                catch(Exception&)
+                {
+                }
+                if ( sMessage.getLength() )
+                {
+                    ::dbtools::throwGenericSQLException(sMessage ,*this);
+                }
+
                 // readonly?
                 Reference<XPropertySet> xProp(xStorage,UNO_QUERY);
                 if ( xProp.is() )
diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk
index 9ed5acb17d4c..c61e4b297ba4 100644
--- a/connectivity/source/drivers/hsqldb/makefile.mk
+++ b/connectivity/source/drivers/hsqldb/makefile.mk
@@ -102,6 +102,7 @@ SHL1STDLIBS=\
     $(DBTOOLSLIB)				\
     $(JVMFWKLIB)				\
     $(COMPHELPERLIB)            \
+    $(TOOLSLIB)            		\
     $(UNOTOOLSLIB)
 
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
index 9b4b05868cd2..00f76ddeb8fd 100644
--- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk
+++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk
@@ -30,37 +30,35 @@
 #*************************************************************************
 CALL_CDECL=TRUE
 
-#mozilla specific stuff.
-MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
-MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
-#End of mozilla specific stuff.
-
 PRJ=..$/..$/..$/..
 PRJINC=..$/..$/..
 PRJNAME=connectivity
 TARGET=mozbootstrap
 
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
 .IF "$(OS)" == "OS2"
 all: 
     @echo "    Not building under OS/2"
 .ENDIF
 
 # --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
 
+USE_DEFFILE=TRUE
+ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
+
+# --- begin of mozilla specific stuff
+MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
+MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
+# --- end of mozilla specific stuff
 
 .INCLUDE : settings.mk
 
 .INCLUDE :  $(PRJ)$/version.mk
 
+.INCLUDE : ../makefile_mozab.mk
+
+INCPRE += -I../mozillasrc
 
-#mozilla specific stuff.
 # --- Files -------------------------------------
 
 SLOFILES += \
@@ -93,95 +91,6 @@ SLOFILES += \
     $(SLO)$/MNSProfileDirServiceProvider.obj
 .ENDIF
 
-CDEFS     += -DMOZILLA_INTERNAL_API
-
-.IF "$(GUI)"=="UNX"
-.IF "$(COMNAME)"=="sunpro5"
-CFLAGS += -features=tmplife
-#This flag is needed to build mozilla 1.7 code
-.ENDIF		# "$(COMNAME)"=="sunpro5"
-.ENDIF
-
-MOZINC = . -I.. -I..$/mozillasrc -I$(MOZ_INC)  -I$(MOZ_INC)$/nspr -I$(MOZ_INC)$/xpcom \
-        -I$(MOZ_INC)$/string -I$(MOZ_INC)$/rdf -I$(MOZ_INC)$/msgbase \
-        -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
-        -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
-        -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
-        -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/uconv\
-        -I$(MOZ_INC)$/xpcom_obsolete -I$(MOZ_INC)$/content
-        
-.IF "$(GUI)" == "WNT"
-.IF "$(COM)" == "GCC"
-INCPOST += $(MOZINC)
-CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
-        -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-            -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-            -DNS_MT_SUPPORTED -DNETLIB_THREAD \
-            -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
-        -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
-        -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
-        -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL
-CFLAGSCXX += \
-            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-            -Wcast-align -Woverloaded-virtual -Wsynth \
-            -Wno-long-long
-.ELSE
-.IF "$(DBG_LEVEL)" == "0"
-INCPRE += $(MOZINC)
-CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
-        -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-            -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-            -DDMSVC4 -DNS_MT_SUPPORTED -DNETLIB_THREAD \
-            -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
-        -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
-        -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
-        -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL	\
-        -UDEBUG
-CFLAGS +=   -GR- -W3 -Gy -MD -UDEBUG
-.ELSE
-INCPRE += $(MOZINC)
-CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
-        -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-            -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-            -DDMSVC4 -DDEVELOPER_DEBUG -DNS_MT_SUPPORTED -DNETLIB_THREAD \
-            -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
-        -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
-        -DDEBUG_Administrator -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
-        -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL	\
-        -UDEBUG
-CFLAGS +=   -Zi -GR- -W3 -Gy -MDd -UDEBUG
-.IF "$(CCNUMVER)" >= "001399999999"
-CDEFS  +=   -D_STL_NOFORCE_MANIFEST
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-.IF "$(GUI)" == "UNX"
-INCPOST += $(MOZINC)
-CDEFS+=	    -DMOZILLA_CLIENT \
-            -DXP_UNIX
-.IF "$(OS)" == "LINUX"
-CFLAGS +=   -fPIC -g
-CDEFS+=     -DOJI
-
-CFLAGSCXX += \
-            -fno-rtti -Wconversion -Wpointer-arith \
-            -Wcast-align -Woverloaded-virtual -Wsynth \
-            -Wno-long-long -pthread
-CDEFS     += -DTRACING
-.ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
-CFLAGS +=   -fPIC
-CFLAGSCXX += \
-            -fno-rtti -Wconversion -Wpointer-arith \
-            -Wcast-align -Woverloaded-virtual -Wsynth \
-            -Wno-long-long -Wno-deprecated
-CDEFS     += -DTRACING
-.ENDIF
-
-SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
-
-.ENDIF # MACOSX
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 677e605096c4..76161dc32119 100644
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -43,38 +43,28 @@ all:
     @echo "    see http://www.mozilla.org/issues/show_bug.cgi?id=91209"
 .ENDIF
 
-#mozilla specific stuff.
+# --- begin of mozilla specific stuff
 MOZ_LIB=$(SOLARVERSION)$/$(INPATH)$/lib$(UPDMINOREXT)
 MOZ_INC=$(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla
 
 .IF "$(OS)"=="WNT" 
-.IF "$(USE_SHELL)"=="4nt"
-MOZ_EMBED_LIB := $(shell @+-dir /ba:f $(MOZ_LIB)$/embed_base_s.lib 2>NUL )
-MOZ_REG_LIB	  := $(shell @+-dir /ba:f $(MOZ_LIB)$/mozreg_s.lib 2>NUL )
-.ELSE	#"$(USE_SHELL)"=="4nt"
-MOZ_EMBED_LIB := $(shell @-test -f $(MOZ_LIB)$/embed_base_s.lib && echo $(MOZ_LIB)$/embed_base_s.lib )
-MOZ_REG_LIB	  := $(shell @-test -f $(MOZ_LIB)$/mozreg_s.lib && echo $(MOZ_LIB)$/mozreg_s.lib )
-.ENDIF
+  MOZ_EMBED_LIB := $(shell @-test -f $(MOZ_LIB)$/embed_base_s.lib && echo $(MOZ_LIB)$/embed_base_s.lib )
+  MOZ_REG_LIB	  := $(shell @-test -f $(MOZ_LIB)$/mozreg_s.lib && echo $(MOZ_LIB)$/mozreg_s.lib )
 
-.IF X"$(MOZ_EMBED_LIB)"=="X"
-MOZ_EMBED_LIB := $(MOZ_LIB)$/baseembed_s.lib
-.ENDIF
-.IF X"$(MOZ_REG_LIB)" == "X"
-MOZ_REG_LIB := $(MOZ_LIB)$/mozreg.lib
-.ENDIF
-.ENDIF
+  MOZ_EMBED_LIB *:= $(MOZ_LIB)$/baseembed_s.lib
+  MOZ_REG_LIB *:= $(MOZ_LIB)$/mozreg.lib
+
+  .IF "$(COM)"=="GCC"
+    MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom -lxpcom_core
+  .ELSE
+    LIB += $(MOZ_LIB)
+    MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib $(MOZ_LIB)$/xpcom_core.lib
+  .ENDIF
 
-.IF "$(OS)"=="WNT" 
-.IF "$(COM)"=="GCC"
-MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lembed_base_s -lnspr4 -lmozreg_s -lxpcom -lxpcom_core
-.ELSE
-LIB += $(MOZ_LIB)
-MOZ_LIB_XPCOM= $(MOZ_EMBED_LIB) $(MOZ_LIB)$/nspr4.lib $(MOZ_REG_LIB) $(MOZ_LIB)$/xpcom.lib $(MOZ_LIB)$/xpcom_core.lib
-.ENDIF
 .ELSE "$(OS)"=="WNT" 
-MOZ_LIB_XPCOM= -L$(MOZ_LIB) -lnspr4 -lxpcom_core -lmozreg_s -lembed_base_s
+  MOZ_LIB_XPCOM = -L$(MOZ_LIB) -lnspr4 -lxpcom_core -lmozreg_s -lembed_base_s
 .ENDIF
-#End of mozilla specific stuff.
+# --- end of mozilla specific stuff
 
 USE_DEFFILE=TRUE
 ENABLE_EXCEPTIONS=TRUE
@@ -87,10 +77,6 @@ COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
 
 # --- Settings ----------------------------------
 
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
 .INCLUDE : $(PRJ)$/makefile.pmk
 
 .INCLUDE :  $(PRJ)$/version.mk
@@ -121,7 +107,6 @@ DEF1NAME=	$(SHL1TARGET)
 DEF1DEPN=	$(MISC)$/$(SHL1TARGET).flt \
             $(SLB)$/$(TARGET).lib
 DEFLIB1NAME=$(TARGET)
-#DEF1EXPORTFILE=	exports.dxp
 
 
 # --- Files -------------------------------------
@@ -165,6 +150,7 @@ DEPOBJFILES=$(SLO2FILES)
 # --- MOZAB BASE Library -----------------------------------
 
 SHL2VERSIONMAP= $(TARGET2).map
+SHL2NOCHECK=TRUE
 SHL2TARGET=	$(TARGET2)$(DLLPOSTFIX)
 SHL2OBJS=$(SLO2FILES)
 SHL2STDLIBS=\
diff --git a/connectivity/source/drivers/mozab/makefile_mozab.mk b/connectivity/source/drivers/mozab/makefile_mozab.mk
new file mode 100644
index 000000000000..28b56ec2a84a
--- /dev/null
+++ b/connectivity/source/drivers/mozab/makefile_mozab.mk
@@ -0,0 +1,128 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#*************************************************************************
+
+CDEFS += -DMOZILLA_INTERNAL_API
+
+.IF "$(GUI)"=="UNX"
+  .IF "$(COMNAME)"=="sunpro5"
+    CFLAGS += -features=tmplife
+    #This flag is needed to build mozilla 1.7 code
+  .ENDIF		# "$(COMNAME)"=="sunpro5"
+.ENDIF
+
+MOZINC = . \
+        -I.. \
+        -I$(MOZ_INC) \
+        -I$(MOZ_INC)$/nspr \
+        -I$(MOZ_INC)$/xpcom \
+        -I$(MOZ_INC)$/string \
+        -I$(MOZ_INC)$/rdf \
+        -I$(MOZ_INC)$/msgbase \
+        -I$(MOZ_INC)$/addrbook \
+        -I$(MOZ_INC)$/mork \
+        -I$(MOZ_INC)$/locale \
+        -I$(MOZ_INC)$/pref \
+        -I$(MOZ_INC)$/mime \
+        -I$(MOZ_INC)$/chrome \
+        -I$(MOZ_INC)$/necko \
+        -I$(MOZ_INC)$/intl \
+        -I$(MOZ_INC)$/profile \
+        -I$(MOZ_INC)$/embed_base \
+        -I$(MOZ_INC)$/mozldap \
+        -I$(MOZ_INC)$/uconv \
+        -I$(MOZ_INC)$/xpcom_obsolete \
+        -I$(MOZ_INC)$/content
+        
+.IF "$(GUI)" == "WNT"
+  CDEFS +=    \
+        -DMOZILLA_CLIENT \
+        -DXP_PC \
+        -DXP_WIN \
+        -DXP_WIN32 \
+        -DOJI \
+        -DWIN32 \
+        -D_X86_ \
+        -D_WINDOWS \
+        -DMOZ_XUL \
+        -DMOZ_REFLOW_PERF \
+        -DMOZ_REFLOW_PERF_DSP
+  .IF "$(COM)" == "GCC"
+    INCPOST += $(MOZINC)
+    CFLAGSCXX += \
+                -fno-rtti \
+                -Wall \
+                -Wconversion \
+                -Wpointer-arith \
+                -Wcast-align \
+                -Woverloaded-virtual \
+                -Wsynth \
+                -Wno-long-long
+  .ELSE # .IF "$(COM)" == "GCC"
+    INCPRE += $(MOZINC)
+    .IF "$(DBG_LEVEL)" != "0"
+      .IF "$(CCNUMVER)" >= "001399999999"
+        CDEFS  +=   -D_STL_NOFORCE_MANIFEST
+      .ENDIF # .IF "$(CCNUMVER)" >= "001399999999"
+    .ENDIF # .IF "$(DBG_LEVEL)" != "0"
+  .ENDIF # .IF "$(COM)" == "GCC"
+.ENDIF # .IF "$(GUI)" == "WNT"
+
+.IF "$(GUI)" == "UNX"
+  INCPOST += $(MOZINC)
+  CDEFS+=   -DMOZILLA_CLIENT \
+            -DXP_UNIX
+  .IF "$(OS)" == "LINUX"
+    CFLAGS  += -fPIC -g
+    CDEFS   += -DOJI
+    CFLAGSCXX += \
+            -fno-rtti \
+            -Wconversion \
+            -Wpointer-arith \
+            -Wcast-align \
+            -Woverloaded-virtual \
+            -Wsynth \
+            -Wno-long-long \
+            -pthread
+    CDEFS     += -DTRACING
+  .ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
+    CFLAGS +=   -fPIC
+    CFLAGSCXX += \
+            -fno-rtti \
+            -Wconversion \
+            -Wpointer-arith \
+            -Wcast-align \
+            -Woverloaded-virtual \
+            -Wsynth \
+            -Wno-long-long \
+            -Wno-deprecated
+    CDEFS += -DTRACING
+  .ENDIF # "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
+
+  SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
+
+.ENDIF # "$(GUI)" == "UNX"
+
diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
index e31d4c7e412b..1e5b39e0f140 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
+++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk
@@ -40,16 +40,12 @@ PRJINC=..$/..$/..
 PRJNAME=connectivity
 TARGET=mozabsrc
 
+# --- Settings ----------------------------------
+
 USE_DEFFILE=TRUE
 ENABLE_EXCEPTIONS=TRUE
 VISIBILITY_HIDDEN=TRUE
 
-# --- Settings ----------------------------------
-.IF "$(DBGUTIL_OJ)"!=""
-ENVCFLAGS+=/FR$(SLO)$/
-.ENDIF
-
-
 .INCLUDE : settings.mk
 
 .IF  ("$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" || "$(OS)" == "OS2"
@@ -61,8 +57,10 @@ dummy:
 
 .INCLUDE :  $(PRJ)$/version.mk
 
+.INCLUDE : ../makefile_mozab.mk
+
+INCPRE += -I../bootstrap
 
-#mozilla specific stuff.
 # --- Files -------------------------------------
 
 SLOFILES = \
@@ -74,98 +72,9 @@ SLOFILES = \
     $(SLO)$/MNSMozabProxy.obj	            \
     $(SLO)$/MNSTerminateListener.obj        \
     $(SLO)$/MLdapAttributeMap.obj           \
-    
-
-CDEFS     += -DMOZILLA_INTERNAL_API
 
-.IF "$(GUI)"=="UNX"
-.IF "$(COMNAME)"=="sunpro5"
-CFLAGS += -features=tmplife
-#This flag is needed to build mozilla 1.7 code
-.ENDIF		# "$(COMNAME)"=="sunpro5"
 .ENDIF
 
-MOZINC = . -I.. -I..$/bootstrap -I$(MOZ_INC)  -I$(MOZ_INC)$/nspr -I$(MOZ_INC)$/xpcom \
-        -I$(MOZ_INC)$/string -I$(MOZ_INC)$/rdf -I$(MOZ_INC)$/msgbase \
-        -I$(MOZ_INC)$/addrbook -I$(MOZ_INC)$/mork -I$(MOZ_INC)$/locale \
-        -I$(MOZ_INC)$/pref -I$(MOZ_INC)$/mime -I$(MOZ_INC)$/chrome \
-        -I$(MOZ_INC)$/necko -I$(MOZ_INC)$/intl -I$(MOZ_INC)$/profile \
-        -I$(MOZ_INC)$/embed_base -I$(MOZ_INC)$/mozldap -I$(MOZ_INC)$/uconv\
-        -I$(MOZ_INC)$/xpcom_obsolete -I$(MOZ_INC)$/content
-        
-.IF "$(GUI)" == "WNT"
-.IF "$(COM)"=="GCC"
-INCPOST += $(MOZINC)
-CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
-        -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-            -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-            -DNS_MT_SUPPORTED -DNETLIB_THREAD \
-            -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
-        -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
-        -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
-        -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL
-CFLAGSCXX += \
-            -fno-rtti -Wall -Wconversion -Wpointer-arith \
-            -Wcast-align -Woverloaded-virtual -Wsynth \
-            -Wno-long-long
-.ELSE
-.IF "$(DBG_LEVEL)" == "0"
-INCPRE += $(MOZINC)
-CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
-        -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-            -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-            -DDMSVC4 -DNS_MT_SUPPORTED -DNETLIB_THREAD \
-            -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
-        -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
-        -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
-        -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL	\
-        -UDEBUG
-CFLAGS +=   -GR- -W3 -Gy -MD -UDEBUG
-.ELSE
-INCPRE += $(MOZINC)
-CDEFS +=    -DWINVER=0x400 -DMOZILLA_CLIENT \
-        -DNS_NET_FILE -DCookieManagement -DSingleSignon -DClientWallet \
-            -DTRACING -DXP_PC -DXP_WIN -DXP_WIN32 -DHW_THREADS \
-            -DDMSVC4 -DDEVELOPER_DEBUG -DNS_MT_SUPPORTED -DNETLIB_THREAD \
-            -DOJI -DWIN32 -D_X86_ -D_WINDOWS \
-        -DMOZ_XUL -DMOZ_REFLOW_PERF -DMOZ_REFLOW_PERF_DSP \
-        -DDEBUG_Administrator -DNSPR20 -DOS_HAS_DLL -DNO_JNI_STUBS \
-        -DNETSCAPE -DMOZILLA_CLIENT -DJS_THREADSAFE -DNECKO -DINCLUDE_XUL	\
-        -UDEBUG
-CFLAGS +=   -Zi -GR- -W3 -Gy -MDd -UDEBUG
-.IF "$(CCNUMVER)" >= "001399999999"
-CDEFS  +=   -D_STL_NOFORCE_MANIFEST
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-.IF "$(GUI)" == "UNX"
-INCPOST += $(MOZINC)
-CDEFS+=	    -DMOZILLA_CLIENT \
-            -DXP_UNIX
-.IF "$(OS)" == "LINUX"
-CFLAGS +=   -fPIC -g
-CDEFS+=     -DOJI
-
-CFLAGSCXX += \
-            -fno-rtti -Wconversion -Wpointer-arith \
-            -Wcast-align -Woverloaded-virtual -Wsynth \
-            -Wno-long-long -pthread
-CDEFS     += -DTRACING
-.ELIF "$(OS)" == "NETBSD" || "$(OS)" == "MACOSX"
-CFLAGS +=   -fPIC
-CFLAGSCXX += \
-            -fno-rtti -Wconversion -Wpointer-arith \
-            -Wcast-align -Woverloaded-virtual -Wsynth \
-            -Wno-long-long -Wno-deprecated
-CDEFS     += -DTRACING
-.ENDIF
-.ENDIF
-
-SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR)
-
-.ENDIF # MACOSX
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk
diff --git a/connectivity/source/inc/resource/hsqldb_res.hrc b/connectivity/source/inc/resource/hsqldb_res.hrc
index 3b7b9ef15c0a..b9066488d425 100644
--- a/connectivity/source/inc/resource/hsqldb_res.hrc
+++ b/connectivity/source/inc/resource/hsqldb_res.hrc
@@ -44,6 +44,7 @@
 #define STR_NO_TABLE_EDITOR_DIALOG  ( STR_HSQLDB_BASE +    3 )
 #define STR_NO_TABLENAME            ( STR_HSQLDB_BASE +    4 )
 #define STR_NO_DOCUMENTUI           ( STR_HSQLDB_BASE +    5 )
+#define STR_ERROR_NEW_VERSION       ( STR_HSQLDB_BASE +    6 )
 
 #endif // CONNECTIVITY_RESOURCE_HSQLDB_HRC
 
diff --git a/connectivity/source/resource/conn_shared_res.src b/connectivity/source/resource/conn_shared_res.src
index d143dad1ba0f..48ab06f0f635 100644
--- a/connectivity/source/resource/conn_shared_res.src
+++ b/connectivity/source/resource/conn_shared_res.src
@@ -645,3 +645,8 @@ String STR_NO_DOCUMENTUI
 {
     Text [ en-US ] = "The provided DocumentUI is not allowed to be NULL.";
 };
+String STR_ERROR_NEW_VERSION
+{
+    Text = "The connection could not be established. The database was created by a newer version of %PRODUCTNAME.";
+};
+