summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-03-29 18:59:05 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-03-29 18:59:40 +0300
commit71bf17ecbaa46780b112b6307aab879a088910fe (patch)
tree3d8b242d7c3ccb0f72cbba33bf474c8a9809f78e
parent8424af3e1b69f00f442a5a49a964813ede2f09e7 (diff)
Don't pass potentially bogus file: URIs to libxml2
libxml2 doesn't understand our syntax for file: URIs in the case of UNC paths. Fixes fdo#33970. Picked from OOo's fix for their issue i#109096. Signed-off-by: David Tardon <dtardon@redhat.com>
-rw-r--r--desktop/source/deployment/registry/dp_backenddb.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index 905ff6e95f..730e848c50 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -92,7 +92,10 @@ css::uno::Reference<css::xml::dom::XDocument> BackendDb::getDocument()
::osl::File::RC err = ::osl::DirectoryItem::get(m_urlDb, item);
if (err == ::osl::File::E_None)
{
- m_doc = xDocBuilder->parseURI(m_urlDb);
+ ::ucbhelper::Content descContent(
+ m_urlDb, css::uno::Reference<css::ucb::XCommandEnvironment>());
+ Reference<css::io::XInputStream> xIn = descContent.openStream();
+ m_doc = xDocBuilder->parse(xIn);
}
else if (err == ::osl::File::E_NOENT)
{