summaryrefslogtreecommitdiff
path: root/configmgr
diff options
context:
space:
mode:
authorJörg Barfurth <jb@openoffice.org>2001-03-20 16:06:48 +0000
committerJörg Barfurth <jb@openoffice.org>2001-03-20 16:06:48 +0000
commit6c56cdec2defcf01b39958da14039e578501a90c (patch)
tree5fb5464c575138fa10680fbcf8bf2475689f67c9 /configmgr
parent1aa0349da94047d725091040635b07dfdac16b79 (diff)
Fixed errors with new format; now supressing template module if redundant
Diffstat (limited to 'configmgr')
-rw-r--r--configmgr/source/misc/mergechange.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/configmgr/source/misc/mergechange.cxx b/configmgr/source/misc/mergechange.cxx
index 5b57476ae146..4e4eca42075b 100644
--- a/configmgr/source/misc/mergechange.cxx
+++ b/configmgr/source/misc/mergechange.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: mergechange.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: jb $ $Date: 2001-03-12 15:04:11 $
+ * last change: $Author: jb $ $Date: 2001-03-20 17:06:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -389,8 +389,7 @@ namespace configmgr
// WARNING this could be a big tree, because a change can contain subtreechanges!
void OMergeTreeChangeList::handleChange(TreeChangeList &_rList)
{
- rtl::OUString aPath = _rList.pathToRoot;
- ConfigurationName aName(aPath, ConfigurationName::Absolute());
+ ConfigurationName aName = _rList.pathToRoot;
init(aName); // our Name start with pathToRoot
m_pCurrentParent = check(aName); // pathToRoot must exist or will be created