Kaydet (Commit) ddbfba8e authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann

INTEGRATION: CWS configrefactor01 (1.8.24); FILE MERGED

2007/01/16 12:18:24 mmeeks 1.8.24.3: Submitted by: mmeeks
Kill 'memory::Segment' - no longer needed.
Bin some other (empty / redundant) headers.
2007/01/12 14:50:46 mmeeks 1.8.24.2: Another big prune of memory::Accessor ...
2007/01/11 10:35:37 mmeeks 1.8.24.1: Submitted by: mmeeks

Large scale re-factoring, remove fine-grained locking in favor of a simple,
single global lock (still in progress).
Identify and fix various hot-spots.
Remove otherwise empty / non-compiled files.
Kill UpdateAccessor
üst c761d522
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: configdefaultprovider.cxx,v $ * $RCSfile: configdefaultprovider.cxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: obo $ $Date: 2006-09-16 15:27:26 $ * last change: $Author: ihi $ $Date: 2007-11-23 14:39:52 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -51,9 +51,6 @@ ...@@ -51,9 +51,6 @@
#ifndef CONFIGMGR_CONFIGNODEIMPL_HXX_ #ifndef CONFIGMGR_CONFIGNODEIMPL_HXX_
#include "treeimpl.hxx" #include "treeimpl.hxx"
#endif #endif
#ifndef CONFIGMGR_UPDATEACCESSOR_HXX
#include "updateaccessor.hxx"
#endif
#ifndef CONFIGMGR_MISC_OPTIONS_HXX_ #ifndef CONFIGMGR_MISC_OPTIONS_HXX_
#include "options.hxx" #include "options.hxx"
#endif #endif
...@@ -118,7 +115,6 @@ DefaultProvider::DefaultProvider(rtl::Reference< DefaultProviderProxy > const& _ ...@@ -118,7 +115,6 @@ DefaultProvider::DefaultProvider(rtl::Reference< DefaultProviderProxy > const& _
/// tries to load a default instance of the specified node /// tries to load a default instance of the specified node
std::auto_ptr<ISubtree> DefaultProvider::getDefaultTree( std::auto_ptr<ISubtree> DefaultProvider::getDefaultTree(
memory::UpdateAccessor& _aTreeAccessor,
Tree const& _aTree, NodeRef const& _aNode Tree const& _aTree, NodeRef const& _aNode
) const CFG_UNO_THROW_ALL() ) const CFG_UNO_THROW_ALL()
{ {
...@@ -130,9 +126,7 @@ std::auto_ptr<ISubtree> DefaultProvider::getDefaultTree( ...@@ -130,9 +126,7 @@ std::auto_ptr<ISubtree> DefaultProvider::getDefaultTree(
// clone the ISubtree (no interface for that) :-( // clone the ISubtree (no interface for that) :-(
if (m_aProxy.is() && aAttributes.existsInDefault()) if (m_aProxy.is() && aAttributes.existsInDefault())
{ aRet = m_aProxy->getDefaultTree(_aTree.getAbsolutePath(_aNode));
aRet = m_aProxy->getDefaultTree(_aTreeAccessor,_aTree.getAbsolutePath(_aNode));
}
return aRet; return aRet;
} }
...@@ -143,9 +137,7 @@ static bool shouldFetchDefaultData(TreeRef const& _aTreeRef, bool & _rbHasDefaul ...@@ -143,9 +137,7 @@ static bool shouldFetchDefaultData(TreeRef const& _aTreeRef, bool & _rbHasDefaul
{ {
bool bShouldFetch = false; bool bShouldFetch = false;
data::Accessor aTempAccess( getRootSegment(_aTreeRef) ); Tree aTempTree(_aTreeRef);
Tree aTempTree(aTempAccess, _aTreeRef);
node::Attributes aAttributes = aTempTree.getAttributes(aTempTree.getRootNode()); node::Attributes aAttributes = aTempTree.getAttributes(aTempTree.getRootNode());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment