put into a namespace / persistence implemented by using configuration, not a registry

3 files changed, 47 insertions, 25 deletions

diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx
index df5a30365797..e28cdc2080bb 100644
--- a/dbaccess/source/core/inc/commandbase.hxx
+++ b/dbaccess/source/core/inc/commandbase.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: commandbase.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-05 09:37:27 $
+ *  last change: $Author: fs $ $Date: 2000-10-18 16:05:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,11 +66,16 @@
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #endif
 
+//........................................................................
+namespace dbaccess
+{
+//........................................................................
+
+class OConfigurationNode;
 //==========================================================================
 //= OCommandBase - a base class (in fact just a container for some members)
 //=                 for classes implementing the sdb.CommandDefinition service
 //==========================================================================
-
 class OCommandBase
 {
 protected:
@@ -87,18 +92,20 @@ protected:
     OCommandBase() : m_bEscapeProcessing(sal_True) { }
 
     /** store all configuration relevant informations under the given configuration node
-        @param      _rxConfigLocation       the configuration node. must not be readonly
+        @param      _rConfigLocation        the configuration node. must not be readonly
     */
-    virtual void    storeTo(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rxConfigLocation);
+    virtual void    storeTo(const OConfigurationNode& _rConfigLocation);
 
     /** initialize with the informations stored under the given configuration node
-        @param      _rxConfigLocation       the configuration node.
+        @param      _rConfigLocation        the configuration node.
     */
-    virtual void    initializeFrom(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rxConfigLocation);
+    virtual void    initializeFrom(const OConfigurationNode& _rConfigLocation);
 };
 
+//........................................................................
+}   // namespace dbaccess
+//........................................................................
+
 #endif // _DBA_CORE_COMMANDBASE_HXX_
 
 
diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx
index aab201597bed..444a6cb94549 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.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-05 09:37:27 $
+ *  last change: $Author: fs $ $Date: 2000-10-18 16:05:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,6 +86,12 @@
 #include <comphelper/propertycontainer.hxx>
 #endif
 
+//........................................................................
+namespace dbaccess
+{
+//........................................................................
+
+class OConfigurationNode;
 //==========================================================================
 //= ODataSettings_Base - a base class which implements the property member
 //=                 for an object implementing the sdb::DataSettings
@@ -112,14 +118,12 @@ protected:
         scheme for "DefinitionSettings" - which has yet to be defined :)
         @param      _rxConfigLocation       the configuration node. must not be readonly
     */
-    virtual void    storeTo(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rxConfigLocation) const;
+    virtual void    storeTo(const OConfigurationNode& _rConfigLocation) const;
 
     /** load all configuration relevant informations from the given configuration node.
         @param      _rxConfigLocation       the configuration node. must not be readonly
     */
-    virtual void    loadFrom(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rxConfigLocation);
+    virtual void    loadFrom(const OConfigurationNode& _rConfigLocation);
 
 };
 //==========================================================================
@@ -138,5 +142,9 @@ private:
     void registerProperties();
 };
 
+//........................................................................
+}   // namespace dbaccess
+//........................................................................
+
 #endif // _DBA_CORE_DATASETTINGS_HXX_
 
diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx
index ebddfbb4d556..8ed5d3e50e8b 100644
--- a/dbaccess/source/core/inc/querycontainer.hxx
+++ b/dbaccess/source/core/inc/querycontainer.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: querycontainer.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: fs $ $Date: 2000-10-11 11:07:08 $
+ *  last change: $Author: fs $ $Date: 2000-10-18 16:05:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,9 +114,6 @@
 #ifndef _COM_SUN_STAR_SDBCX_XDROP_HPP_
 #include <com/sun/star/sdbcx/XDrop.hpp>
 #endif
-#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#endif
 
 #ifndef _DBASHARED_APITOOLS_HXX_
 #include "apitools.hxx"
@@ -124,6 +121,14 @@
 #ifndef _DBA_CORE_CONFIGURATIONFLUSHABLE_HXX_
 #include "configurationflushable.hxx"
 #endif
+#ifndef _DBA_CONFIGNODE_HXX_
+#include "confignode.hxx"
+#endif
+
+//........................................................................
+namespace dbaccess
+{
+//........................................................................
 
 typedef ::cppu::WeakImplHelper9< ::com::sun::star::container::XEnumerationAccess,
                                  ::com::sun::star::container::XContainerListener,
@@ -149,8 +154,6 @@ protected:
     ::osl::Mutex&               m_rMutex;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >
                                 m_xCommandDefinitions;
-    ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >
-                                m_xConfigRoot;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
                                 m_xORB;
 
@@ -194,7 +197,7 @@ public:
         ::cppu::OWeakObject& _rConnection,
         ::osl::Mutex& _rMutex,
         const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _rxCommandDefinitions,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rxRootConfigNode,
+        const OConfigurationTreeRoot& _rRootConfigNode,
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB
         );
     ~OQueryContainer();
@@ -255,7 +258,7 @@ public:
 
 protected:
     // OConfigurationFlushable
-    virtual void flush_NoBroadcast();
+    virtual void flush_NoBroadcast_NoCommit();
 
 private:
     // helper
@@ -271,9 +274,13 @@ private:
     sal_Int32 implGetIndex(const ::rtl::OUString& _rName);
 
     /// search the object key for the given name
-    ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey > implGetObjectKey(const ::rtl::OUString& _rName, sal_Bool bCreate = sal_False);
+    OConfigurationNode implGetObjectKey(const ::rtl::OUString& _rName, sal_Bool bCreate = sal_False);
 };
 
+//........................................................................
+}   // namespace dbaccess
+//........................................................................
+
 #endif // _DBA_CORE_QUERYCONTAINER_HXX_