diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:14:03 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:14:03 +0000 |
| commit | 8dbb97c425d1c3c1130849b963b4192782f7e359 (patch) | |
| tree | cedbc82af1619180b5cba322c1ca118e668b3aad /dbaccess/source/core | |
| parent | 80cd2e30c506da9adc39e26380e7ad7dccd49fde (diff) | |
INTEGRATION: CWS insight01 (1.8.124); FILE MERGED
2004/02/20 11:32:28 oj 1.8.124.3: #i25414# extend the datadescriptor for database location and connection resource
2003/12/17 09:19:06 oj 1.8.124.2: #111075# ongoing work
2003/10/24 06:20:31 oj 1.8.124.1: #i21643# changes for the import filter
Diffstat (limited to 'dbaccess/source/core')
| -rw-r--r-- | dbaccess/source/core/inc/datasettings.hxx | 40 |
1 files changed, 13 insertions, 27 deletions
diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx index 32fa32c84a89..8253dac64c20 100644 --- a/dbaccess/source/core/inc/datasettings.hxx +++ b/dbaccess/source/core/inc/datasettings.hxx @@ -2,9 +2,9 @@ * * $RCSfile: datasettings.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: fs $ $Date: 2001-10-30 08:27:08 $ + * last change: $Author: hr $ $Date: 2004-08-02 15:14:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,20 +74,13 @@ #ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_ #include <com/sun/star/lang/IllegalArgumentException.hpp> #endif - #ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> #endif - -#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ -#include <comphelper/propertycontainer.hxx> +#ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX +#include <comphelper/propertystatecontainer.hxx> #endif -namespace utl -{ - class OConfigurationNode; -} - //........................................................................ namespace dbaccess { @@ -101,7 +94,7 @@ namespace dbaccess //========================================================================== class ODataSettings_Base { -protected: +public: // <properties> ::rtl::OUString m_sFilter; ::rtl::OUString m_sOrder; @@ -117,18 +110,6 @@ protected: protected: ODataSettings_Base(); ODataSettings_Base(const ODataSettings_Base& _rSource); - - /** store all configuration relevant informations under the given configuration node (matching the configuration - scheme for "DefinitionSettings" - which has yet to be defined :) - @param _rxConfigLocation the configuration node. must not be readonly - */ - void storeTo(const ::utl::OConfigurationNode& _rConfigLocation) const; - - /** load all configuration relevant informations from the given configuration node. - @param _rxConfigLocation the configuration node. must not be readonly - */ - void loadFrom(const ::utl::OConfigurationNode& _rConfigLocation); - }; //========================================================================== //= ODataSettings - a base class which implements the property handling @@ -136,14 +117,19 @@ protected: //= service //========================================================================== -class ODataSettings : public ::comphelper::OPropertyContainer +class ODataSettings : public ::comphelper::OPropertyStateContainer , public ODataSettings_Base { protected: ODataSettings(::cppu::OBroadcastHelper& _rBHelper); ODataSettings(const ODataSettings& _rSource, ::cppu::OBroadcastHelper& _rBHelper); -private: - void registerProperties(); + virtual ::com::sun::star::uno::Any getPropertyDefaultByHandle( sal_Int32 _nHandle ) const; + + /** register the properties from the param given. The parameter instance must be alive as long as tis object live. + @param _pItem + The database settings, can be <br>this</br> + */ + void registerProperties(ODataSettings_Base* _pItem); }; //........................................................................ |