[Libreoffice-commits] libmspub.git: Branch 'libmspub-0.0' - src/lib

David Tardon dtardon at redhat.com
Tue Jul 1 05:59:10 PDT 2014


 src/lib/PolygonUtils.cpp |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit aedff4411981ed73bdd077ebad66abdf03a172df
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jul 1 10:10:01 2014 +0200

    fdo#80661 clash with a global symbol from libreoffice
    
    Change-Id: I7d556a5a207b055342a0b369cc0cb800b60014df
    (cherry picked from commit 50e45a89147807dadb301cc7b6ba934806ae269a)
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/src/lib/PolygonUtils.cpp b/src/lib/PolygonUtils.cpp
index bd79064..54f800a 100644
--- a/src/lib/PolygonUtils.cpp
+++ b/src/lib/PolygonUtils.cpp
@@ -5715,6 +5715,9 @@ Coordinate libmspub::CustomShape::getTextRectangle(double x, double y, double wi
   return Coordinate(startX, startY, endX, endY);
 }
 
+namespace
+{
+
 struct LineInfo
 {
   WPXPropertyListVector m_vertices;
@@ -5736,6 +5739,8 @@ struct LineInfo
 private:
 };
 
+}
+
 void drawEmulatedLine(boost::shared_ptr<const CustomShape> shape, ShapeType shapeType, const std::vector<Line> &lines,
                       Vector2D center, VectorTransformation2D transform,
                       double x, double y, double scaleX, double scaleY,


More information about the Libreoffice-commits mailing list