summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-07-15 15:23:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-07-15 17:54:23 +0200
commit08d7df9b057c62fbd0e3da14ab6a11088656f310 (patch)
tree146d8ad39226f6f64e2327a567b5c9a17164d585 /sc
parent414a907d11d931b68a0b320d646c3ca06e58052c (diff)
coverity#1415092 Logically dead code (golden)
this was detected after commit 85ff2eafc692f6f0d33ac611600935a96058f20a Date: Thu Jul 13 23:32:46 2017 +0530 Moving legacy contexts to FastContexts: but exists since commit 3d23002b6c1189e18922dbcbfbd5d271ecd09c2a Date: Tue Sep 4 05:26:24 2001 +0000 #91850#; fix the problems of called assertions which resulted in... else if (IsXMLToken(aLocalName, XML_TYPE)) { if (...) ... else if (IsXMLToken(aLocalName, XML_TABLE)) nActionType = SC_CAT_DELETE_TABS; } ScXMLInsertionContext::ScXMLInsertionContext though doesn't suffer from this Change-Id: I8c5fced7a81d892cc6208a1d9a2c78a692e02090 Reviewed-on: https://gerrit.libreoffice.org/39998 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/xml/XMLTrackedChangesContext.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index ffe7085ee1f0..1657ea40687f 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -1401,13 +1401,9 @@ ScXMLDeletionContext::ScXMLDeletionContext( ScXMLImport& rImport,
break;
case XML_ELEMENT( TABLE, XML_TYPE ):
if (IsXMLToken( aIter, XML_ROW ))
- {
nActionType = SC_CAT_DELETE_ROWS;
- }
- else if ((nToken & TOKEN_MASK) == XML_TABLE)
- {
+ else if (IsXMLToken( aIter, XML_TABLE ))
nActionType = SC_CAT_DELETE_TABS;
- }
break;
case XML_ELEMENT( TABLE, XML_POSITION ):
nPosition = aIter.toInt32();