diff options
| author | jan Iversen <jani@libreoffice.org> | 2018-01-10 14:20:19 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2018-01-10 14:23:02 +0100 |
| commit | d9bde4c6af35beca7be6da93834fc56a6c1bf753 (patch) | |
| tree | 30c791ed20beeba4e8d00feef28328d8ecde93d5 /desktop | |
| parent | e4f5c5cebbca1e1ceab0b4ab68031f275e46b504 (diff) | |
iOS, corrected path in LO
Patch thanks to Jon Nermut.
LO looked in the wrong directories on iOS
Change-Id: I8a9c019f7443445b780bc2ce1c77c998f74239e8
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index ae0a99b8424f..7b97d1beeca0 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3438,14 +3438,15 @@ static bool initialize_uno(const OUString& aAppProgramURL) { #ifdef IOS // For iOS we already hardcode the inifile as "rc" in the .app directory. - (void) aAppProgramURL; + rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" SAL_CONFIGFILE("soffice")); + xContext = cppu::defaultBootstrap_InitialComponentContext(aAppProgramURL + "/rc"); #elif defined MACOSX rtl::Bootstrap::setIniFilename(aAppProgramURL + "/../Resources/" SAL_CONFIGFILE("soffice")); + xContext = cppu::defaultBootstrap_InitialComponentContext(); #else rtl::Bootstrap::setIniFilename(aAppProgramURL + "/" SAL_CONFIGFILE("soffice")); -#endif - xContext = cppu::defaultBootstrap_InitialComponentContext(); +#endif if (!xContext.is()) { |