diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:47:13 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-11-23 13:47:13 +0000 |
| commit | 78920205c319548db3c794e0ee200ef4f94905c4 (patch) | |
| tree | 9e3cba8700409568cee64fabce22bfd6c7a1dd7c /configmgr | |
| parent | c3c8635e7463eb46dc4c0880a59bdb7d84baebe1 (diff) | |
INTEGRATION: CWS configrefactor01 (1.14.84); FILE MERGED
2007/01/12 14:50:48 mmeeks 1.14.84.2: Another big prune of memory::Accessor ...
2007/01/11 20:16:06 mmeeks 1.14.84.1: Submitted by: mmeeks
More re-factoring, lots of locking rationalized, drastically reduced
the mutex count, also removed ~300k interlocked increments with a non-interlocking
SimpleReferencedObject base
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/treemgr/templateimpl.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configmgr/source/treemgr/templateimpl.hxx b/configmgr/source/treemgr/templateimpl.hxx index e697c3ff02c3..5360657b6b67 100644 --- a/configmgr/source/treemgr/templateimpl.hxx +++ b/configmgr/source/treemgr/templateimpl.hxx @@ -4,9 +4,9 @@ * * $RCSfile: templateimpl.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2005-09-08 04:34:41 $ + * last change: $Author: ihi $ $Date: 2007-11-23 14:47:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,8 +52,8 @@ #ifndef _RTL_REF_HXX_ #include <rtl/ref.hxx> #endif -#ifndef _SALHELPER_SIMPLEREFERENCEOBJECT_HXX_ -#include <salhelper/simplereferenceobject.hxx> +#ifndef CONFIGMGR_UTILITY_HXX_ +#include "utility.hxx" #endif #ifndef INCLUDED_MAP @@ -193,7 +193,7 @@ namespace configmgr // class SpecialTemplateProvider_Impl //--------------------------------------------------------------------- - struct SpecialTemplateProvider_Impl : salhelper::SimpleReferenceObject + struct SpecialTemplateProvider_Impl : configmgr::SimpleReferenceObject { SpecialTemplateProvider_Impl(); @@ -207,13 +207,13 @@ namespace configmgr // class TemplateProvider_Impl //--------------------------------------------------------------------- - struct TemplateProvider_Impl : salhelper::SimpleReferenceObject + struct TemplateProvider_Impl : configmgr::SimpleReferenceObject { typedef TemplateProvider::TemplateManagerRef TemplateManagerRef; TemplateProvider_Impl(TemplateManagerRef const & xProvider, RequestOptions const& aOptions); - data::TreeSegment instantiate(memory::Accessor const& _aSourceAccessor, TemplateHolder const& aTemplate); + data::TreeSegment instantiate(TemplateHolder const& aTemplate); TemplateHolder makeElementTemplateWithType(TemplateName const& _aNames, data::SetNodeAccess const& _aSet); private: |