Review Request 121214: Fix rendering of draw:g with a path with z commands & sync marker paths with LO

[Friedrich W. H. Kossebau]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/121214/
-----------------------------------------------------------

(Updated Nov. 23, 2014, 5:56 vorm.)


Review request for Calligra, Camilla Boemann, Dan Leinir Turthra Jensen, and Yue Liu.


Changes
-------

Add missing NWORKAROUND_ODF_BUGS wrapping


Repository: calligra


Description
-------

Some of my files with native ODF graphics inside are badly rendered by Calligra programs, e.g. the logo of KO: http://heap.kogmbh.net/friedrich/kologo.odt

Investigating onto proper SVG paths and comparing with LO and Inkscape I found that 501f4d55d0828b7a9ca1c62500454358feb4a0b1 was the culprit here, as the problem mentioned in https://bugs.kde.org/show_bug.cgi?id=297981 was actually due to a bug in LO, which has been meanwhiled fixed and also was accompagnied by an update of the paths of the installed markers from LO, so that fix was only copying a bug, breaking otherwise fine code.

So this diff consists of three commits:
* revert 501f4d55d0828b7a9ca1c62500454358feb4a0b1
* sync preinstalled marker with those of current LibreOffice
* catch old marker paths on loading

For me this PR fixes the rendering of my files, like the one linked above, and also of files created with a recent LO where arrows have been added with unfilled markers (e.g. diamond) at their end. Files created with Calligra programs before that also use arrows with markers still load fine.

I would like to backport to 2.8 in time for 2.8.7, so please give it a quick review.


Diffs (updated)
-----

  libs/flake/KoMarker.cpp 419f4e6 
  libs/flake/KoOdfWorkaround.h 3f64741 
  libs/flake/KoOdfWorkaround.cpp 5a43200 
  libs/flake/KoPathShapeLoader.cpp 0f8a4ad 
  libs/flake/styles/markers.xml c3e7cfa 

Diff: https://git.reviewboard.kde.org/r/121214/diff/


Testing
-------


Thanks,

Friedrich W. H. Kossebau

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20141123/c95d39fa/attachment.htm>