diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2012-02-21 11:45:00 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-21 13:09:21 +0200 |
| commit | dac4874eb0a5f65aae2679b5fa0020154f84800d (patch) | |
| tree | 1b5adf9df356ebc581302c962b9cc46169375e8c /desktop | |
| parent | Put HEADLESS definition under LIBO namespace (diff) | |
| download | core-dac4874eb0a5f65aae2679b5fa0020154f84800d.tar.gz core-dac4874eb0a5f65aae2679b5fa0020154f84800d.zip | |
desktop: Don't call setIniFilename() for LIBO_HEADLESS
mmeeks suggests we don't want setIniFilename(), who am i to disagree? :)
Diffstat (limited to 'desktop')
| -rw-r--r-- | 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 5ec3dd49c275..76562a32e630 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 |