slidecopy: wrongly resolved the merge conflict in the previous revision ...

2010-06-03 16:18:12 +02:00 · 2010-06-03 16:18:12 +02:00 · f39e88f23e
commit f39e88f23e
parent 41b43f2fc6
1 changed files with 2 additions and 1 deletions
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@ -395,7 +395,8 @@ void XcuParser::handleItem(XmlReader & reader) {
    rtl::OUString path(xmldata::convertFromUtf8(attrPath));
    int finalizedLayer;
    rtl::Reference< Node > node(
-        data_.resolvePathRepresentation(path, &path_, &finalizedLayer));
+        data_.resolvePathRepresentation(
+            path, 0, &path_, &finalizedLayer));
    if (!node.is()) {
        OSL_TRACE(
            "configmgr unknown item %s in %s",