diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-09-09 08:14:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-09-09 09:47:58 +0200 |
| commit | 63d4d3421fec5a4e9e88dcee2992cda38cc7452a (patch) | |
| tree | fc77ad91041b1cf26abca0dac51fdf40db0a1966 /sfx2/source | |
| parent | 94e6eafefd5ca9e19e6bd5d6aa70c1f7ceaf6132 (diff) | |
tdf#75280: Convert inappropriate use of sal_uIntPtr (sfx2)
Change-Id: Ie034109eb1d199d0f856f19ade7b479b66867f2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102282
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/appl/helpinterceptor.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/appl/helpinterceptor.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index 54cf5cf06315..b69ca9fedd5f 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -187,12 +187,12 @@ void SAL_CALL HelpInterceptor_Impl::dispatch( if ( m_vHistoryUrls.empty() ) return; - sal_uIntPtr nPos = ( bBack && m_nCurPos > 0 ) ? --m_nCurPos + size_t nPos = ( bBack && m_nCurPos > 0 ) ? --m_nCurPos : ( !bBack && m_nCurPos < m_vHistoryUrls.size() - 1 ) ? ++m_nCurPos - : ULONG_MAX; + : std::numeric_limits<std::size_t>::max(); - if ( nPos < ULONG_MAX ) + if ( nPos < std::numeric_limits<std::size_t>::max() ) { m_pWindow->loadHelpContent(m_vHistoryUrls[nPos], false); // false => don't add item to history again! } diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index 8d66cedf4830..2f08b1ac3b71 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -53,7 +53,7 @@ friend class SfxHelpWindow_Impl; std::vector<OUString> m_vHistoryUrls; VclPtr<SfxHelpWindow_Impl> m_pWindow; - sal_uIntPtr m_nCurPos; + size_t m_nCurPos; OUString m_aCurrentURL; void addURL( const OUString& rURL ); |