desktop/source/app/appinit.cxx | 7 +++++++ ios/CustomTarget_iOS_setup.mk | 1 - 2 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit cc2b9a257b6436ab6f84d6e158a64c09b0937eb6 Author: jan Iversen <j...@libreoffice.org> Date: Sat Jan 20 18:52:39 2018 +0100 iOS, remove double [bootstrap] two bootstrap sections in one rc file seems wrong. Change-Id: Ic7f8eac2d3d07b35736d11ad1fbe705135cb1785 diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index 543ef306a7db..6242354eeebe 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -58,7 +58,6 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \ (echo '[Bootstrap]' \ && echo 'URE_BOOTSTRAP=file://$$APP_DATA_DIR/fundamentalrc' \ && echo 'HOME=$$SYSUSERHOME' \ - && echo '[Bootstrap]' \ ) > $(IOSRES)/rc # Set up fundamentalrc, unorc, bootstraprc and versionrc. commit feb601b75142f3234bb51f9566a70c4db488a061 Author: jan Iversen <j...@libreoffice.org> Date: Sat Jan 20 18:51:13 2018 +0100 iOS, allow unorc to be read One reason why init did not work, was that it did a throw due to a wrong path on unorc Change-Id: I928f25358befe05f8986e9ebcffda27e8beb397c diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 853eaf8734ae..826c525eb6c1 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -80,6 +80,13 @@ void Desktop::InitApplicationServiceManager() sm.set( cppu::defaultBootstrap_InitialComponentContext( aUnoRc )->getServiceManager(), UNO_QUERY_THROW); +#elif defined(IOS) + OUString uri( "$APP_DATA_DIR" ); + rtl_bootstrap_expandMacros( &uri.pData ); + OUString aUnoRc("file://" + uri + "/unorc"); + sm.set( + cppu::defaultBootstrap_InitialComponentContext( aUnoRc )->getServiceManager(), + UNO_QUERY_THROW); #else sm.set( cppu::defaultBootstrap_InitialComponentContext()->getServiceManager(), _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits