diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-05-01 20:48:34 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-05-01 20:50:41 +0300 |
| commit | d97cf4f14c0245b01756090c3fded4759aeb7cff (patch) | |
| tree | d0761d77fa467ec22c89393b54d0b042c18eb52a /ios | |
| parent | 5011f4cb8d5851921120766b2a7704dec75f400f (diff) | |
Update names of rdb files and of the fsstorage library
Change-Id: I344d64212aa1d42171f18dae7659ab7f56fecbcb
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_LibreOffice_app.mk | 4 | ||||
| -rw-r--r-- | ios/experimental/LibreOffice/LibreOffice/lo.mm | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index 21a6facee87b..9092ed9f742e 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -53,9 +53,9 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) # # Copy rdb files # - cp $(OUTDIR)/bin/types.rdb $(appdir) - cp $(OUTDIR)/bin/ure/types.rdb $(appdir)/ure cp $(OUTDIR)/bin/offapi.rdb $(appdir) + cp $(OUTDIR)/bin/udkapi.rdb $(appdir) + cp $(OUTDIR)/bin/oovbaapi.rdb $(appdir) cp $(OUTDIR)/xml/services.rdb $(appdir) cp $(OUTDIR)/xml/ure/services.rdb $(appdir)/ure # diff --git a/ios/experimental/LibreOffice/LibreOffice/lo.mm b/ios/experimental/LibreOffice/LibreOffice/lo.mm index bbd5bce4c593..53c992125515 100644 --- a/ios/experimental/LibreOffice/LibreOffice/lo.mm +++ b/ios/experimental/LibreOffice/LibreOffice/lo.mm @@ -74,7 +74,7 @@ lo_get_libmap(void) { "libevtattlo.a", evtatt_component_getFactory }, { "libfileacc.a", fileacc_component_getFactory }, { "libfrmlo.a", frm_component_getFactory }, - { "fsstorage.uno.a", fsstorage_component_getFactory }, + { "libfsstoragelo.a", fsstorage_component_getFactory }, { "libfwklo.a", fwk_component_getFactory }, { "libfwllo.a", fwl_component_getFactory }, { "libfwmlo.a", fwm_component_getFactory }, @@ -133,13 +133,13 @@ lo_initialize(void) NSString *uno_types = @"-env:UNO_TYPES="; uno_types = [uno_types stringByAppendingString: @"file://"]; - uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"ure/types.rdb"]]; + uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"offapi.rdb"]]; uno_types = [uno_types stringByAppendingString: @" file://"]; - uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"types.rdb"]]; + uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"oovbaapi.rdb"]]; uno_types = [uno_types stringByAppendingString: @" file://"]; - uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"offapi.rdb"]]; + uno_types = [uno_types stringByAppendingString: [app_root_escaped stringByAppendingPathComponent: @"udkapi.rdb"]]; assert(strcmp(argv[2], "placeholder-uno-types") == 0); argv[2] = [uno_types UTF8String]; |