diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-29 17:27:04 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-20 18:02:06 +0200 |
| commit | 87251b0c5d769020a8469064a7e4be9c36a5f1ee (patch) | |
| tree | 093bf869d7891cc7b656e0bd9661566ab1fdc60a /desktop/qa | |
| parent | 43ebf466fef79b055e4a905ab4abf18da190180a (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>
(cherry picked from commit 615c37503cffa92a663245d7cb140f316ace0506)
Diffstat (limited to 'desktop/qa')
| -rw-r--r-- | desktop/qa/desktop_lib/test_desktop_lib.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index f59370b57dd0..74a75ed31983 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -294,8 +294,8 @@ void DesktopLOKTest::testCreateView() LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); CPPUNIT_ASSERT_EQUAL(1, pDocument->m_pDocumentClass->getViews(pDocument)); - std::uintptr_t nId0 = pDocument->m_pDocumentClass->getView(pDocument); - std::uintptr_t nId1 = pDocument->m_pDocumentClass->createView(pDocument); + int nId0 = pDocument->m_pDocumentClass->getView(pDocument); + int nId1 = pDocument->m_pDocumentClass->createView(pDocument); CPPUNIT_ASSERT_EQUAL(2, pDocument->m_pDocumentClass->getViews(pDocument)); // Make sure the created view is the active one, then switch to the old |