summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorChris Laplante <mostthingsweb@gmail.com>2014-04-09 18:17:34 -0400
committerCaolán McNamara <caolanm@redhat.com>2014-04-17 16:36:36 +0000
commitc34cc21244d74f115165e1893f03b9c62a0eef2b (patch)
tree0b48e43fa398664f53a61e5588b377f304bac4e2 /sw/source/filter
parent91821848a3a50229b8b96e91e9eb053a8ebc5d9a (diff)
cppcheck: Fix redundant assignments in the sw module
Change-Id: I5f266ced31295b327cdd7075b2e9d66698a01ade Reviewed-on: https://gerrit.libreoffice.org/8914 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/xml/swxml.cxx1
-rw-r--r--sw/source/filter/xml/xmlithlp.cxx1
2 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 2fb7a034a059..1073937bb5cb 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -676,6 +676,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
*pArgs++ <<= aLateInitSettings;
Sequence<Any> aEmptyArgs( 3 );
+ // cppcheck-suppress redundantAssignment
pArgs = aEmptyArgs.getArray();
*pArgs++ <<= xInfoSet;
*pArgs++ <<= xStatusIndicator;
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 97d21b816030..aade817ba8ec 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -292,7 +292,6 @@ void sw_frmitems_MergeXMLVertPos( SvxGraphicPosition& ePos,
case GPOS_LT:
case GPOS_LM:
case GPOS_LB:
- ePos = GPOS_MT==eVert ? GPOS_LT : (GPOS_MM==eVert ? GPOS_LM : GPOS_LB);
ePos = eVert;
break;