diff options
author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2019-11-27 12:36:16 -0500 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2019-11-27 22:33:51 +0100 |
commit | 13d409421aea7592e00925f359aa9eb4abd1d84a (patch) | |
tree | ed378ebcb3b33adc650d733f8a95c8f56e263550 | |
parent | Bump package version to 4.0.9-1 (diff) | |
download | online-13d409421aea7592e00925f359aa9eb4abd1d84a.tar.gz online-13d409421aea7592e00925f359aa9eb4abd1d84a.zip |
lok: update bundled headers
Change-Id: Idc30c17e135166d2ce07e64456abc9484fb69d76
Reviewed-on: https://gerrit.libreoffice.org/83935
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rw-r--r-- | bundled/include/LibreOfficeKit/LibreOfficeKit.h | 8 | ||||
-rw-r--r-- | bundled/include/LibreOfficeKit/LibreOfficeKit.hxx | 8 | ||||
-rw-r--r-- | bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h | 5 |
3 files changed, 18 insertions, 3 deletions
diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/bundled/include/LibreOfficeKit/LibreOfficeKit.h index 7f7c0c24a4..78a452a84d 100644 --- a/bundled/include/LibreOfficeKit/LibreOfficeKit.h +++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.h @@ -366,6 +366,14 @@ struct _LibreOfficeKitDocumentClass /// @see lok::Document::moveSelectedParts(). void (*moveSelectedParts) (LibreOfficeKitDocument* pThis, int nPosition, bool bDuplicate); + /// @see lok::Document::renderFontOrientation(). + unsigned char* (*renderFontOrientation) (LibreOfficeKitDocument* pThis, + const char* pFontName, + const char* pChar, + int* pFontWidth, + int* pFontHeight, + int pOrientation); + #endif // defined LOK_USE_UNSTABLE_API || defined LIBO_INTERNAL_ONLY }; diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx index da7c65b700..975cadbd7e 100644 --- a/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -495,9 +495,13 @@ public: unsigned char* renderFont(const char *pFontName, const char *pChar, int *pFontWidth, - int *pFontHeight) + int *pFontHeight, + int pOrientation=0) { - return mpDoc->pClass->renderFont(mpDoc, pFontName, pChar, pFontWidth, pFontHeight); + if (LIBREOFFICEKIT_DOCUMENT_HAS(mpDoc, renderFontOrientation)) + return mpDoc->pClass->renderFontOrientation(mpDoc, pFontName, pChar, pFontWidth, pFontHeight, pOrientation); + else + return mpDoc->pClass->renderFont(mpDoc, pFontName, pChar, pFontWidth, pFontHeight); } /** diff --git a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h index a686cdef41..8a003e35ff 100644 --- a/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h +++ b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h @@ -222,6 +222,10 @@ typedef enum * * Payload format is "width, height", i.e. clients get the new size without * having to do an explicit lok::Document::getDocumentSize() call. + * + * A size change is always preceeded by a series of + * LOK_CALLBACK_INVALIDATE_TILES events invalidating any areas + * need re-rendering to adapt. */ LOK_CALLBACK_DOCUMENT_SIZE_CHANGED = 13, @@ -564,7 +568,6 @@ typedef enum * "type" tells the type of the window the action is associated with * - "dialog" - window is a dialog * - "child" - window is a floating window (combo boxes, etc.) - * - "deck" - window is a docked/floating deck (i.e. the sidebar) * * "action" can take following values: * - "created" - window is created in the backend, client can render it now |