[Libreoffice-commits] libmspub.git: 3 commits - src/lib

[David Tardon]

 src/lib/MSPUBCollector.cpp    |    4 ++--
 src/lib/ShapeGroupElement.cpp |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7f990c439d981dc280faac3db4c9f5805250bc2d
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Dec 30 21:07:59 2017 +0100

    cid#1427014 pointer to local outside scope
    
    Change-Id: Ifaa3eae63b2b2bebbd5337090426253bce26d600

diff --git a/src/lib/ShapeGroupElement.cpp b/src/lib/ShapeGroupElement.cpp
index 6dcead8..098b958 100644
--- a/src/lib/ShapeGroupElement.cpp
+++ b/src/lib/ShapeGroupElement.cpp
@@ -52,7 +52,7 @@ void ShapeGroupElement::visit(std::function<
                               (const ShapeInfo &info, const Coordinate &relativeTo, const VectorTransformation2D &foldedTransform, bool isGroup, const VectorTransformation2D &thisTransform)
                               > visitor, const Coordinate &relativeTo, const VectorTransformation2D &parentFoldedTransform) const
 {
-  const ShapeInfo &info = m_shapeInfo.get_value_or(ShapeInfo());
+  const ShapeInfo info = m_shapeInfo.get_value_or(ShapeInfo());
   Coordinate coord = info.m_coordinates.get_value_or(Coordinate());
   double centerX = ((double)coord.m_xs + (double)coord.m_xe) / (2 * EMUS_IN_INCH);
   double centerY = ((double)coord.m_ys + (double)coord.m_ye) / (2 * EMUS_IN_INCH);
commit f7833801bf3945262e26b110af50910ff0c1748d
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Dec 30 21:06:43 2017 +0100

    cid#1267884 pointer to local outside scope
    
    Change-Id: I67d4a55ecc4ee34da97807788191f05a20f195d1

diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index b3f7664..723955a 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -720,7 +720,7 @@ std::function<void(void)> MSPUBCollector::paintShape(const ShapeInfo &info, cons
   {
     if (info.m_clipPath.size() > 0)
     {
-      const Coordinate &coord = info.m_coordinates.get_value_or(Coordinate());
+      const Coordinate coord = info.m_coordinates.get_value_or(Coordinate());
       double x, y, height, width;
       x = coord.getXIn(m_width);
       y = coord.getYIn(m_height);
commit 9b59da0d160353173d8fb7d15787974ae24eafa0
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Dec 30 21:04:11 2017 +0100

    cid#1267883 pointer to local outside scope
    
    Change-Id: I0e6f11b1071950d97080de26d8bc59ccf86606b1

diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index 95a463b..b3f7664 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -1341,7 +1341,7 @@ double MSPUBCollector::getSpecialValue(const ShapeInfo &info, const CustomShape
   }
   if (arg == ASPECT_RATIO)
   {
-    const Coordinate &coord = info.m_coordinates.get_value_or(Coordinate());
+    const Coordinate coord = info.m_coordinates.get_value_or(Coordinate());
     return (double)coord.getWidthIn() / coord.getHeightIn();
   }
   if (arg & OTHER_CALC_VAL)