[Libreoffice-commits] .: 2 commits - desktop/source scp2/source

[Riccardo Magliocchetti]

 desktop/source/app/cmdlineargs.cxx   |    4 ++++
 desktop/source/app/sofficemain.cxx   |    2 --
 scp2/source/ooo/file_library_ooo.scp |    2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit eae70d6b237616fc7e0f2aa1365991c72e76ae4c
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Thu May 31 16:46:19 2012 +0200

    Force --headless argument when LIBO_HEADLESS is defined
    
    When LIBO_HEADLESS is set we are not supposed to run libo without
    --headless; doing so will throw an UNO exception. So better use
    a sensible default.

diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index a1ce3e5..4c8e359 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -588,7 +588,11 @@ void CommandLineArgs::InitParamValues()
     m_minimized = false;
     m_invisible = false;
     m_norestore = false;
+#ifdef LIBO_HEADLESS
+    m_headless = true;
+#else
     m_headless = false;
+#endif
     m_quickstart = false;
     m_noquickstart = false;
     m_terminateafterinit = false;
commit 8125b8b989940e581da20992b1416768694fa3ae
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Thu May 31 16:44:24 2012 +0200

    More headless build work
    
    Remove hack in sofficemain we really don't want and don't install
    a lib we are not building.

diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index ed22834..93081b9 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -43,10 +43,8 @@ int SVMain();
 
 extern "C" int DESKTOP_DLLPUBLIC soffice_main()
 {
-#if defined(ANDROID) || defined(LIBO_HEADLESS)
 #if defined(ANDROID)
     try {
-#endif
         rtl::Bootstrap::setIniFilename(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///assets/program/lofficerc")));
 #endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 3b09ee2..6e5ec3f 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1048,7 +1048,9 @@ End
 #endif
 
 #if defined UNX && ! defined QUARTZ
+#if ! defined LIBO_HEADLESS
 STD_LIB_FILE( gid_File_Lib_Vclplug_Svp, vclplug_svp )
+#endif
 STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp )
 #endif