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

Riccardo Magliocchetti riccardo.magliocchetti at gmail.com
Tue Feb 21 02:45:00 PST 2012


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


--------------040406020002090509070201--


More information about the LibreOffice mailing list