diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-11-05 10:15:38 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-05 14:58:00 +0000 |
| commit | 12bcfec04fcbe6425e327109ad47cd2b2b80d2bd (patch) | |
| tree | b57ac6784ce892defa6d06fd5974318c8ffb6972 /sw | |
| parent | ea272d9fe4bf2dc7419f76e2ddee707d768ccd50 (diff) | |
markup with event type not checker type
Change-Id: I14c0c5d90b67000cb4fe9e6be647854abfe784da
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/access/acccontext.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/docnode/node.cxx | 4 | ||||
| -rw-r--r-- | sw/source/core/frmedt/fecopy.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/htmlform.cxx | 7 | ||||
| -rw-r--r-- | sw/source/uibase/envelp/labelcfg.cxx | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 7a25d12697c3..9b181a487c64 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -243,6 +243,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, GetMap() ); } break; + // coverity[dead_error_begin] - following conditions exist to avoid compiler warning case Action::NONE: break; } diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 3188fedea780..ee5a6214dcc3 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -1614,7 +1614,9 @@ const SfxPoolItem* SwCntntNode::GetNoCondAttr( sal_uInt16 nWhich, { if( !GetpSwAttrSet() || ( SfxItemState::SET != GetpSwAttrSet()->GetItemState( nWhich, false, &pFnd ) && bInParents )) - ((SwFmt*)GetRegisteredIn())->GetItemState( nWhich, bInParents, &pFnd ); + { + (void)((SwFmt*)GetRegisteredIn())->GetItemState( nWhich, bInParents, &pFnd ); + } } // undo change of issue #i51029# // Note: <GetSwAttrSet()> returns <mpAttrSet>, if set, otherwise it returns diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index 3669a5902734..4f10aebca39f 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -965,7 +965,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc, bool bIncludingPageFrames ) else if( FLY_AT_FLY == aAnchor.GetAnchorId() ) { Point aPt; - lcl_SetAnchor( *PCURCRSR->GetPoint(), PCURCRSR->GetNode(), + (void)lcl_SetAnchor( *PCURCRSR->GetPoint(), PCURCRSR->GetNode(), 0, aPt, *this, aAnchor, aPt, false ); } diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index cbd2e2f112d2..a9c43e8c3e99 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -1126,9 +1126,6 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( sal_Int16 nVertOri = text::VertOrientation::NONE; switch( eVertOri ) { - case text::VertOrientation::NONE: - nVertOri = text::VertOrientation::NONE; - break; case text::VertOrientation::TOP: nVertOri = text::VertOrientation::TOP; break; @@ -1156,6 +1153,10 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl( case text::VertOrientation::LINE_BOTTOM: nVertOri = text::VertOrientation::LINE_BOTTOM; break; + // coverity[dead_error_begin] - following conditions exist to avoid compiler warning + case text::VertOrientation::NONE: + nVertOri = text::VertOrientation::NONE; + break; } aTmp <<= (sal_Int16)nVertOri ; xShapePropSet->setPropertyValue("VertOrient", aTmp ); diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx index 232faa918344..809df914ea95 100644 --- a/sw/source/uibase/envelp/labelcfg.cxx +++ b/sw/source/uibase/envelp/labelcfg.cxx @@ -99,7 +99,7 @@ SwLabelConfig::SwLabelConfig() : res == xmlreader::XmlReader::RESULT_BEGIN && name.equals("manufacturer")); // Get the name - reader.nextAttribute(&nsId, &name); + (void)reader.nextAttribute(&nsId, &name); assert( nsId == xmlreader::XmlReader::NAMESPACE_NONE && name.equals("name")); |