diff options
| author | Armin Le Grand <alg@apache.org> | 2013-10-29 14:11:45 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-31 15:56:14 +0000 |
| commit | 223f6b631c1b087754c0f9051fb55f029f2503ce (patch) | |
| tree | 14582be2894a88d16c6b0debbc8491350f9a5cce /filter | |
| parent | 9069e26d1fe1fbbe7bceab0bae8a186d8cdb47cc (diff) | |
Resolves: #i123433# Detect pseudo-vertices at svg import...
unify svg:d handling, correct svg:d import for relative sub-polygons in svg
import; changed default for moveto writes for svg:d in ODF to absolute
(cherry picked from commit f15874d8f976f3874bdbcb53429eeefa65c28841)
Conflicts:
basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx
basegfx/source/polygon/b2dpolypolygontools.cxx
basegfx/source/polygon/b2dsvgpolypolygon.cxx
basegfx/source/polygon/b3dpolypolygontools.cxx
basegfx/source/tools/makefile.mk
basegfx/test/boxclipper.cxx
basegfx/test/clipstate.cxx
basegfx/test/genericclipper.cxx
canvas/source/tools/surfaceproxy.cxx
sdext/source/pdfimport/tree/drawtreevisiting.cxx
sdext/source/pdfimport/tree/writertreevisiting.cxx
xmloff/inc/xexptran.hxx
xmloff/source/draw/XMLImageMapContext.cxx
xmloff/source/draw/XMLImageMapExport.cxx
xmloff/source/draw/shapeexport2.cxx
xmloff/source/draw/shapeexport3.cxx
xmloff/source/draw/xexptran.cxx
xmloff/source/draw/ximp3dobject.cxx
xmloff/source/draw/ximpshap.cxx
xmloff/source/style/MarkerStyle.cxx
xmloff/source/text/XMLTextFrameContext.cxx
xmloff/source/text/txtparae.cxx
Change-Id: I5171b4a3559ea116bea45152e1f2685666463635
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/svg/svgreader.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx index f1f9eedc249c..cd4a3931a0b6 100644 --- a/filter/source/svg/svgreader.cxx +++ b/filter/source/svg/svgreader.cxx @@ -1244,7 +1244,7 @@ struct ShapeWritingVisitor +OUString::number(y1)+"L"+OUString::number(x2)+"," +OUString::number(y2); basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD(aPoly, sLinePath); + basegfx::tools::importFromSvgD(aPoly, sLinePath, false, NULL); writePathShape(xAttrs, xUnoAttrs, @@ -1334,7 +1334,7 @@ struct ShapeWritingVisitor { OUString sPath = xElem->hasAttribute("d") ? xElem->getAttribute("d") : ""; basegfx::B2DPolyPolygon aPoly; - basegfx::tools::importFromSvgD(aPoly, sPath); + basegfx::tools::importFromSvgD(aPoly, sPath, false, NULL); writePathShape(xAttrs, xUnoAttrs, @@ -1668,7 +1668,8 @@ struct ShapeWritingVisitor xAttrs->AddAttribute( "svg:d", basegfx::tools::exportToSvgD( aPolys[i], false, // no relative coords. causes rounding errors - false )); // no quad bezier detection. crashes older versions. + false, // no quad bezier detection. crashes older versions. + false )); mxDocumentHandler->startElement("draw:path", xUnoAttrs); mxDocumentHandler->endElement("draw:path"); } |