summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjan Iversen <jani@libreoffice.org>2018-01-20 18:51:13 +0100
committerjan Iversen <jani@libreoffice.org>2018-01-20 18:54:29 +0100
commitfeb601b75142f3234bb51f9566a70c4db488a061 (patch)
tree36acf9e99263c106faee6d13d7b2cdbe4ff555da
parent24702687433842a6e9e8a1070ead46c035192bf3 (diff)
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
-rw-r--r--desktop/source/app/appinit.cxx7
1 files changed, 7 insertions, 0 deletions
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(),