#86095# Revised handling of TemplateProvider: Need not be passed when adjusting to changes any more.

3 files changed, 11 insertions, 27 deletions

diff --git a/configmgr/source/api2/apitreeimplobj.cxx b/configmgr/source/api2/apitreeimplobj.cxx
index 7e3a27562b3c..dd5891f43814 100644
--- a/configmgr/source/api2/apitreeimplobj.cxx
+++ b/configmgr/source/api2/apitreeimplobj.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: apitreeimplobj.cxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: jb $ $Date: 2001-02-27 15:47:31 $
+ *  last change: $Author: jb $ $Date: 2001-04-19 15:20:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -338,12 +338,6 @@ ApiProvider::ApiProvider(Factory& rFactory, OProviderImpl& rProviderImpl )
 {}
 //-------------------------------------------------------------------------
 
-configuration::TemplateProvider ApiProvider::getTemplateProvider() const
-{
-    return m_rProviderImpl.getTemplateProvider();
-}
-//-------------------------------------------------------------------------
-
 UnoTypeConverter ApiProvider::getTypeConverter() const
 {
     return m_rProviderImpl.getTypeConverter();
@@ -907,11 +901,9 @@ void ApiRootTreeImpl::nodeChanged(Change const& aChange, OUString const& sPath,
                 OSL_ENSURE( aChange.getNodeName() == aNode.getName().toString(),
                             "Change's node-name does not match found node's name - erratic notification");
 
-                configuration::TemplateProvider aProviderForNewSets = m_aTreeImpl.getProvider().getTemplateProvider();
-
                 configuration::NodeChangesInformation aChanges;
 
-                if (configuration::adjustToChanges(aChanges, aTree,aNode, aChange,aProviderForNewSets))
+                if (configuration::adjustToChanges(aChanges, aTree,aNode, aChange))
                 {
                     OSL_ASSERT(aChanges.size() > 0);
 
diff --git a/configmgr/source/api2/apitreeimplobj.hxx b/configmgr/source/api2/apitreeimplobj.hxx
index 98c7a964c7c0..cd1ec847cc13 100644
--- a/configmgr/source/api2/apitreeimplobj.hxx
+++ b/configmgr/source/api2/apitreeimplobj.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: apitreeimplobj.hxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: jb $ $Date: 2001-02-27 15:47:31 $
+ *  last change: $Author: jb $ $Date: 2001-04-19 15:20:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,8 +113,6 @@ namespace configmgr
 //-------------------------------------------------------------------------
         class ApiProvider : NotCopyable
         {
-            typedef configuration::TemplateProvider TemplateProvider;
-
             Factory&                    m_rFactory;
             OProviderImpl&              m_rProviderImpl;
         public:
@@ -127,7 +125,6 @@ namespace configmgr
             Factory&                    getFactory()        { return m_rFactory; }
             OProviderImpl&              getProviderImpl()   { return m_rProviderImpl; }
             ISynchronizedData*          getSourceLock() const;
-            TemplateProvider            getTemplateProvider() const;
         };
 
     //-----------------------------------------------------------------------------
@@ -140,6 +137,7 @@ namespace configmgr
             typedef uno::Reference<com::sun::star::lang::XComponent> UnoComponent;
 
             typedef configuration::Tree Tree;
+
             Tree                m_aTree;
             NotifierImplHolder  m_aNotifier;
             ComponentRef        m_xProvider;
@@ -175,6 +173,7 @@ namespace configmgr
             uno::XInterface*            getUnoInstance() const  { return m_pInstance; }
             ApiProvider&                getProvider()           { return m_rProvider; }
             UnoInterfaceRef             getUnoProviderInstance() const; //  { return m_xProvider; }
+
         // locking support
             ISynchronizedData*          getProviderLock() const { return m_rProvider.getSourceLock(); }
             ISynchronizedData*          getDataLock() const     { return configuration::getRootLock(m_aTree); }
@@ -195,13 +194,7 @@ namespace configmgr
             UnoComponent getProviderComponent();
             UnoComponent getParentComponent();
 
-/*          // XEventListener
-            virtual void SAL_CALL acquire() throw();
-            virtual void SAL_CALL release() throw();
-            virtual uno::Any SAL_CALL queryInterface(uno::Type const& rType) throw();
-            virtual void SAL_CALL disposing(com::sun::star::lang::EventObject const& rEvt) throw();
-            // ---------------------------------------------------------------------------------------------------
-*/      };
+        };
 
     //-----------------------------------------------------------------------------
         class ApiRootTreeImpl
diff --git a/configmgr/source/inc/roottree.hxx b/configmgr/source/inc/roottree.hxx
index bf67da81e8fb..f485a60debbf 100644
--- a/configmgr/source/inc/roottree.hxx
+++ b/configmgr/source/inc/roottree.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: roottree.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jb $ $Date: 2001-02-13 17:09:23 $
+ *  last change: $Author: jb $ $Date: 2001-04-19 15:20:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -126,8 +126,7 @@ namespace configmgr
         */
         bool adjustToChanges(   NodeChangesInformation& rLocalChanges,
                                 Tree const& aBaseTree, NodeRef const& aBaseNode,
-                                Change const& aExternalChange,
-                                TemplateProvider const& aTemplateProvider) ;
+                                Change const& aExternalChange) ;
 
 
 //-----------------------------------------------------------------------------