diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-13 09:14:16 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-16 09:38:10 +0100 |
commit | 39bf82439fe9c753a09d9d77dbcc8e387bbe2125 (patch) | |
tree | 0da700448594253d907c598ab46478d954293818 /include | |
parent | 5df6cd16a2604163ee8e19edadba48de65ba205e (diff) |
LOK: extract the callback typedef to a separate LibreOfficeKitTypes.h header
With this, most LO code can avoid rebuilding when touching
LibreOfficeKit.h, something that caused a mass-rebuild earlier.
Change-Id: I4880fc7ad82cc535377b2b602897e3172ffa480b
Diffstat (limited to 'include')
-rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.h | 6 | ||||
-rw-r--r-- | include/LibreOfficeKit/LibreOfficeKitTypes.h | 30 | ||||
-rw-r--r-- | include/editeng/editview.hxx | 2 | ||||
-rw-r--r-- | include/editeng/outliner.hxx | 2 | ||||
-rw-r--r-- | include/vcl/ITiledRenderable.hxx | 2 |
5 files changed, 35 insertions, 7 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index 7f9a515c3487..f10e5e38efb9 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -12,6 +12,8 @@ #include <stddef.h> +#include <LibreOfficeKit/LibreOfficeKitTypes.h> + #ifdef __cplusplus extern "C" { @@ -29,10 +31,6 @@ typedef struct _LibreOfficeKitDocumentClass LibreOfficeKitDocumentClass; #define LIBREOFFICEKIT_HAS(pKit,member) LIBREOFFICEKIT_HAS_MEMBER(LibreOfficeKitClass,member,(pKit)->pClass->nSize) -#ifdef LOK_USE_UNSTABLE_API -typedef void (*LibreOfficeKitCallback)(int nType, const char* pPayload, void* pData); -#endif // LOK_USE_UNSTABLE_API - struct _LibreOfficeKit { LibreOfficeKitClass* pClass; diff --git a/include/LibreOfficeKit/LibreOfficeKitTypes.h b/include/LibreOfficeKit/LibreOfficeKitTypes.h new file mode 100644 index 000000000000..338f8b86156a --- /dev/null +++ b/include/LibreOfficeKit/LibreOfficeKitTypes.h @@ -0,0 +1,30 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * 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/. + */ + +#ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_TYPES_H +#define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_TYPES_H + +#include <stddef.h> + +#ifdef __cplusplus +extern "C" +{ +#endif + +#ifdef LOK_USE_UNSTABLE_API +typedef void (*LibreOfficeKitCallback)(int nType, const char* pPayload, void* pData); +#endif // LOK_USE_UNSTABLE_API + +#ifdef __cplusplus +} +#endif + +#endif // INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKIT_TYPES_H + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 97bd6a2f0fc5..3e7012619e7c 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -28,7 +28,7 @@ #include <tools/gen.hxx> #include <vcl/cursor.hxx> #define LOK_USE_UNSTABLE_API -#include <LibreOfficeKit/LibreOfficeKit.h> +#include <LibreOfficeKit/LibreOfficeKitTypes.h> class EditEngine; class ImpEditEngine; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 441183ce0ec3..e1623ec12e7a 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -37,7 +37,7 @@ #include <tools/rtti.hxx> #define LOK_USE_UNSTABLE_API -#include <LibreOfficeKit/LibreOfficeKit.h> +#include <LibreOfficeKit/LibreOfficeKitTypes.h> #include <vector> class OutlinerEditEng; diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx index 6bd75a477c7b..5340f06d7ec0 100644 --- a/include/vcl/ITiledRenderable.hxx +++ b/include/vcl/ITiledRenderable.hxx @@ -12,7 +12,7 @@ #define INCLUDED_VCL_ITILEDRENDERABLE_HXX #define LOK_USE_UNSTABLE_API -#include <LibreOfficeKit/LibreOfficeKit.h> +#include <LibreOfficeKit/LibreOfficeKitTypes.h> #include <tools/gen.hxx> #include <vcl/virdev.hxx> |