[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-2' - librelogo/source

[László Németh]

 librelogo/source/LibreLogo/LibreLogo.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 7940ab6fb6ccf81b096918f8230bca3661c31790
Author: László Németh <nemeth at numbertext.org>
Date:   Fri Sep 6 17:30:25 2013 +0200

    fdo#69041 LibreLogo: fix SVG/SMIL timing with filled polylines
    
    Change-Id: Icebd47d57a830986c371a62ec7dab81ca8fd930a
    Reviewed-on: https://gerrit.libreoffice.org/5846
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py
index 84e7a2b..f0b78bf 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -784,7 +784,7 @@ def __dots__(n, pos, dx, dy, r = -1, q = 0): # dots for dotted polyline or circl
         dots += [(__Point__(px, py), __Point__(px + 7, py + 7))]
     return dots
 
-def __draw__(d):
+def __draw__(d, count = True):
     shape = _.doc.createInstance( "com.sun.star.drawing." + d)
     shape.AnchorType = __AT_PAGE__
     shape.TextWrap = __THROUGHT__
@@ -796,7 +796,8 @@ def __draw__(d):
     _.drawpage.add(shape)
     if __group__:
         __group__.add(shape)
-        _.shapecache[next(_.shapecount)] = str(_.time)
+        if count:
+            _.shapecache[next(_.shapecount)] = str(_.time)
     return shape
 
 def __zoom__():
@@ -892,7 +893,7 @@ def __fillit__(filled = True):
         __removeshape__(__ACTUAL__)  # FIXME close dotted polyline
         return
     if oldshape and "LineShape" in oldshape.ShapeType:
-        shape = __draw__("PolyPolygonShape")
+        shape = __draw__("PolyPolygonShape", False)
         shape.PolyPolygon = oldshape.PolyPolygon
         shape.setPosition(oldshape.getPosition())
         shape.LineStyle, shape.LineDash = __linestyle__(_.linestyle)