diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-03 16:18:12 +0200 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-06-03 16:18:12 +0200 |
| commit | f39e88f23e8491e8e450796b000dd5c712cae3dd (patch) | |
| tree | ff7d5791b498c721654157be207071605ec58b3f /configmgr | |
| parent | 41b43f2fc66a490780d4751ed64f663fe1c548d7 (diff) | |
slidecopy: wrongly resolved the merge conflict in the previous revision ...
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/xcuparser.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx index f9f439c98916..eda478b18b70 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", |