From ef5471959f21ebc4599146d672165513d92d344a Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 11 Dec 2017 11:59:04 +0200
Subject: sal_uIntPtr->sal_uInt32 in m_nMIMEIndex

Change-Id: I1373f11f07679569ef338178e56ffd269baf3c30
Reviewed-on: https://gerrit.libreoffice.org/46224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 include/tools/inetmsg.hxx     | 14 +++++++-------
 tools/source/inet/inetmsg.cxx |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/tools/inetmsg.hxx b/include/tools/inetmsg.hxx
index e1b26dbe43b7..445c3a60922c 100644
--- a/include/tools/inetmsg.hxx
+++ b/include/tools/inetmsg.hxx
@@ -78,14 +78,14 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC INetMIMEMessage
 
     SvLockBytesRef  m_xDocLB;
 
-    ::std::map<InetMessageMime, sal_uIntPtr>  m_nMIMEIndex;
+    ::std::map<InetMessageMime, sal_uInt32>   m_nMIMEIndex;
     INetMIMEMessage*                          pParent;
     ::std::vector< std::unique_ptr<INetMIMEMessage> >
                                               aChildren;
     OString                 m_aBoundary;
 
     OUString GetHeaderValue_Impl (
-        sal_uIntPtr nIndex) const
+        sal_uInt32 nIndex) const
     {
         if ( nIndex < m_aHeaderList.size() ) {
             return INetMIME::decodeHeaderFieldBody(m_aHeaderList[ nIndex ]->GetValue());
@@ -95,7 +95,7 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC INetMIMEMessage
     }
 
     void SetHeaderField_Impl (
-        const INetMessageHeader &rHeader, sal_uIntPtr &rnIndex)
+        const INetMessageHeader &rHeader, sal_uInt32 &rnIndex)
     {
         INetMessageHeader *p = new INetMessageHeader (rHeader);
         if (m_aHeaderList.size() <= rnIndex)
@@ -112,7 +112,7 @@ class SAL_WARN_UNUSED TOOLS_DLLPUBLIC INetMIMEMessage
     void SetHeaderField_Impl (
         const OString &rName,
         const OUString &rValue,
-        sal_uIntPtr &rnIndex);
+        sal_uInt32 &rnIndex);
 
     bool IsMessage() const
     {
@@ -127,9 +127,9 @@ public:
     INetMIMEMessage();
     ~INetMIMEMessage();
 
-    sal_uIntPtr GetHeaderCount() const { return m_aHeaderList.size(); }
+    sal_uInt32 GetHeaderCount() const { return m_aHeaderList.size(); }
 
-    INetMessageHeader GetHeaderField (sal_uIntPtr nIndex) const
+    INetMessageHeader GetHeaderField (sal_uInt32 nIndex) const
     {
         if ( nIndex < m_aHeaderList.size() ) {
             return *m_aHeaderList[ nIndex ];
@@ -169,7 +169,7 @@ public:
         return aType.matchIgnoreAsciiCase("multipart/");
     }
 
-    INetMIMEMessage* GetChild (sal_uIntPtr nIndex) const
+    INetMIMEMessage* GetChild (sal_uInt32 nIndex) const
     {
         return ( nIndex < aChildren.size() ) ? aChildren[ nIndex ].get() : nullptr;
     }
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index b3dc426ad7b6..82b23232441f 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -30,7 +30,7 @@
 void INetMIMEMessage::SetHeaderField_Impl (
     const OString &rName,
     const OUString &rValue,
-    sal_uIntPtr &rnIndex)
+    sal_uInt32 &rnIndex)
 {
     SetHeaderField_Impl (
         INetMessageHeader (rName, rValue.toUtf8()), rnIndex);
@@ -213,7 +213,7 @@ INetMIMEMessage::INetMIMEMessage()
     : pParent(nullptr)
 {
     for (sal_uInt16 i = 0; i < static_cast<int>(InetMessageMime::NUMHDR); i++)
-        m_nMIMEIndex[static_cast<InetMessageMime>(i)] = CONTAINER_ENTRY_NOTFOUND;
+        m_nMIMEIndex[static_cast<InetMessageMime>(i)] = SAL_MAX_UINT32;
 }
 
 INetMIMEMessage::~INetMIMEMessage()
-- 
cgit