diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2012-05-31 16:44:24 +0200 |
|---|---|---|
| committer | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2012-05-31 16:44:24 +0200 |
| commit | 8125b8b989940e581da20992b1416768694fa3ae (patch) | |
| tree | c6a1397ddda408bd61ec952647ec2d77f0a99054 | |
| parent | 569867b6769104f001dc1ae070783318098de583 (diff) | |
More headless build work
Remove hack in sofficemain we really don't want and don't install
a lib we are not building.
| -rw-r--r-- | desktop/source/app/sofficemain.cxx | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index ed22834ab75d..93081b92d8f6 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 3b09ee24ccde..6e5ec3f02d64 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 |