[Libreoffice-commits] .: desktop/source

[Tor Lillqvist]

 desktop/source/app/sofficemain.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit dac4874eb0a5f65aae2679b5fa0020154f84800d
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Tue Feb 21 11:45:00 2012 +0100

    desktop: Don't call setIniFilename() for LIBO_HEADLESS
    
    mmeeks suggests we don't want setIniFilename(), who am i to disagree? :)

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