summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-06-03 16:18:12 +0200
committerFrank Schoenheit [fs] <frank.schoenheit@sun.com>2010-06-03 16:18:12 +0200
commit0cca1086cd929c1aba4734012b461f73e6d5ddf2 (patch)
treee7698570569acedf85a079b430a2f0cf49c5a737
parent5db6741125db89de6ae24aa10b2dd5a486ed39b6 (diff)
slidecopy: wrongly resolved the merge conflict in the previous revision ...
-rw-r--r--configmgr/source/xcuparser.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index f9f439c989..eda478b18b 100644
--- 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",