[Libreoffice-commits] core.git: sfx2/source

[Julien Nabet (via logerrit)]

 sfx2/source/appl/helpinterceptor.cxx |    6 +++---
 sfx2/source/appl/helpinterceptor.hxx |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 63d4d3421fec5a4e9e88dcee2992cda38cc7452a
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Wed Sep 9 08:14:49 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Sep 9 09:47:58 2020 +0200

    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 at redhat.com>

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 );