diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:40:55 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:40:55 +0000 |
| commit | f2191a02cf88a3f0f8f351e85c08cfdeb763947a (patch) | |
| tree | 2d0b3e702a97153ff63529192c51e5be4682c525 /configmgr | |
| parent | db2a4f09c00b36248c838dcec0afae50b7ae09be (diff) | |
INTEGRATION: CWS configrefactor01 (1.8.24); FILE MERGED
2007/10/05 14:14:06 mmeeks 1.8.24.3: Issue number: i#82311
Submitted by: mmeeks
Reviewed by: mmeeks
Cleanups from patch re-review.
Improvements to unit-testing framework.
2007/01/16 12:18:25 mmeeks 1.8.24.2: Submitted by: mmeeks
Kill 'memory::Segment' - no longer needed.
Bin some other (empty / redundant) headers.
2007/01/11 10:35:38 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
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/treemgr/defaultproviderproxy.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/configmgr/source/treemgr/defaultproviderproxy.cxx b/configmgr/source/treemgr/defaultproviderproxy.cxx index 16cd3ebfa315..fdbe2261e0b9 100644 --- a/configmgr/source/treemgr/defaultproviderproxy.cxx +++ b/configmgr/source/treemgr/defaultproviderproxy.cxx @@ -4,9 +4,9 @@ * * $RCSfile: defaultproviderproxy.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2006-09-16 15:28:34 $ + * last change: $Author: ihi $ $Date: 2007-11-23 14:40:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,9 +50,6 @@ #ifndef CONFIGMGR_MISC_OPTIONS_HXX_ #include "options.hxx" #endif -#ifndef CONFIGMGR_UPDATEACCESSOR_HXX -#include "updateaccessor.hxx" -#endif namespace configmgr { @@ -82,7 +79,6 @@ DefaultProviderProxy::~DefaultProviderProxy() /// tries to load a default instance of the specified node (which must be within the request range owned) std::auto_ptr<ISubtree> DefaultProviderProxy::getDefaultTree( - memory::UpdateAccessor& /*_aDestinationSpace*/, AbsolutePath const& _aLocation ) const CFG_UNO_THROW_ALL() { @@ -104,9 +100,7 @@ bool DefaultProviderProxy::fetchDefaultData() CFG_UNO_THROW_ALL() OSL_PRECOND(m_pDefaultTreeManager, "No tree to fetch defaults into"); if (!m_pDefaultTreeManager) return false; - memory::UpdateAccessor anAccessToken(m_pDefaultTreeManager->getDataSegment(m_aBaseLocation,m_aOptions)); - - return !! m_pDefaultTreeManager->fetchDefaultData(anAccessToken,m_aBaseLocation,m_aOptions); + return !! m_pDefaultTreeManager->fetchDefaultData(m_aBaseLocation,m_aOptions); } //----------------------------------------------------------------------------- } |