[PATCH v2] desktop: Don't call setIniFilename() for LIBO_HEADLESS

Il 21/02/2012 11:54, Riccardo Magliocchetti ha scritto:
> Hello,
>
> mmeeks suggests we don't want setIniFilename(), who am i to disagree? :)
>
> For now avoid to catch uno exceptions, will probably change opinion when
> i'll see them.
>
> thanks

Hey, this time with one that does actually compile.

thanks,

--
Riccardo Magliocchetti

From 9346e7f0edbc8e6b6fe9483b82337e61edeee70a Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Tue, 21 Feb 2012 11:45:00 +0100
Subject: [PATCH] desktop: Don't call setIniFilename() for LIBO_HEADLESS

mmeeks suggests we don't want setIniFilename(), who am i to disagree? :)
---
 desktop/source/app/sofficemain.cxx |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 5ec3dd4..76562a3 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -43,8 +43,10 @@ int SVMain();
 
 extern "C" int DESKTOP_DLLPUBLIC soffice_main()
 {
-#ifdef ANDROID
+#if defined(ANDROID) || defined(LIBO_HEADLESS)
+#if defined(ANDROID)
     try {
+#endif
         rtl::Bootstrap::setIniFilename(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///assets/program/lofficerc")));
 #endif
-- 
1.7.5.4