[Libreoffice-commits] core.git: 2 commits - sc/source sd/source

[Libreoffice Gerrit user]

 sc/source/filter/xml/xmlexprt.cxx        |    3 +++
 sd/source/filter/eppt/pptx-epptooxml.cxx |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit d21298e3b108b0dfdb1515248068314757cf4dd7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 18 15:32:35 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Aug 18 19:48:26 2018 +0200

    coverity#1438401 assert nPrevIndex >= 0
    
    Change-Id: I1b6e4428aa44163bd098517ed654ea115c10daf7
    Reviewed-on: https://gerrit.libreoffice.org/59292
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 8d48be539110..c8e83c7c47d8 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -880,6 +880,7 @@ void ScXMLExport::ExportColumns(const sal_Int32 nTable, const ScRange& aColumnHe
             nColsRepeated = 1;
         }
     }
+    assert(nPrevIndex >= 0 && "coverity#1438402");
     WriteColumn(nPrevColumn, nColsRepeated, nPrevIndex, bPrevIsVisible);
     if (!bIsClosed)
         CloseHeaderColumn();
@@ -1486,6 +1487,7 @@ void ScXMLExport::OpenRow(const sal_Int32 nTable, const sal_Int32 nStartRow, con
                     ++nEqualRows;
                 else
                 {
+                    assert(nPrevIndex >= 0 && "coverity#1438402");
                     if (nRow < nEndRow)
                     {
                         ScRowFormatRanges* pTempRowFormatRanges = new ScRowFormatRanges(pRowFormatRanges.get());
@@ -1501,6 +1503,7 @@ void ScXMLExport::OpenRow(const sal_Int32 nTable, const sal_Int32 nStartRow, con
                 }
             }
         }
+        assert(nPrevIndex >= 0 && "coverity#1438402");
         OpenNewRow(nPrevIndex, nRow - nEqualRows, nEqualRows, bPrevHidden, bPrevFiltered);
     }
     else
commit 289abd076af14eeb4504cd4e33b49ef95009dd93
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 18 14:30:34 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Aug 18 19:48:16 2018 +0200

    coverity#1438403 Unchecked return value
    
    Change-Id: I7debe5eb1c366264cb94a52f63677f392cda647e
    Reviewed-on: https://gerrit.libreoffice.org/59291
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 69624d1c0752..d5b654e72b39 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1172,8 +1172,8 @@ void PowerPointExport::WriteAnimationNodeAnimate(const FSHelperPtr& pFS, const R
         {
             xMotion->getPath() >>= aPath;
             ::basegfx::B2DPolyPolygon aPolyPoly;
-            ::basegfx::utils::importFromSvgD(aPolyPoly, aPath, true, nullptr);
-            aPath = ::basegfx::utils::exportToSvgD(aPolyPoly, false, false, true, true);
+            if (::basegfx::utils::importFromSvgD(aPolyPoly, aPath, true, nullptr))
+                aPath = ::basegfx::utils::exportToSvgD(aPolyPoly, false, false, true, true);
         }
 
         pFS->startElementNS(XML_p, nXmlNodeType,