diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-04-18 13:18:32 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-20 20:40:18 +0100 |
commit | 49b981c6b248e00ae3a6e28dd568920a6149cf75 (patch) | |
tree | 91e63f22a079ed76fee1b1a1a0c4d063fb68bfdb /sw/source/filter/ww8 | |
parent | b1c167b4f5606a46c1bf484628332e8c6eb021fb (diff) |
coverity#705541 Unintentional integer overflow
Change-Id: I6fbafabe98de3b168a8f79c4c2fde4a4537f6eb1
Diffstat (limited to 'sw/source/filter/ww8')
-rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 16 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8scan.hxx | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index f6929a3c7e96..488d94f09e83 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -943,7 +943,7 @@ WW8PLCFx_PCDAttrs::WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, { } -sal_uLong WW8PLCFx_PCDAttrs::GetIdx() const +sal_uInt32 WW8PLCFx_PCDAttrs::GetIdx() const { return 0; } @@ -1141,7 +1141,7 @@ sal_uLong WW8PLCFx_PCD::GetIMax() const return pPcdI ? pPcdI->GetIMax() : 0; } -sal_uLong WW8PLCFx_PCD::GetIdx() const +sal_uInt32 WW8PLCFx_PCD::GetIdx() const { return pPcdI ? pPcdI->GetIdx() : 0; } @@ -2913,9 +2913,9 @@ WW8PLCFx_Fc_FKP::~WW8PLCFx_Fc_FKP() delete pPCDAttrs; } -sal_uLong WW8PLCFx_Fc_FKP::GetIdx() const +sal_uInt32 WW8PLCFx_Fc_FKP::GetIdx() const { - sal_uLong u = pPLCF->GetIdx() << 8; + sal_uInt32 u = pPLCF->GetIdx() << 8; if (pFkp) u |= pFkp->GetIdx(); return u; @@ -3398,7 +3398,7 @@ WW8PLCFx_SEPX::~WW8PLCFx_SEPX() delete[] pSprms; } -sal_uLong WW8PLCFx_SEPX::GetIdx() const +sal_uInt32 WW8PLCFx_SEPX::GetIdx() const { return pPLCF ? pPLCF->GetIdx() : 0; } @@ -3574,7 +3574,7 @@ WW8PLCFx_SubDoc::~WW8PLCFx_SubDoc() delete pTxt; } -sal_uLong WW8PLCFx_SubDoc::GetIdx() const +sal_uInt32 WW8PLCFx_SubDoc::GetIdx() const { // Probably pTxt ... no need for it if( pRef ) @@ -3695,7 +3695,7 @@ WW8PLCFx_FLD::~WW8PLCFx_FLD() delete pPLCF; } -sal_uLong WW8PLCFx_FLD::GetIdx() const +sal_uInt32 WW8PLCFx_FLD::GetIdx() const { return pPLCF ? pPLCF->GetIdx() : 0; } @@ -3972,7 +3972,7 @@ WW8PLCFx_Book::~WW8PLCFx_Book() delete pBook[0]; } -sal_uLong WW8PLCFx_Book::GetIdx() const +sal_uInt32 WW8PLCFx_Book::GetIdx() const { return nIMax ? pBook[0]->GetIdx() : 0; } diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index 30e1f249e04f..57dcf19cf30d 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -391,7 +391,7 @@ public: } virtual ~WW8PLCFx() {} bool IsSprm() const { return bIsSprm; } - virtual sal_uLong GetIdx() const = 0; + virtual sal_uInt32 GetIdx() const = 0; virtual void SetIdx( sal_uLong nIdx ) = 0; virtual sal_uLong GetIdx2() const; virtual void SetIdx2( sal_uLong nIdx ); @@ -427,7 +427,7 @@ private: public: WW8PLCFx_PCDAttrs(ww::WordVersion eVersion, WW8PLCFx_PCD* pPLCFx_PCD, const WW8ScannerBase* pBase ); - virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE; virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; virtual WW8_FC Where() SAL_OVERRIDE; @@ -453,7 +453,7 @@ public: WW8_CP nStartCp, bool bVer67P); virtual ~WW8PLCFx_PCD(); virtual sal_uLong GetIMax() const; - virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE; virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; virtual WW8_FC Where() SAL_OVERRIDE; @@ -590,7 +590,7 @@ public: WW8PLCFx_Fc_FKP( SvStream* pSt, SvStream* pTblSt, SvStream* pDataSt, const WW8Fib& rFib, ePLCFT ePl, WW8_FC nStartFcL ); virtual ~WW8PLCFx_Fc_FKP(); - virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE; virtual bool SeekPos(WW8_FC nFcPos) SAL_OVERRIDE; virtual WW8_FC Where() SAL_OVERRIDE; @@ -655,7 +655,7 @@ public: WW8PLCFx_SEPX( SvStream* pSt, SvStream* pTblxySt, const WW8Fib& rFib, WW8_CP nStartCp ); virtual ~WW8PLCFx_SEPX(); - virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE; long GetIMax() const { return ( pPLCF ) ? pPLCF->GetIMax() : 0; } virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; @@ -685,7 +685,7 @@ public: WW8PLCFx_SubDoc(SvStream* pSt, ww::WordVersion eVersion, WW8_CP nStartCp, long nFcRef, long nLenRef, long nFcTxt, long nLenTxt, long nStruc = 0); virtual ~WW8PLCFx_SubDoc(); - virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE; virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; virtual WW8_FC Where() SAL_OVERRIDE; @@ -716,7 +716,7 @@ private: public: WW8PLCFx_FLD(SvStream* pSt, const WW8Fib& rMyFib, short nType); virtual ~WW8PLCFx_FLD(); - virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; virtual void SetIdx( sal_uLong nIdx ) SAL_OVERRIDE; virtual bool SeekPos(WW8_CP nCpPos) SAL_OVERRIDE; virtual WW8_FC Where() SAL_OVERRIDE; @@ -748,7 +748,7 @@ public: WW8PLCFx_Book(SvStream* pTblSt,const WW8Fib& rFib); virtual ~WW8PLCFx_Book(); long GetIMax() const { return nIMax; } - virtual sal_uLong GetIdx() const SAL_OVERRIDE; + virtual sal_uInt32 GetIdx() const SAL_OVERRIDE; virtual void SetIdx( sal_uLong nI ) SAL_OVERRIDE; virtual sal_uLong GetIdx2() const SAL_OVERRIDE; virtual void SetIdx2( sal_uLong nIdx ) SAL_OVERRIDE; |