editeng/source/editeng/impedit.hxx | 2 - include/LibreOfficeKit/LibreOfficeKit.h | 6 +---- include/LibreOfficeKit/LibreOfficeKitTypes.h | 30 +++++++++++++++++++++++++++ include/editeng/editview.hxx | 2 - include/editeng/outliner.hxx | 2 - include/vcl/ITiledRenderable.hxx | 2 - 6 files changed, 36 insertions(+), 8 deletions(-)
New commits: commit 4bae1676e9b4109a1b97af65b78cad08e03edc19 Author: Miklos Vajna <[email protected]> Date: Fri Mar 13 09:14:16 2015 +0100 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 diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 613d25e..093aa10 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -53,7 +53,7 @@ #include <i18nlangtag/lang.h> #include <rtl/ref.hxx> #define LOK_USE_UNSTABLE_API -#include <LibreOfficeKit/LibreOfficeKit.h> +#include <LibreOfficeKit/LibreOfficeKitTypes.h> #include <boost/noncopyable.hpp> diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index ee217ed..c855988 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" { @@ -30,10 +32,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 0000000..338f8b8 --- /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 97bd6a2..3e70126 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 441183c..e1623ec 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 6bd75a4..5340f06 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> _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
