strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS configmgrassert (1.10.8); FILE MERGED

Browse source 
2006/12/13 17:19:53 mmeeks 1.10.8.1: #i71663#
fix annoying, but inconsequential warnings
This commit is contained in:
Ivo Hinkelmann 2006-12-20 17:44:39 +00:00
parent 5a8287939d
commit d0f24ec98f
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
configmgr/source/tree/builddata.cxx
View file

@ -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 );
}
//-----------------------------------------------------------------------------