diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-05-26 07:05:31 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-05-26 07:05:31 +0000 |
| commit | 16f9d30465de26c092c1efb65db89c14f2340d49 (patch) | |
| tree | b09f0c2908f67a1c81bd3f0d91f5fe2bcf49c9c9 /configmgr | |
| parent | 00c2a5e05104f7e9b2b1ecb3eeffc97e008c1a17 (diff) | |
INTEGRATION: CWS cfg02 (1.4.8); FILE MERGED
2003/05/21 13:02:14 jb 1.4.8.2: #108160# Rework design after review
2003/05/12 12:43:53 ssmith 1.4.8.1: #108160# added support for binary cache
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/backend/mergedcomponentdata.cxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/configmgr/source/backend/mergedcomponentdata.cxx b/configmgr/source/backend/mergedcomponentdata.cxx index 6b43d9c31f76..3df84812f9eb 100644 --- a/configmgr/source/backend/mergedcomponentdata.cxx +++ b/configmgr/source/backend/mergedcomponentdata.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mergedcomponentdata.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2003-03-19 16:18:48 $ + * last change: $Author: vg $ $Date: 2003-05-26 08:05:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -140,12 +140,6 @@ std::auto_ptr<INode> MergedComponentData::extractTemplateNode(OUString const & _ } // ----------------------------------------------------------------------------- -ISubtree const * MergedComponentData::getSchemaTree() const -{ - return m_pSchemaTree.get(); -} -// ----------------------------------------------------------------------------- - ISubtree const * MergedComponentData::findTemplate(OUString const & _aTemplateName) const { INode const * pTemplateNode = m_pTemplatesTree->getChild(_aTemplateName); @@ -183,8 +177,12 @@ ISubtree * MergedComponentData::setSchemaRoot(std::auto_ptr<ISubtree> _aSchema return m_pSchemaTree.get(); } // ----------------------------------------------------------------------------- - - +void MergedComponentData::setTemplatesTree(std::auto_ptr<ISubtree> _aTemplateTree) +{ + OSL_PRECOND(!hasTemplates(),"ERROR: Template Tree already set"); + m_pTemplatesTree = _aTemplateTree; +} +// ----------------------------------------------------------------------------- ISubtree * MergedComponentData::addTemplate(std::auto_ptr<ISubtree> _aNode, TemplateIdentifier const & aTemplate) { OSL_PRECOND(_aNode.get(), "ERROR: Adding a NULL template"); |