diff options
| author | Henry Castro <hcastro@collabora.com> | 2016-11-11 16:29:57 -0400 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-11-14 13:06:47 +0000 |
| commit | 32d0378284a42f0eba1df92555767a43be079117 (patch) | |
| tree | 95e7403be24a04d1f5c46c7d2440e2f0e94656bf /include/LibreOfficeKit | |
| parent | 65ba7e4dc4eac174bbf02570d6a43803b7b681ff (diff) | |
lok: add character parameter to renderFont
When client side request special character, it is very useful to send a
preview of the rendered font character
Conflicts:
desktop/source/lib/init.cxx
Change-Id: I1f5727163dfcc861add121e616bdb17881c28197
Reviewed-on: https://gerrit.libreoffice.org/30784
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'include/LibreOfficeKit')
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.h | 1 | ||||
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.hxx | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index c97655f94f8e..c7a2130315da 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -225,6 +225,7 @@ struct _LibreOfficeKitDocumentClass /// @see lok::Document::renderFont(). unsigned char* (*renderFont) (LibreOfficeKitDocument* pThis, const char* pFontName, + const char* pChar, int* pFontWidth, int* pFontHeight); diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index 7c90df53c2f2..1c9474ff88be 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -404,14 +404,15 @@ public: } /** - * Paints a font name to be displayed in the font list + * Paints a font name or character if provided to be displayed in the font list * @param pFontName the font to be painted */ inline unsigned char* renderFont(const char *pFontName, + const char *pChar, int *pFontWidth, int *pFontHeight) { - return mpDoc->pClass->renderFont(mpDoc, pFontName, pFontWidth, pFontHeight); + return mpDoc->pClass->renderFont(mpDoc, pFontName, pChar, pFontWidth, pFontHeight); } /** |