[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - desktop/source editeng/source include/editeng include/LibreOfficeKit include/sfx2 include/svx include/vcl ios/experimental libreofficekit/qa libreofficekit/README libreofficekit/source sc/source sd/qa sw/inc sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Sat May 7 19:54:09 UTC 2016
desktop/source/lib/init.cxx | 1 -
desktop/source/lib/lokandroid.cxx | 2 --
editeng/source/editeng/impedit.hxx | 1 -
include/LibreOfficeKit/LibreOfficeKit.h | 8 ++++----
include/LibreOfficeKit/LibreOfficeKit.hxx | 8 ++++----
include/LibreOfficeKit/LibreOfficeKitEnums.h | 4 ++--
include/LibreOfficeKit/LibreOfficeKitTypes.h | 4 ++--
include/editeng/editview.hxx | 1 -
include/editeng/outliner.hxx | 2 --
include/sfx2/objsh.hxx | 1 -
include/sfx2/viewsh.hxx | 1 -
include/svx/svdmodel.hxx | 1 -
include/vcl/ITiledRenderable.hxx | 1 -
ios/experimental/TiledLibreOffice/TiledLibreOffice/AppDelegate.m | 1 -
ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h | 1 -
ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m | 1 -
ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m | 1 -
libreofficekit/README | 2 +-
libreofficekit/qa/tilebench/tilebench.cxx | 2 --
libreofficekit/qa/unit/tiledrendering.cxx | 1 -
libreofficekit/source/gtk/lokdocview.cxx | 1 -
sc/source/ui/view/gridwin.cxx | 1 -
sc/source/ui/view/gridwin4.cxx | 1 -
sd/qa/unit/tiledrendering/tiledrendering.cxx | 1 -
sw/inc/PostItMgr.hxx | 1 -
sw/inc/docsh.hxx | 1 -
sw/inc/viewsh.hxx | 1 -
sw/source/uibase/docvw/SidebarScrollBar.cxx | 1 -
sw/source/uibase/uno/unotxdoc.cxx | 1 -
29 files changed, 13 insertions(+), 40 deletions(-)
New commits:
commit dfc2c194cf28c364328c9fcb484d56c51dba3e76
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Dec 7 09:25:42 2015 +0100
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 at gmail.com>
Tested-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8742c49..1ee6e25 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -23,7 +23,6 @@
#include <postwin.h>
#endif
-#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 9f15796..c9181a9 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 a44e335..5895e26 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -54,7 +54,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 9f604a3..68ae432 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>
#include <stdint.h>
@@ -58,7 +58,7 @@ struct _LibreOfficeKitClass
const char* pOptions);
void (*freeError) (char* pFree);
-#ifdef LOK_USE_UNSTABLE_API
+#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
void (*registerCallback) (LibreOfficeKit* pThis,
LibreOfficeKitCallback pCallback,
void* pData);
@@ -95,7 +95,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);
@@ -239,7 +239,7 @@ struct _LibreOfficeKitDocumentClass
const int nTileWidth,
const int nTileHeight);
-#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 38292da..82d4fc0 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -59,7 +59,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.
*
@@ -432,7 +432,7 @@ public:
nTileWidth, nTileHeight);
}
-#endif // LOK_USE_UNSTABLE_API
+#endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
};
/// The lok::Office class represents one started LibreOfficeKit instance.
@@ -486,7 +486,7 @@ public:
}
-#ifdef LOK_USE_UNSTABLE_API
+#if defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY
/**
* Returns details of filter types.
*
@@ -539,7 +539,7 @@ public:
{
mpThis->pClass->setDocumentPassword(mpThis, pURL, pPassword);
}
-#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 c1d8508..7543ff7 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,
@@ -362,7 +362,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 338f8b8..3383944 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 d3a1c04..775c484 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 c6c078f..bb97e7a 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -38,8 +38,6 @@
#include <svtools/grfmgr.hxx>
-#include <tools/rtti.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 13f3b86..7361d28 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -53,7 +53,6 @@
#include <set>
#include <o3tl/typed_flags_set.hxx>
-#define LOK_USE_UNSTABLE_API
#include <LibreOfficeKit/LibreOfficeKitTypes.h>
class SbxValue;
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 945b38a..27be9cb 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>
class SfxBaseController;
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 005eb77..d9cc04c 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -38,7 +38,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 6e5df25..226e678 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 652496c..bcf4e22 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 d0d20c3..0e5bc8a 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 9809f08..de0d975 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 33690e1..f553a5a 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 669cb80..7e5f8e9 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 e72c730..21d2dcb 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 2cabcc7..06167c5 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 cad178b..b5017b0 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>
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 1829226..a3f13d5 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 <vector>
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 2a8abc3..5b06035 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 4fe421e..1dbafe3f 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -17,7 +17,6 @@
#ifdef WNT
#include <postwin.h>
#endif
-#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 b0c7705..a5da168 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 66b3a90..8c6b4d0 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 c6b4401..bda2dc0 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -32,7 +32,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 b4d70b4..9c91032 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 8392cfd..341fadf 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>
More information about the Libreoffice-commits
mailing list