diff options
author | Tor Lillqvist <tml@collabora.com> | 2016-08-17 00:31:11 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2016-08-17 18:16:10 +0300 |
commit | a995d607efae4ce805f2122778456c88bc34d965 (patch) | |
tree | 3f21650e6708223edf15dc588d49ea2b64363f8a /ios | |
parent | d97a4e5feb9cbed73f11d09171e4173bc6931f15 (diff) |
Adapt to LibreOfficeKit API changes, LOK_USE_UNSTABLE_API
Change-Id: I7d83c90a8f3930f043101ed81b090dd38c43f986
Diffstat (limited to 'ios')
5 files changed, 6 insertions, 1 deletions
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m b/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m index addcccf99699..1b6d2be107c8 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m @@ -6,6 +6,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. +#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitInit.h> #import "AppDelegate.h" @@ -73,7 +74,7 @@ static LibreOfficeKitDocument* document; // kit = lok_init([[[NSBundle mainBundle] bundlePath] UTF8String]); kit = lok_init(NULL); document = kit->pClass->documentLoad(kit, [documentPath UTF8String]); - document->pClass->initializeForRendering(document); + document->pClass->initializeForRendering(document, ""); vc.view = [[View alloc] initWithFrame:[self.window frame] kit:kit document:document]; } diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h index 0e5bc8accc30..d0d20c3506c6 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h @@ -8,6 +8,7 @@ #import <UIKit/UIKit.h> +#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKit.h> @interface TiledView : UIView diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m index 98e3025780cd..6f1a4ea9f82c 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m @@ -8,6 +8,7 @@ #include <CoreText/CoreText.h> +#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKit.h> #import "View.h" diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h index c4269569966e..7fc3db820f96 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.h @@ -7,6 +7,7 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. #import <UIKit/UIKit.h> +#define LOK_USE_UNSTABLE_API #import <LibreOfficeKit/LibreOfficeKit.h> @interface View : UIScrollView <UIScrollViewDelegate> diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m index f553a5a44c65..33690e1a53f7 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m @@ -6,6 +6,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. +#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKit.h> #import "View.h" |