mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mmap in the ICU data file and pass it to udata_setCommonData()

Browse Source 
Now done in TiledLibreOffice's lo_initialize(), but should probably be
done in common LO code instead.

Change-Id: I398a703943d13c6d715e4c88ead2a629955fb7c9
This commit is contained in:
Tor Lillqvist
2014-04-12 20:29:47 +03:00
parent 11842c6643
commit eb6bf90a87
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm
View File

@@ -7,6 +7,8 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include <stdlib.h> #include <stdlib.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include <premac.h> #include <premac.h>
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
@@ -15,6 +17,9 @@
#include <osl/process.h> #include <osl/process.h>
#include <touch/touch.h> #include <touch/touch.h>
#include <unicode/udata.h>
#include <unicode/ucnv.h>
// generated by solenv/bin/native-code.py: // generated by solenv/bin/native-code.py:
#include "native-code.mm" #include "native-code.mm"
@@ -45,6 +50,36 @@ extern "C" void lo_initialize(NSString *documentPath)
NSString *uno_types = createPaths(@"-env:UNO_TYPES=", app_root_escaped, @[@"offapi.rdb", @"oovbaapi.rdb", @"types.rdb"]); NSString *uno_types = createPaths(@"-env:UNO_TYPES=", app_root_escaped, @[@"offapi.rdb", @"oovbaapi.rdb", @"types.rdb"]);
NSString *uno_services = createPaths(@"-env:UNO_SERVICES=", app_root_escaped, @[@"ure/services.rdb", @"services.rdb"]); NSString *uno_services = createPaths(@"-env:UNO_SERVICES=", app_root_escaped, @[@"ure/services.rdb", @"services.rdb"]);
int fd = open([[bundlePath stringByAppendingPathComponent:@U_ICUDATA_NAME".dat"] UTF8String], O_RDONLY);
if (fd != -1) {
struct stat st;
if (fstat(fd, &st) != -1
&& st.st_size < (size_t)-1) {
void *icudata = mmap(0, (size_t) st.st_size, PROT_READ, MAP_FILE|MAP_PRIVATE, fd, 0);
if (icudata == MAP_FAILED) {
#if OSL_DEBUG_LEVEL > 0
NSLog(@"mmap failed:%s", strerror(errno));
#endif
} else {
UErrorCode icuStatus = U_ZERO_ERROR;
udata_setCommonData(icudata, &icuStatus);
if (U_FAILURE(icuStatus))
NSLog(@"udata_setCommonData failed");
else {
#if OSL_DEBUG_LEVEL > 0
// Test that ICU works...
UConverter *cnv = ucnv_open("iso-8859-3", &icuStatus);
NSLog(@"ucnv_open(iso-8859-3)-> %p, err = %s, name=%s",
(void *)cnv, u_errorName(icuStatus), (!cnv)?"?":ucnv_getName(cnv,&icuStatus));
if (U_SUCCESS(icuStatus))
ucnv_close(cnv);
#endif
}
}
}
close(fd);
}
const char *argv[] = { const char *argv[] = {
[[[NSBundle mainBundle] executablePath] UTF8String], [[[NSBundle mainBundle] executablePath] UTF8String],
"-env:URE_INTERNAL_LIB_DIR=file:///", "-env:URE_INTERNAL_LIB_DIR=file:///",