diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-20 17:44:39 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-12-20 17:44:39 +0000 |
| commit | d0f24ec98f01d6be6b1d3a9a8480ee8ded305367 (patch) | |
| tree | 920403c61ca2e783b96ef6985bce74e71b4b2296 /configmgr | |
| parent | 5a8287939d4851e7954d5fce2e5da03b977d9957 (diff) | |
INTEGRATION: CWS configmgrassert (1.10.8); FILE MERGED
2006/12/13 17:19:53 mmeeks 1.10.8.1: #i71663#
fix annoying, but inconsequential warnings
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/tree/builddata.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/configmgr/source/tree/builddata.cxx b/configmgr/source/tree/builddata.cxx index 163caadc8bdd..1c0e6cae24c7 100644 --- a/configmgr/source/tree/builddata.cxx +++ b/configmgr/source/tree/builddata.cxx @@ -4,9 +4,9 @@ * * $RCSfile: builddata.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: kz $ $Date: 2006-11-06 14:49:40 $ + * last change: $Author: ihi $ $Date: 2006-12-20 18:44:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -304,7 +304,7 @@ namespace configmgr Result handle(GroupNodeAccess const & _aNode); Result handle(SetNodeAccess const & _aNode); - Address makeTemplateData(Address _aSourceTemplate); + Address makeTemplateData(Accessor const & _aSourceAccessor, Address _aSourceTemplate); }; //----------------------------------------------------------------------------- @@ -799,7 +799,7 @@ NodeVisitor::Result CopyingDataTreeBuilder::handle(SetNodeAccess const & _aNode) sharable::Name aNodeName = allocName( aSrc.info.getName()); Flags::Field aFlags = aSrc.info.flags; - Address aTemplate = this->makeTemplateData(aSrc.elementType); + Address aTemplate = this->makeTemplateData(_aNode.accessor(), aSrc.elementType); this->builder().addSet(aNodeName,aFlags,aTemplate); @@ -812,9 +812,12 @@ NodeVisitor::Result CopyingDataTreeBuilder::handle(SetNodeAccess const & _aNode) } //----------------------------------------------------------------------------- -Address CopyingDataTreeBuilder::makeTemplateData(Address _aSourceTemplate) +Address CopyingDataTreeBuilder::makeTemplateData(Accessor const & _aSourceAccessor, Address _aSourceTemplate) { - return SetNode::copyTemplateData(allocator(), _aSourceTemplate); + rtl::OUString aTemplateName = SetNode::getTemplateDataName(_aSourceAccessor,_aSourceTemplate); + rtl::OUString aTemplateModule = SetNode::getTemplateDataModule(_aSourceAccessor,_aSourceTemplate); + + return SetNode::allocTemplateData(allocator(), aTemplateName, aTemplateModule ); } //----------------------------------------------------------------------------- |