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

[Eike Rathke]

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

New commits:
commit 8cf61d06e2a3f79514322214743230c489080814
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jul 13 15:27:13 2012 +0200

    Hide information about failure during very early startup a little less
    
    Change-Id: I4ecbcf7e19c642bbb98f66d127050361fdb6136a
    (cherry picked from commit 91404d1d379fbdc3b1c7286dafd2519b68b08c97)
    
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index b7136de..8ebccdd 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -26,6 +26,10 @@
  *
  ************************************************************************/
 
+#include "sal/config.h"
+
+#include <iostream>
+
 #include "app.hxx"
 #include "desktop.hrc"
 #include "cmdlineargs.hxx"
@@ -711,9 +715,11 @@ void Desktop::ensureProcessServiceFactory()
         }
         catch (const css::uno::Exception& e)
         {
-            SAL_WARN("desktop", "UNO Exception: " << e.Message);
-            // let exceptions escape and tear down the process, it is
-            // completely broken anyway
+            // Application::ShowNativeErrorBox would only work after InitVCL, so
+            // all we can realistically do here is hope the user can see stderr:
+            std::cerr << "UNO Exception: " << e.Message << std::endl;
+            // Let exceptions escape and tear down the process, it is completely
+            // broken anyway:
             throw;
         }
     }