diff options
author | Frank Schönheit <fs@openoffice.org> | 2001-08-30 06:53:40 +0000 |
---|---|---|
committer | Frank Schönheit <fs@openoffice.org> | 2001-08-30 06:53:40 +0000 |
commit | 737b915cca38ed112ad94c4f04468754b24afc67 (patch) | |
tree | 344c73f32fe8d5b93c5b4095f6c312a2dee85d06 | |
parent | 6793dcddadd743b70458c190f41ca7e91ca9a17f (diff) |
preparations for #90109# (need to know an XNumberFormatsSupplier
-rw-r--r-- | dbaccess/source/core/inc/TableDeco.hxx | 41 | ||||
-rw-r--r-- | dbaccess/source/core/inc/table.hxx | 9 |
2 files changed, 33 insertions, 17 deletions
diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index a99cf8f5d..4a46e70b4 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -2,9 +2,9 @@ * * $RCSfile: TableDeco.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: oj $ $Date: 2001-07-18 08:45:32 $ + * last change: $Author: fs $ $Date: 2001-08-30 07:53:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,6 +62,9 @@ #ifndef _DBA_CORE_TABLEDECORATOR_HXX_ #define _DBA_CORE_TABLEDECORATOR_HXX_ +#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_ +#include <com/sun/star/util/XNumberFormatsSupplier.hpp> +#endif #ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #endif @@ -136,15 +139,16 @@ namespace dbaccess class ODBTableDecorator :public comphelper::OBaseMutex ,public OTableDescriptor_BASE ,public ODataSettings //ODataSettings_Base - ,public OConfigurationFlushable + ,protected OConfigurationFlushable ,public IColumnFactory ,public ::connectivity::sdbcx::IRefreshableColumns ,public ODBTableDecorator_PROP { void fillPrivileges() const; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xTable; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xTable; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormats; // <properties> sal_Int32 m_nPrivileges; // </properties> @@ -178,14 +182,18 @@ namespace dbaccess @param _rxConn the connection the table belongs to @param _rxTable the table from the driver can be null */ - ODBTableDecorator(const ::utl::OConfigurationNode& _rTableConfig, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConn, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& _rxTable) - throw(::com::sun::star::sdbc::SQLException); - - ODBTableDecorator( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConn, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& _rxNewTable) - throw(::com::sun::star::sdbc::SQLException); + ODBTableDecorator( + const ::utl::OConfigurationNode& _rTableConfig, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConn, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& _rxTable, + const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& _rxNumberFormats + ) throw(::com::sun::star::sdbc::SQLException); + + ODBTableDecorator( + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConn, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& _rxNewTable, + const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& _rxNumberFormats + ) throw(::com::sun::star::sdbc::SQLException); virtual ~ODBTableDecorator(); void setTable(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& _rxTable); @@ -232,6 +240,13 @@ namespace dbaccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getIndexes( ) throw (::com::sun::star::uno::RuntimeException); // XDataDescriptorFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( ) throw (::com::sun::star::uno::RuntimeException); + + public: + // replaces OConfigurationFlushable::setConfigurationNode + void setContext( + const ::utl::OConfigurationTreeRoot& _rNode, + const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& _rxNumberFormats + ); }; } #endif // _DBA_CORE_TABLEDECORATOR_HXX_ diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 9bd77e57b..b4c610f13 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -2,9 +2,9 @@ * * $RCSfile: table.hxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: fs $ $Date: 2001-06-18 11:37:38 $ + * last change: $Author: fs $ $Date: 2001-08-30 07:53:40 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,6 +130,7 @@ namespace dbaccess ,public IColumnFactory { protected: + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDriverColumns; @@ -159,12 +160,12 @@ namespace dbaccess @param _rDesc the description of the table, as supplied by the driver */ ODBTable(const ::utl::OConfigurationNode& _rTableConfig, - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConn, + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn, const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName, const ::rtl::OUString& _rType, const ::rtl::OUString& _rDesc) throw(::com::sun::star::sdbc::SQLException); - ODBTable(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConn) + ODBTable(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn) throw(::com::sun::star::sdbc::SQLException); virtual ~ODBTable(); |