diff options
31 files changed, 13 insertions, 41 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index c6da34c647dc..bbe74fc426eb 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -16,7 +16,6 @@ #include <memory> #include <boost/property_tree/json_parser.hpp> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKit.h> #include <LibreOfficeKit/LibreOfficeKitEnums.h> diff --git a/desktop/source/lib/lokandroid.cxx b/desktop/source/lib/lokandroid.cxx index 9f1579621fc1..c9181a96aae5 100644 --- a/desktop/source/lib/lokandroid.cxx +++ b/desktop/source/lib/lokandroid.cxx @@ -17,8 +17,6 @@ #include <osl/detail/android-bootstrap.h> -#define LOK_USE_UNSTABLE_API - #include <LibreOfficeKit/LibreOfficeKit.h> /* LibreOfficeKit */ diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 40bb0f701c70..1c988459675d 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -55,7 +55,6 @@ #include <i18nlangtag/lang.h> #include <rtl/ref.hxx> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitTypes.h> #include <boost/noncopyable.hpp> diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index a78c0aab4d07..7d4210e5f43b 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -12,7 +12,7 @@ #include <stddef.h> -#ifdef LOK_USE_UNSTABLE_API +#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY // the unstable API needs C99's bool #include <stdbool.h> #endif @@ -55,7 +55,7 @@ struct _LibreOfficeKitClass LibreOfficeKitDocument* (*documentLoadWithOptions) (LibreOfficeKit* pThis, const char* pURL, const char* pOptions); -#ifdef LOK_USE_UNSTABLE_API +#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY void (*registerCallback) (LibreOfficeKit* pThis, LibreOfficeKitCallback pCallback, void* pData); @@ -83,7 +83,7 @@ struct _LibreOfficeKitDocumentClass const char* pFormat, const char* pFilterOptions); -#ifdef LOK_USE_UNSTABLE_API +#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY /// @see lok::Document::getDocumentType(). int (*getDocumentType) (LibreOfficeKitDocument* pThis); @@ -208,7 +208,7 @@ struct _LibreOfficeKitDocumentClass const char* pFontName, int* pFontWidth, int* pFontHeight); -#endif // LOK_USE_UNSTABLE_API +#endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY }; #ifdef __cplusplus diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index 2855f8b42fbe..9396f1e39bc7 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -57,7 +57,7 @@ public: /// Gives access to the underlying C pointer. inline LibreOfficeKitDocument *get() { return mpDoc; } -#ifdef LOK_USE_UNSTABLE_API +#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY /** * Get document type. * @@ -388,7 +388,7 @@ public: return mpDoc->pClass->renderFont(mpDoc, pFontName, pFontWidth, pFontHeight); } -#endif // LOK_USE_UNSTABLE_API +#endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY }; /// The lok::Office class represents one started LibreOfficeKit instance. @@ -435,7 +435,7 @@ public: return mpThis->pClass->getError(mpThis); } -#ifdef LOK_USE_UNSTABLE_API +#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY /** * Returns details of filter types. * @@ -454,7 +454,7 @@ public: { return mpThis->pClass->getFilterTypes(mpThis); } -#endif // LOK_USE_UNSTABLE_API +#endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY }; /// Factory method to create a lok::Office instance. diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h b/include/LibreOfficeKit/LibreOfficeKitEnums.h index a0f5e886dcac..5509166c14e3 100644 --- a/include/LibreOfficeKit/LibreOfficeKitEnums.h +++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h @@ -15,7 +15,7 @@ extern "C" { #endif -#ifdef LOK_USE_UNSTABLE_API +#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY typedef enum { LOK_DOCTYPE_TEXT, @@ -281,7 +281,7 @@ typedef enum } LibreOfficeKitSetGraphicSelectionType; -#endif // LOK_USE_UNSTABLE_API +#endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY #ifdef __cplusplus } diff --git a/include/LibreOfficeKit/LibreOfficeKitTypes.h b/include/LibreOfficeKit/LibreOfficeKitTypes.h index 338f8b86156a..338394454219 100644 --- a/include/LibreOfficeKit/LibreOfficeKitTypes.h +++ b/include/LibreOfficeKit/LibreOfficeKitTypes.h @@ -17,9 +17,9 @@ extern "C" { #endif -#ifdef LOK_USE_UNSTABLE_API +#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY typedef void (*LibreOfficeKitCallback)(int nType, const char* pPayload, void* pData); -#endif // LOK_USE_UNSTABLE_API +#endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY #ifdef __cplusplus } diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 7de96d90dd0d..f2288a562f9d 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -30,7 +30,6 @@ #include <vcl/cursor.hxx> #include <editeng/editstat.hxx> #include <svl/languageoptions.hxx> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitTypes.h> class EditEngine; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 26261d2e09c3..f212b8cd1931 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -38,7 +38,6 @@ #include <svtools/grfmgr.hxx> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitTypes.h> #include <vector> diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 09f8f074c2ff..5b32ae833c22 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -53,7 +53,6 @@ #include <o3tl/typed_flags_set.hxx> #include <functional> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitTypes.h> class SbxValue; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 86323a9ce1c5..b3331964229d 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -39,7 +39,6 @@ #include <o3tl/typed_flags_set.hxx> #include <vcl/vclptr.hxx> #include <sfx2/tabdlg.hxx> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitTypes.h> #include <functional> diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index 49e8c551cb3f..c400c669b90b 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -37,7 +37,6 @@ #include <svx/xtable.hxx> #include <svx/pageitem.hxx> #include <vcl/field.hxx> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitTypes.h> class OutputDevice; diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx index a86bb4d62721..c1cde7354aa7 100644 --- a/include/vcl/ITiledRenderable.hxx +++ b/include/vcl/ITiledRenderable.hxx @@ -11,7 +11,6 @@ #ifndef INCLUDED_VCL_ITILEDRENDERABLE_HXX #define INCLUDED_VCL_ITILEDRENDERABLE_HXX -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitTypes.h> #include <tools/gen.hxx> #include <vcl/pointr.hxx> diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m b/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m index 652496c32c9d..bcf4e22246bf 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m @@ -6,7 +6,6 @@ // 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" diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h index d0d20c3506c6..0e5bc8accc30 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h @@ -8,7 +8,6 @@ #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 9809f084c69f..de0d975b7795 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m @@ -8,7 +8,6 @@ #include <CoreText/CoreText.h> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKit.h> #import "View.h" diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m index 33690e1a53f7..f553a5a44c65 100644 --- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m +++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m @@ -6,7 +6,6 @@ // 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" 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/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index fee52665dcc4..e7b221651237 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -21,7 +21,6 @@ #include <sal/types.h> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitGtk.h> #include <LibreOfficeKit/LibreOfficeKitEnums.h> diff --git a/libreofficekit/qa/tilebench/tilebench.cxx b/libreofficekit/qa/tilebench/tilebench.cxx index 20777de49fe1..b4912b1611ef 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 c2e14259ea7e..e28fece0d8cb 100644 --- a/libreofficekit/qa/unit/tiledrendering.cxx +++ b/libreofficekit/qa/unit/tiledrendering.cxx @@ -21,7 +21,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 c80875292dd1..fecc66a1fa3a 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -16,7 +16,6 @@ #include <boost/property_tree/json_parser.hpp> #include <com/sun/star/awt/Key.hpp> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKit.h> #include <LibreOfficeKit/LibreOfficeKitInit.h> #include <LibreOfficeKit/LibreOfficeKitEnums.h> diff --git a/libreofficekit/source/gtk/tilebuffer.hxx b/libreofficekit/source/gtk/tilebuffer.hxx index 96100d7ece3a..70784a57159d 100644 --- a/libreofficekit/source/gtk/tilebuffer.hxx +++ b/libreofficekit/source/gtk/tilebuffer.hxx @@ -14,7 +14,6 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <map> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKit.h> #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <LibreOfficeKit/LibreOfficeKitGtk.h> diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index e2d8ff073a75..d0bdbe46792e 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -136,7 +136,6 @@ #include <svx/sdr/overlay/overlayselection.hxx> #include <comphelper/string.hxx> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <memory> diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index e15cb1e1b0c1..387db1c09b70 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -29,7 +29,6 @@ #include <sfx2/printer.hxx> #include <vcl/settings.hxx> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <svx/svdview.hxx> diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index 6ebb6ab6fcd2..a6f5e9dc42ff 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -11,7 +11,6 @@ #include <unotest/macros_test.hxx> #include <test/xmltesttools.hxx> #include <boost/property_tree/json_parser.hpp> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <com/sun/star/frame/Desktop.hpp> #include <comphelper/dispatchcommand.hxx> diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index b41bdb36159f..11276b982646 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -34,7 +34,6 @@ #include <SidebarWindowsTypes.hxx> #include <svl/lstner.hxx> #include <vcl/vclptr.hxx> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitTypes.h> class OutputDevice; diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 52fe09828031..e3367d1c701a 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -29,7 +29,6 @@ #include <svl/lstner.hxx> #include <svtools/embedhlp.hxx> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitTypes.h> #include <sfx2/StyleManager.hxx> diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 283ba948f009..7a83589478b7 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -31,7 +31,6 @@ #include <vcl/print.hxx> #include <vcl/vclptr.hxx> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitTypes.h> namespace com { namespace sun { namespace star { namespace accessibility { diff --git a/sw/source/uibase/docvw/SidebarScrollBar.cxx b/sw/source/uibase/docvw/SidebarScrollBar.cxx index 9e2c299e81de..7ad9b935172c 100644 --- a/sw/source/uibase/docvw/SidebarScrollBar.cxx +++ b/sw/source/uibase/docvw/SidebarScrollBar.cxx @@ -9,7 +9,6 @@ #include <SidebarScrollBar.hxx> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <SidebarWin.hxx> diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index c0e865aafe7a..83f7dc1fd8a4 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -29,7 +29,6 @@ #include <sfx2/printer.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/awt/vclxdevice.hxx> -#define LOK_USE_UNSTABLE_API #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <cmdid.h> #include <swtypes.hxx> |