[Libreoffice-commits] .: Branch 'libreoffice-3-3' - desktop/source

[Tor Lillqvist]

 desktop/source/deployment/registry/dp_backenddb.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 71bf17ecbaa46780b112b6307aab879a088910fe
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Mar 29 18:59:05 2011 +0300

    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 at redhat.com>

diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index 905ff6e..730e848 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)
         {