loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h | 7 +++++++ loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h | 7 ++++++- loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-)
New commits: commit 9e9974e18638bc2ec04ea5de98a1dcde5d401626 Author: Jan Holesovsky <ke...@collabora.com> Date: Mon Nov 16 20:29:21 2015 +0100 loolwsd: Update LOK headers to get setClientZoom and LOK_CALLBACK_CELL_FORMULA. diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h index c887f5f..0321037 100644 --- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h +++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h @@ -181,6 +181,13 @@ struct _LibreOfficeKitDocumentClass /// @see lok::Document::getCommandValues(). char* (*getCommandValues) (LibreOfficeKitDocument* pThis, const char* pCommand); + /// @see lok::Document::setClientZoom(). + void (*setClientZoom) (LibreOfficeKitDocument* pThis, + int nTilePixelWidth, + int nTilePixelHeight, + int nTileTwipWidth, + int nTileTwipHeight); + /// @see lok::Document::createView(). int (*createView) (LibreOfficeKitDocument* pThis); /// @see lok::Document::destroyView(). diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h index 37837ea..7b23fcb 100644 --- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h +++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h @@ -209,7 +209,12 @@ typedef enum * * Payload is a css mouse pointer style. */ - LOK_CALLBACK_MOUSE_POINTER + LOK_CALLBACK_MOUSE_POINTER, + + /** + * The text content of the formula bar in Calc. + */ + LOK_CALLBACK_CELL_FORMULA } LibreOfficeKitCallbackType; diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h index f18e3ca..e2af109 100644 --- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h +++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h @@ -76,7 +76,8 @@ extern "C" #else - #include <windows.h> + #include "prewin.h" + #include "postwin.h" #define TARGET_LIB "sofficeapp" ".dll" #define TARGET_MERGED_LIB "mergedlo" ".dll" #define SEPARATOR '\\' _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits