dba33b: merge CWS head with head resulting from pulling DEV300_m67

3 files changed, 109 insertions, 88 deletions

diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx
index bd86e9ce43..ceff42f48a 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 6fdbae4389..8bcfa0eaed 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 81a5cacfb1..a09b698e8c 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;
     };
 
 //........................................................................