diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-12-07 09:25:42 +0100 |
---|---|---|
committer | Ashod Nakashian <ashnakash@gmail.com> | 2016-05-07 19:53:44 +0000 |
commit | dfc2c194cf28c364328c9fcb484d56c51dba3e76 (patch) | |
tree | 505c2a06a6674f1660b101dfc7b36f525a2adca8 /libreofficekit | |
parent | aadab5f4a72e38ccc8bbe9b7811d2cdcaa00124c (diff) |
Let LIBO_INTERNAL_ONLY imply LOK_USE_UNSTABLE_API
(cherry picked from commit 958b9a7fbdd58fdce762021917155c58fbb90d18)
Change-Id: Ifbed5e534ba79d32b7188bb7fb7108338b6e124d
Reviewed-on: https://gerrit.libreoffice.org/24722
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
Diffstat (limited to 'libreofficekit')
-rw-r--r-- | libreofficekit/README | 2 | ||||
-rw-r--r-- | libreofficekit/qa/tilebench/tilebench.cxx | 2 | ||||
-rw-r--r-- | libreofficekit/qa/unit/tiledrendering.cxx | 1 | ||||
-rw-r--r-- | libreofficekit/source/gtk/lokdocview.cxx | 1 |
4 files changed, 1 insertions, 5 deletions
diff --git a/libreofficekit/README b/libreofficekit/README index 669cb8051f54..7e5f8e93145c 100644 --- a/libreofficekit/README +++ b/libreofficekit/README @@ -33,7 +33,7 @@ To use LOK Tiled Rendering you will need the following before the LOK includes: (This must be define before ANY LOK header, i.e. including the Init header.) -Currently only bitmap-buffer rendering is supported, with a 32-bit RGBA +Currently only bitmap-buffer rendering is supported, with a 32-bit BGRA colourspace (further alternatives could feasibly be implemented as needed). Scanlines are ordered top-down (whereas LibreOffice will internally default to bottom-up). diff --git a/libreofficekit/qa/tilebench/tilebench.cxx b/libreofficekit/qa/tilebench/tilebench.cxx index e72c730a6dfe..21d2dcb78952 100644 --- a/libreofficekit/qa/tilebench/tilebench.cxx +++ b/libreofficekit/qa/tilebench/tilebench.cxx @@ -14,8 +14,6 @@ #include <vector> #include <osl/time.h> -#define LOK_USE_UNSTABLE_API - #include <LibreOfficeKit/LibreOfficeKitInit.h> #include <LibreOfficeKit/LibreOfficeKit.hxx> diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx index 2cabcc768dd3..06167c5106b3 100644 --- a/libreofficekit/qa/unit/tiledrendering.cxx +++ b/libreofficekit/qa/unit/tiledrendering.cxx @@ -28,7 +28,6 @@ #include <config_options.h> // see use of ENABLE_RUNTIME_OPTIMIZATIONS in LibreOfficeKintInit.h -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitInit.h> #include <LibreOfficeKit/LibreOfficeKit.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index cad178be2f46..b5017b02deb5 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -16,7 +16,6 @@ #include <gdk/gdkkeysyms.h> #include <com/sun/star/awt/Key.hpp> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKit.h> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <LibreOfficeKit/LibreOfficeKitGtk.h> |