diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-01-24 12:43:30 +0000 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2014-01-24 16:50:25 +0000 |
| commit | 4479507f744149e8268be48de6d600e7ccefd0dd (patch) | |
| tree | 5a0bba6de4151f3490fc846f4325a6e64fee2a93 /xmloff/source/draw | |
| parent | 6e489b4024f68fa7d07a1e41aca4ec119b43a3b7 (diff) | |
Resolves: fdo#73355 reconcile legacy path bug detection
reconcile
"223f6b631c1b087754c0f9051fb55f029f2503ce
Resolves: #i123433# Detect pseudo-vertices at svg import..."
with
"7a19798c73fd39d8d69ff6364f0696e68cdd1381"
Compatibility option for incorrect relative moves after closePath (fdo#47406)
and
"a2ee8055e9c136923f0244fe289cac6377933c31"
Fix fdo#47406 incorrect relative moves after closePath
Change-Id: I1221099a40500aeb4165a3350d8ae2df1fd3111b
(cherry picked from commit b663316e83ec6b19b8fc33ade38086b22ab04b67)
Reviewed-on: https://gerrit.libreoffice.org/7628
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'xmloff/source/draw')
| -rw-r--r-- | xmloff/source/draw/ximp3dobject.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 20 |
2 files changed, 19 insertions, 3 deletions
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 6992a12c2314..4d7f7a1b35bb 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -357,7 +357,7 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa // import 2d PolyPolygon from svg:d basegfx::B2DPolyPolygon aPolyPolygon; - if(basegfx::tools::importFromSvgD(aPolyPolygon, maPoints, true, 0)) + if(basegfx::tools::importFromSvgD(aPolyPolygon, maPoints, GetImport().needFixPositionAfterZ(), 0)) { // convert to 3D PolyPolygon const basegfx::B3DPolyPolygon aB3DPolyPolygon( diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 14a0d081c629..d227f166d9db 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -1398,7 +1398,7 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib basegfx::B2DPolyPolygon aPolyPolygon; - if(basegfx::tools::importFromSvgD(aPolyPolygon, maD, true, 0)) + if(basegfx::tools::importFromSvgD(aPolyPolygon, maD, GetImport().needFixPositionAfterZ(), 0)) { if(aPolyPolygon.count()) { @@ -1752,6 +1752,22 @@ SdXMLConnectorShapeContext::~SdXMLConnectorShapeContext() { } +bool SvXMLImport::needFixPositionAfterZ() const +{ + bool bWrongPositionAfterZ( false ); + sal_Int32 nUPD( 0 ); + sal_Int32 nBuildId( 0 ); + if ( getBuildIds( nUPD, nBuildId ) && + ( ( nUPD == 641 ) || ( nUPD == 645 ) || ( nUPD == 680 ) || ( nUPD == 300 ) || + ( nUPD == 310 ) || ( nUPD == 320 ) || ( nUPD == 330 ) || ( nUPD == 340 ) || + ( nUPD == 350 && nBuildId < 202 ) ) ) + { + bWrongPositionAfterZ = true; + } + return bWrongPositionAfterZ; +} + + // this is called from the parent group for each unparsed attribute in the attribute list void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rLocalName, const OUString& rValue ) { @@ -1841,7 +1857,7 @@ void SdXMLConnectorShapeContext::processAttribute( sal_uInt16 nPrefix, const OUS { basegfx::B2DPolyPolygon aPolyPolygon; - if(basegfx::tools::importFromSvgD(aPolyPolygon, rValue, true, 0)) + if(basegfx::tools::importFromSvgD(aPolyPolygon, rValue, GetImport().needFixPositionAfterZ(), 0)) { if(aPolyPolygon.count()) { |