sc/source/filter/xml/XMLTrackedChangesContext.cxx | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 08d7df9b057c62fbd0e3da14ab6a11088656f310
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Jul 15 15:23:17 2017 +0100
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 <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
