diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-02-13 08:18:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-02-13 12:56:00 +0100 |
| commit | 7bea643b8b09e27852dbd68459289873e2989feb (patch) | |
| tree | 0cafd83105b67f3fa09a3ecb126c1a0090a9fa07 /sal | |
| parent | c0da56cb3e9f9678cae7142dee03fb706a2aebd9 (diff) | |
Fix mis-merge from 8b53fa726e0d496f18228b0ca9ce2f61196f6a57
"Introduce a fundamental.override.ini for bootstrap variables"
Change-Id: I88f11e422d98100bafd6fd9a7ab5e892dcc3fb46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163292
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/bootstrap.cxx | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 485d582cc875..a0fa9f3c2000 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -219,19 +219,18 @@ static OUString getIniFileName(bool overriding) { fileName = OUString(inifile, strlen(inifile), RTL_TEXTENCODING_UTF8); resolvePathnameUrl(&fileName); #elif defined ANDROID - // Apps are self-contained on Android, too, can as well hardcode - // it as "rc" in the "/assets" directory, i.e. inside the app's - // .apk (zip) archive as the /assets/rc file. - fileName = overriding - ? OUString("vnd.sun.star.pathname:/assets/fundamental.override.ini") - : OUString("vnd.sun.star.pathname:/assets/rc"); - fileName = OUString("vnd.sun.star.pathname:/assets/rc"); - resolvePathnameUrl(&fileName); + // Apps are self-contained on Android, too, can as well hardcode + // it as "rc" in the "/assets" directory, i.e. inside the app's + // .apk (zip) archive as the /assets/rc file. + fileName = overriding + ? OUString("vnd.sun.star.pathname:/assets/fundamental.override.ini") + : OUString("vnd.sun.star.pathname:/assets/rc"); + resolvePathnameUrl(&fileName); #elif defined(EMSCRIPTEN) - fileName = overriding - ? OUString("vnd.sun.star.pathname:/instdir/program/fundamental.override.ini") - : OUString("vnd.sun.star.pathname:/instdir/program/sofficerc"); - resolvePathnameUrl(&fileName); + fileName = overriding + ? OUString("vnd.sun.star.pathname:/instdir/program/fundamental.override.ini") + : OUString("vnd.sun.star.pathname:/instdir/program/sofficerc"); + resolvePathnameUrl(&fileName); #else if (!overriding && getFromCommandLineArgs("INIFILENAME", &fileName)) { @@ -265,11 +264,11 @@ static OUString getIniFileName(bool overriding) { } #ifdef MACOSX - // We keep only executables in the MacOS folder, and all - // rc files in LIBO_ETC_FOLDER (typically "Resources"). - sal_Int32 off = fileName.lastIndexOf( "/MacOS/" ); - if (off != -1) - fileName = fileName.replaceAt(off + 1, strlen("MacOS"), u"" LIBO_ETC_FOLDER); + // We keep only executables in the MacOS folder, and all + // rc files in LIBO_ETC_FOLDER (typically "Resources"). + sal_Int32 off = fileName.lastIndexOf( "/MacOS/" ); + if (off != -1) + fileName = fileName.replaceAt(off + 1, strlen("MacOS"), u"" LIBO_ETC_FOLDER); #endif } #endif |