diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-10-30 15:22:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-10-30 17:36:18 +0100 |
| commit | 06b39e3f1b9037a1368f83b7dc948a10cc34c981 (patch) | |
| tree | 353fe781a8f3b116934e5f0ca7594b2561d0a75c | |
| parent | 8d6c7085e9981d5f91525ae5cf44c426b4cf777c (diff) | |
TNumberedItemHash NumberedCollection::m_lComponents is indexed on pointers...
...reinterpret_cast'ed to sal_IntPtr, so consistently use sal_IntPtr throughout
here
Change-Id: If0085c2ac7e0e2c755ec034766095baa11a1b08c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105071
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | comphelper/source/misc/numberedcollection.cxx | 3 | ||||
| -rw-r--r-- | include/comphelper/numberedcollection.hxx | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index e0615656c231..8252a306330b 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -21,7 +21,6 @@ #include <comphelper/numberedcollection.hxx> #include <com/sun/star/frame/UntitledNumbersConst.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <tools/long.hxx> namespace comphelper{ @@ -230,7 +229,7 @@ OUString SAL_CALL NumberedCollection::getUntitledPrefix() void NumberedCollection::impl_cleanUpDeadItems ( TNumberedItemHash& lItems , const TDeadItemList& lDeadItems) { - for (const tools::Long& rDeadItem : lDeadItems) + for (const sal_IntPtr& rDeadItem : lDeadItems) { lItems.erase(rDeadItem); } diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx index 9ba619a94eb3..cafe975b59c7 100644 --- a/include/comphelper/numberedcollection.hxx +++ b/include/comphelper/numberedcollection.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase.hxx> -#include <tools/long.hxx> #include <unordered_map> #include <vector> @@ -59,10 +58,10 @@ class COMPHELPER_DLLPUBLIC NumberedCollection final : private ::cppu::BaseMutex }; typedef std::unordered_map< - tools::Long, + sal_IntPtr, TNumberedItem > TNumberedItemHash; - typedef ::std::vector< tools::Long > TDeadItemList; + typedef ::std::vector< sal_IntPtr > TDeadItemList; // interface |