[Libreoffice-commits] .: desktop/source

[Caolán McNamara]

 desktop/source/app/app.cxx |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 4e4bfa470c5376e77aa15c40ae9fa970da962829
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 4 12:28:53 2011 +0100

    verbose error message please

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1cb3f30..fb1da91 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -767,18 +767,19 @@ void Desktop::InitFinished()
 // on Unix command line args needs to be checked before Desktop::Init()
 void Desktop::ensureProcessServiceFactory()
 {
-    if (!comphelper::getProcessServiceFactory().is()) {
-        try {
+    if (!comphelper::getProcessServiceFactory().is())
+    {
+        try
+        {
             comphelper::setProcessServiceFactory(
                 CreateApplicationServiceManager());
-        } catch (css::uno::Exception & e) {
-            OSL_TRACE(
-                OSL_LOG_PREFIX "caught UNO exception with message \"%s\"",
-                rtl::OUStringToOString(
-                    e.Message, RTL_TEXTENCODING_UTF8).getStr());
+        }
+        catch (const css::uno::Exception& e)
+        {
+            OSL_FAIL(rtl::OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr());
+            // let exceptions escape and tear down the process, it is
+            // completely broken anyway
             throw;
-                // let exceptions escape and tear down the process, it is
-                // completely broken anyway
         }
     }
 }