mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Frank Schoenheit [fs] 2010-06-03 16:18:12 +02:00
parent 41b43f2fc6
commit f39e88f23e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configmgr/source/xcuparser.cxx
View File

@ -395,7 +395,8 @@ void XcuParser::handleItem(XmlReader & reader) {
rtl::OUString path(xmldata::convertFromUtf8(attrPath)); rtl::OUString path(xmldata::convertFromUtf8(attrPath));
int finalizedLayer; int finalizedLayer;
rtl::Reference< Node > node( rtl::Reference< Node > node(
data_.resolvePathRepresentation(path, &path_, &finalizedLayer)); data_.resolvePathRepresentation(
path, 0, &path_, &finalizedLayer));
if (!node.is()) { if (!node.is()) {
OSL_TRACE( OSL_TRACE(
"configmgr unknown item %s in %s", "configmgr unknown item %s in %s",