[Libreoffice-commits] core.git: 2 commits - oox/source svx/source

[Caolán McNamara (via logerrit)]

 oox/source/drawingml/shape.cxx |    4 ++--
 svx/source/xoutdev/xattr.cxx   |   12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 6d6b574328bbdda9ae22347ad8ebe34e0f1173be
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Aug 7 08:46:19 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Aug 7 11:05:33 2019 +0200

    crashtesting: null deref on import of fdo62183-3.pptx
    
    Change-Id: I5b713584a8d6442e01fbcf98d43ea34073087cc6
    Reviewed-on: https://gerrit.libreoffice.org/77080
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 050a8884c151..ae5afd443b94 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -1489,8 +1489,8 @@ void Shape::keepDiagramCompatibilityInfo()
 
         if (mpDiagramData)
         {
-            SdrObject* pObj = GetSdrObjectFromXShape(mxShape);
-            pObj->SetDiagramData(mpDiagramData);
+            if (SdrObject* pObj = GetSdrObjectFromXShape(mxShape))
+                pObj->SetDiagramData(mpDiagramData);
         }
 
         const OUString aGrabBagPropName = UNO_NAME_MISC_OBJ_INTEROPGRABBAG;
commit 0b2e052238e87faf5b76fe89ed1e10b20c5a3eaa
Author:     nd101 <Fong at nd.com.cn>
AuthorDate: Wed Aug 7 14:20:11 2019 +0800
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Wed Aug 7 11:05:27 2019 +0200

    tdf#126741 - fix dash dot dot line style display
    
    To make it consistent with MS PowerPoint, make the dash dot dot line
    start with a dash instead of a dot
    
    Change-Id: I0491c78001e885c3216841b694745c451303917e
    Reviewed-on: https://gerrit.libreoffice.org/77079
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 9c4727447c3f..108375385848 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -554,18 +554,18 @@ double XDash::CreateDotDashArray(::std::vector< double >& rDotDashArray, double
         }
     }
 
-    for(a=0;a<GetDots();a++)
+    for (a = 0; a < GetDashes(); a++)
     {
-        rDotDashArray[nIns++] = fSingleDotLen;
-        fFullDotDashLen += fSingleDotLen;
+        rDotDashArray[nIns++] = fSingleDashLen;
+        fFullDotDashLen += fSingleDashLen;
         rDotDashArray[nIns++] = fDashDotDistance;
         fFullDotDashLen += fDashDotDistance;
     }
 
-    for(a=0;a<GetDashes();a++)
+    for(a=0;a<GetDots();a++)
     {
-        rDotDashArray[nIns++] = fSingleDashLen;
-        fFullDotDashLen += fSingleDashLen;
+        rDotDashArray[nIns++] = fSingleDotLen;
+        fFullDotDashLen += fSingleDotLen;
         rDotDashArray[nIns++] = fDashDotDistance;
         fFullDotDashLen += fDashDotDistance;
     }