[Libreoffice-commits] .: xmlreader/source

[Stephan Bergmann]

 xmlreader/source/xmlreader.cxx |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit b7da8304477428c317e20e1df7e469077bd1d8a3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 26 11:00:50 2012 +0100

    Better exception message.

diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx
index 05782ee..0845662 100644
--- a/xmlreader/source/xmlreader.cxx
+++ b/xmlreader/source/xmlreader.cxx
@@ -72,7 +72,9 @@ XmlReader::XmlReader(rtl::OUString const & fileUrl)
         css::container::NoSuchElementException, css::uno::RuntimeException)):
     fileUrl_(fileUrl)
 {
-    switch (osl_openFile(fileUrl_.pData, &fileHandle_, osl_File_OpenFlag_Read))
+    oslFileError e = osl_openFile(
+        fileUrl_.pData, &fileHandle_, osl_File_OpenFlag_Read);
+    switch (e)
     {
     case osl_File_E_None:
         break;
@@ -82,10 +84,11 @@ XmlReader::XmlReader(rtl::OUString const & fileUrl)
     default:
         throw css::uno::RuntimeException(
             (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("cannot open ")) +
-             fileUrl_),
+             fileUrl_ + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) +
+             rtl::OUString::valueOf(static_cast< sal_Int32 >(e))),
             css::uno::Reference< css::uno::XInterface >());
     }
-    oslFileError e = osl_getFileSize(fileHandle_, &fileSize_);
+    e = osl_getFileSize(fileHandle_, &fileSize_);
     if (e == osl_File_E_None) {
         e = osl_mapFile(
             fileHandle_, &fileAddress_, fileSize_, 0,