From 8a8623d819b3323fb978fccc4b01ec34bc6adaff Mon Sep 17 00:00:00 2001 From: Matteo Casalin Date: Wed, 4 Nov 2015 20:17:22 +0100 Subject: Use more proper integer types Change-Id: I9e1ac9f9a8d1954f570594df58c6421de13c79db --- svx/inc/svdibrow.hxx | 8 +++---- svx/source/svdraw/svdibrow.cxx | 49 ++++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 27 deletions(-) (limited to 'svx') diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index d492a9d8d9f9..bc1a0fb3753d 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -51,12 +51,12 @@ friend class ImpItemEdit; private: void ImpCtor(); - void ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum); - ImpItemListRow* ImpGetEntry(sal_uIntPtr nPos) const { return aList[nPos]; } + void ImpSetEntry(const ImpItemListRow& rEntry, std::size_t nEntryNum); + ImpItemListRow* ImpGetEntry(std::size_t nPos) const { return aList[nPos]; } void ImpSaveWhich(); void ImpRestoreWhich(); - sal_uIntPtr GetCurrentPos() const; - bool BeginChangeEntry(sal_uIntPtr nPos); + std::size_t GetCurrentPos() const; + bool BeginChangeEntry(std::size_t nPos); protected: virtual long GetRowCount() const override; diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index db7ee266d7a9..125c0071e345 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -18,6 +18,7 @@ */ #include +#include #include "editeng/fontitem.hxx" #include "svdibrow.hxx" @@ -63,6 +64,8 @@ using namespace com::sun::star; #define ITEMBROWSER_NAMECOL_ID 4 #define ITEMBROWSER_VALUECOL_ID 5 +#define ITEM_NOT_FOUND std::numeric_limits::max() + enum ItemType { ITEM_DONTKNOW, ITEM_BYTE, ITEM_INT16, ITEM_UINT16, ITEM_INT32, ITEM_UINT32, ITEM_ENUM, ITEM_BOOL, ITEM_FLAG, ITEM_STRING, ITEM_POINT, ITEM_RECT, ITEM_RANGE, ITEM_LRANGE, @@ -279,8 +282,8 @@ void _SdrItemBrowserControl::ImpCtor() void _SdrItemBrowserControl::Clear() { - sal_uIntPtr nCount=aList.size(); - for (sal_uIntPtr nNum=0; nNum=aList.size()) { + if (nAktPaintRow<0 || static_cast(nAktPaintRow)>=aList.size()) { return; } Rectangle aR(rRect); @@ -366,13 +369,13 @@ void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRe } } -sal_uIntPtr _SdrItemBrowserControl::GetCurrentPos() const +std::size_t _SdrItemBrowserControl::GetCurrentPos() const { - sal_uIntPtr nRet=CONTAINER_ENTRY_NOTFOUND; + std::size_t nRet=ITEM_NOT_FOUND; if (GetSelectRowCount()==1) { long nPos=static_cast(const_cast<_SdrItemBrowserControl *>(this))->FirstSelectedRow(); - if (nPos>=0 && (sal_uIntPtr)nPos=0 && static_cast(nPos)(nPos); } } return nRet; @@ -381,8 +384,8 @@ sal_uIntPtr _SdrItemBrowserControl::GetCurrentPos() const sal_uInt16 _SdrItemBrowserControl::GetCurrentWhich() const { sal_uInt16 nRet=0; - sal_uIntPtr nPos=GetCurrentPos(); - if (nPos!=CONTAINER_ENTRY_NOTFOUND) { + const std::size_t nPos=GetCurrentPos(); + if (nPos!=ITEM_NOT_FOUND) { nRet=ImpGetEntry(nPos)->nWhichId; } return nRet; @@ -390,8 +393,8 @@ sal_uInt16 _SdrItemBrowserControl::GetCurrentWhich() const void _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&) { - sal_uIntPtr nPos=GetCurrentPos(); - if (nPos!=CONTAINER_ENTRY_NOTFOUND) { + const std::size_t nPos=GetCurrentPos(); + if (nPos!=ITEM_NOT_FOUND) { BeginChangeEntry(nPos); } } @@ -400,8 +403,8 @@ void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt) { sal_uInt16 nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier(); bool bAusgewertet = false; - sal_uIntPtr nPos=GetCurrentPos(); - if (nPos!=CONTAINER_ENTRY_NOTFOUND) { + const std::size_t nPos=GetCurrentPos(); + if (nPos!=ITEM_NOT_FOUND) { if (nKeyCode==KEY_RETURN) { if (BeginChangeEntry(nPos)) bAusgewertet = true; } else if (nKeyCode==KEY_ESCAPE) { @@ -468,8 +471,8 @@ void _SdrItemBrowserControl::ImpRestoreWhich() { if (nLastWhich!=0) { bool bFnd = false; - sal_uIntPtr nCount=aList.size(); - sal_uIntPtr nNum; + const std::size_t nCount=aList.size(); + std::size_t nNum; for (nNum=0; nNumbComment) { @@ -488,7 +491,7 @@ void _SdrItemBrowserControl::ImpRestoreWhich() } } -bool _SdrItemBrowserControl::BeginChangeEntry(sal_uIntPtr nPos) +bool _SdrItemBrowserControl::BeginChangeEntry(std::size_t nPos) { BreakChangeEntry(); bool bRet = false; @@ -555,7 +558,7 @@ void _SdrItemBrowserControl::BreakChangeEntry() } } -void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum) +void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, std::size_t nEntryNum) { SAL_WARN_IF(nEntryNum > aList.size(), "svx", "trying to set item " << nEntryNum << "in a vector of size " << aList.size()); if (nEntryNum >= aList.size()) { @@ -1164,7 +1167,7 @@ IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, _SdrItemBrowserControl&, rBrowse, vo if (!bDel) { SfxPoolItem* pNewItem=aSet.Get(pEntry->nWhichId).Clone(); - long nLongVal = aNewText.toInt32(); + sal_Int32 nLongVal = aNewText.toInt32(); if (pEntry->bCanNum) { if (nLongVal>pEntry->nMax) nLongVal=pEntry->nMax; if (nLongValnMin) nLongVal=pEntry->nMin; @@ -1194,9 +1197,9 @@ IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, _SdrItemBrowserControl&, rBrowse, vo { aNewText = aNewText.replace(',', '.'); double nVal = aNewText.toFloat(); - nLongVal = (long)(nVal * 100 + 0.5); + nLongVal = static_cast(nVal * 100.0 + 0.5); } - static_cast(pNewItem)->SetValue((sal_Int32)nLongVal); + static_cast(pNewItem)->SetValue(nLongVal); } break; case ITEM_UINT32: static_cast(pNewItem)->SetValue(aNewText.toInt32()); break; case ITEM_ENUM : static_cast(pNewItem)->SetEnumValue((sal_uInt16)nLongVal); break; @@ -1233,12 +1236,12 @@ IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, _SdrItemBrowserControl&, rBrowse, vo static_cast(pNewItem)->SetStyleName(OUString()); } break; case ITEM_FONTHEIGHT: { - sal_uIntPtr nHgt=0; + sal_uInt32 nHgt=0; sal_uInt16 nProp=100; if (aNewText.indexOf('%') != -1) { - nProp=(sal_uInt16)nLongVal; + nProp=static_cast(nLongVal); } else { - nHgt=nLongVal; + nHgt=static_cast(nLongVal); } static_cast(pNewItem)->SetHeight(nHgt,nProp); } break; -- cgit