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/sfx2 | |
| 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/sfx2')
| -rw-r--r-- | include/sfx2/lokhelper.hxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx index 4cfe0817539f..e7dfed49f511 100644 --- a/include/sfx2/lokhelper.hxx +++ b/include/sfx2/lokhelper.hxx @@ -12,7 +12,6 @@ #include <sfx2/dllapi.h> #include <cstddef> -#include <cstdint> #include <rtl/string.hxx> class SfxViewShell; @@ -21,13 +20,13 @@ class SFX2_DLLPUBLIC SfxLokHelper { public: /// Create a new view shell from the current view frame. - static std::uintptr_t createView(); + static int createView(); /// Destroy a view shell from the global shell list. - static void destroyView(std::uintptr_t nId); + static void destroyView(int nId); /// Set a view shell as current one. - static void setView(std::uintptr_t nId); + static void setView(int nId); /// Get the currently active view. - static std::uintptr_t getView(SfxViewShell* pViewShell = nullptr); + static int getView(SfxViewShell* pViewShell = nullptr); /// Get the number of views of the current object shell. static std::size_t getViews(); |