diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-29 17:27:04 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-30 06:16:28 +0000 |
| commit | 615c37503cffa92a663245d7cb140f316ace0506 (patch) | |
| tree | 9d1adcf7385f705e38fbbb925c1488962954a39c /include/LibreOfficeKit | |
| parent | 76c2125ee3eeb64a95501c26c2fa660cd0f8818c (diff) | |
LOK: change back type of view ids to int
Commit 45c2410041c48c22bd860efb42d4daadad7869b0 (LOK: change type of
view ids to uintptr_t, 2016-06-17) fixed the problem of view IDs being
reused for the price of random IDs, which makes debugging harder.
Implement a simple shellToView() function that makes sure view IDs are
not reused, and stop exposing view shell pointer addresses, which allows
reverting the LOK API change.
Change-Id: I63089e6de08ee7e1c7706757d43a11f6cf4d6e06
Reviewed-on: https://gerrit.libreoffice.org/26773
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'include/LibreOfficeKit')
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h b/include/LibreOfficeKit/LibreOfficeKit.h index 559d28ae24c7..81d65c1ace38 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.h +++ b/include/LibreOfficeKit/LibreOfficeKit.h @@ -212,13 +212,13 @@ struct _LibreOfficeKitDocumentClass void (*setClientVisibleArea) (LibreOfficeKitDocument* pThis, int nX, int nY, int nWidth, int nHeight); /// @see lok::Document::createView(). - uintptr_t (*createView) (LibreOfficeKitDocument* pThis); + int (*createView) (LibreOfficeKitDocument* pThis); /// @see lok::Document::destroyView(). - void (*destroyView) (LibreOfficeKitDocument* pThis, uintptr_t nId); + void (*destroyView) (LibreOfficeKitDocument* pThis, int nId); /// @see lok::Document::setView(). - void (*setView) (LibreOfficeKitDocument* pThis, uintptr_t nId); + void (*setView) (LibreOfficeKitDocument* pThis, int nId); /// @see lok::Document::getView(). - uintptr_t (*getView) (LibreOfficeKitDocument* pThis); + int (*getView) (LibreOfficeKitDocument* pThis); /// @see lok::Document::getViews(). int (*getViews) (LibreOfficeKitDocument* pThis); |