[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/source

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fd535a0503b022a7b9f7229a0a70e2427c164dcc
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Nov 1 23:28:03 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 2 13:00:14 2018 +0100

    We now use a fixed name ICU.dat for the ICU data file in the iOS app
    
    That makes it much easier to use the same Xcode project file when
    building against different versions of LibreOffice, with different ICU
    data files. The configure script in the "online" directory creates a
    ICU.dat symlink to the ICU data file in the LibreOffice build
    directory, and that is what gets copied into the app bundle.
    
    Change-Id: Ibe2ca85f66e2d4973d6ba3c52fc4d60e113d8f9a
    Reviewed-on: https://gerrit.libreoffice.org/62780
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 63893a4ee976..5269e090979e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3969,9 +3969,9 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
     // to use that.
     NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
 
-    int fd = open([[bundlePath stringByAppendingPathComponent:@U_ICUDATA_NAME".dat"] UTF8String], O_RDONLY);
+    int fd = open([[bundlePath stringByAppendingPathComponent:@"ICU.dat"] UTF8String], O_RDONLY);
     if (fd == -1)
-        NSLog(@"Could not open ICU data file %s", [[bundlePath stringByAppendingPathComponent:@U_ICUDATA_NAME".dat"] UTF8String]);
+        NSLog(@"Could not open ICU data file %s", [[bundlePath stringByAppendingPathComponent:@"ICU.dat"] UTF8String]);
     else
     {
         struct stat st;