commit 18b03440b4dca084274a02d16a8a1545d629a4c1
author Mesut Çifci <mesutcifci97@gmail.com> Mon Jan 13 23:46:45 2020 +0300
committer Michael Stahl <michael.stahl@cib.de> Tue Jan 14 15:13:24 2020 +0100
tree 85372592ece4f591c0793680281279ab5bf14827
parent f8554b5053d17d39f71eca246e4ad7264f4998a8

tdf#75280: Convert inappropriate use of sal_uIntPtr to better integer types

Change-Id: I583e5758b999e2800e1372af3a6490b3b64fe96e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86717
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>

svx/source/items/numfmtsh.cxx

diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 8f39c00..f950eb0 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -375,7 +375,7 @@
{
    rpFontColor = nullptr;

    sal_uIntPtr nExistingFormat = pFormatter->GetEntryKey(rFormatStr, eCurLanguage);
    sal_uInt32 nExistingFormat = pFormatter->GetEntryKey(rFormatStr, eCurLanguage);
    if (nExistingFormat == NUMBERFORMAT_ENTRY_NOT_FOUND)
    {
        //  real preview - not implemented in NumberFormatter for text formats

svx/source/svdraw/svdpage.cxx

diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index c93d706..8012cf7 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -212,7 +212,7 @@
                    SdrEdgeObj* pDstEdge=dynamic_cast<SdrEdgeObj*>( pEdgeObjTmp );
                    if (pDstEdge!=nullptr) {
                        if (pSrcNode1!=nullptr) {
                            sal_uIntPtr nDstNode1=pSrcNode1->GetOrdNum();
                            sal_uInt32 nDstNode1=pSrcNode1->GetOrdNum();
                            SdrObject* pDstNode1=GetObj(nDstNode1);
                            if (pDstNode1!=nullptr) { // else we get an error!
                                pDstEdge->ConnectToNode(true,pDstNode1);
@@ -221,7 +221,7 @@
                            }
                        }
                        if (pSrcNode2!=nullptr) {
                            sal_uIntPtr nDstNode2=pSrcNode2->GetOrdNum();
                            sal_uInt32 nDstNode2=pSrcNode2->GetOrdNum();
                            SdrObject* pDstNode2=GetObj(nDstNode2);
                            if (pDstNode2!=nullptr) { // else the node was probably not selected
                                pDstEdge->ConnectToNode(false,pDstNode2);