summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-13 14:10:20 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-13 14:56:25 +0000
commit70bf48667272b2d4ab5f3148dc9f66bf5c3f179c (patch)
tree4f00f046997602466e55d4a2fab050e62176d7a5
parent1c71cef7f80c342b01d66435b0902ecc8f1890a2 (diff)
coverity#705539 Unintentional integer overflow
Change-Id: I3d170feeabcdd5f1ac3e64e1018edfb30b2b3c4c
-rw-r--r--sw/source/filter/ww8/ww8par.hxx10
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx2
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 57877bcdbcb1..61fe885c2e1f 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1243,11 +1243,11 @@ private:
OUString sBaseURL;
// Ini-Flags:
- sal_uLong nIniFlags; // Flags aus der writer.ini
- sal_uLong nIniFlags1; // dito ( zusaetzliche Flags )
- sal_uLong nFieldFlags; // dito fuer Feldern
- sal_uLong nFieldTagAlways[3]; // dito fuers Taggen von Feldern
- sal_uLong nFieldTagBad[3]; // dito fuers Taggen von nicht importierbaren F.
+ sal_uInt32 nIniFlags; // Flags aus der writer.ini
+ sal_uInt32 nIniFlags1; // dito ( zusaetzliche Flags )
+ sal_uInt32 nFieldFlags; // dito fuer Feldern
+ sal_uInt32 nFieldTagAlways[3]; // dito fuers Taggen von Feldern
+ sal_uInt32 nFieldTagBad[3]; // dito fuers Taggen von nicht importierbaren F.
bool m_bRegardHindiDigits; // import digits in CTL scripts as Hindi numbers
WW8_CP nDrawCpO; // Anfang der Txbx-SubDocs
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 93dc8b357cc6..974ff4df0197 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -836,7 +836,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
sal_uInt16 n = (aF.nId <= eMax) ? aF.nId : static_cast<sal_uInt16>(eMax);
sal_uInt16 nI = n / 32; // # des sal_uInt32
- sal_uLong nMask = 1 << ( n % 32 ); // Maske fuer Bits
+ sal_uInt32 nMask = 1 << ( n % 32 ); // Maske fuer Bits
if ((sizeof(nFieldTagAlways)/sizeof(nFieldTagAlways[0])) <= nI)
{ // if indexes larger than 95 are needed, then a new configuration