[Libreoffice-commits] .: xmlreader/source

Stephan Bergmann sbergmann at kemper.freedesktop.org
Wed Apr 18 05:43:29 PDT 2012


 xmlreader/source/xmlreader.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c5c3b6d9513407ce79060c1024759bb538d9a3d9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 18 14:43:04 2012 +0200

    Improved error reporting

diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx
index 0845662..9d197c7 100644
--- a/xmlreader/source/xmlreader.cxx
+++ b/xmlreader/source/xmlreader.cxx
@@ -95,15 +95,15 @@ XmlReader::XmlReader(rtl::OUString const & fileUrl)
             osl_File_MapFlag_WillNeed);
     }
     if (e != osl_File_E_None) {
-        e = osl_closeFile(fileHandle_);
-        if (e != osl_File_E_None) {
+        oslFileError e2 = osl_closeFile(fileHandle_);
+        if (e2 != osl_File_E_None) {
             SAL_WARN(
                 "xmlreader",
-                "osl_closeFile of \"" << fileUrl_ << "\" failed with " << +e);
+                "osl_closeFile of \"" << fileUrl_ << "\" failed with " << +e2);
         }
         throw css::uno::RuntimeException(
-            (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot mmap ")) +
-             fileUrl_),
+            ("cannot mmap " + fileUrl_ + " (" +
+             rtl::OUString::valueOf(static_cast< sal_Int32 >(e)) + ")"),
             css::uno::Reference< css::uno::XInterface >());
     }
     namespaceIris_.push_back(


More information about the Libreoffice-commits mailing list