[Libreoffice-commits] .: l10ntools/source

Caolán McNamara caolan at kemper.freedesktop.org
Thu Feb 9 01:22:48 PST 2012


 l10ntools/source/xmlparse.cxx |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 80ba5e7aa6935ce1966a087992ae4d13bb90a05b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 9 09:08:30 2012 +0000

    convert system path to url
    
    otherwise seg faults in building nlpsolver

diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index c21d9e5..f44b6f4 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -1123,12 +1123,20 @@ XMLFile *SimpleXMLParser::Execute( const rtl::OUString &rFullFileName , const rt
         RTL_CONSTASCII_USTRINGPARAM("ERROR: Unable to open file "));
     aErrorInformation.sMessage += rFileName;
 
+    rtl::OUString aFileURL;
+    if (osl::File::getFileURLFromSystemPath(rFileName, aFileURL)
+        != osl::File::E_None)
+    {
+        return 0;
+    }
+
     oslFileHandle h;
-    if (osl_openFile(rFileName.pData, &h, osl_File_OpenFlag_Read)
+    if (osl_openFile(aFileURL.pData, &h, osl_File_OpenFlag_Read)
         != osl_File_E_None)
     {
         return 0;
     }
+
     sal_uInt64 s;
     oslFileError e = osl_getFileSize(h, &s);
     void * p;


More information about the Libreoffice-commits mailing list