diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2016-01-28 18:33:11 +1000 |
|---|---|---|
| committer | Mike Kaganski <mikekaganski@hotmail.com> | 2016-02-02 10:52:16 +0000 |
| commit | 11c865031cffc170d3db6b00fb48c683fb4ff070 (patch) | |
| tree | d8c3e88f57e03002cdd9dd4bfc8f7d1101d5dcdf /sdext | |
| parent | 0086461be280ee1d77d7811c6d930812f6adb33a (diff) | |
tdf#96993: remove obsolete vertical mirror hack from PDF import
Since commit ae0e830f9ace78b889713e7e74ce46f88fa21470, mirroring
is handled correctly in LO, so no need to handle it specially in
PDF import code. This obsolete handling causes double-mirroring.
Change-Id: Ia873f0426e444cafd80b24b7d209e90eb481d8f4
Reviewed-on: https://gerrit.libreoffice.org/21870
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
(cherry picked from commit f8058b556d7ef23098bf6265f41e3f01f0529879)
Reviewed-on: https://gerrit.libreoffice.org/22011
Reviewed-by: Mike Kaganski <mikekaganski@hotmail.com>
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/tree/drawtreevisiting.cxx | 13 | ||||
| -rw-r--r-- | sdext/source/pdfimport/tree/pdfiprocessor.cxx | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx index 568b25c2c818..a38050ad30b1 100644 --- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx +++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx @@ -215,9 +215,9 @@ void DrawXmlEmitter::fillFrameProps( DrawElement& rElem, if (rElem.MirrorVertical) { basegfx::B2DHomMatrix mat2; - mat2.translate(-0.5, -0.5); - mat2.scale(-1, -1); - mat2.translate(0.5, 0.5); + mat2.translate(0, -0.5); + mat2.scale(1, -1); + mat2.translate(0, 0.5); mat = mat * mat2; } @@ -949,13 +949,6 @@ void DrawXmlFinalizer::visit( FrameElement& elem, const std::list< Element* >::c aGCProps[ "fo:padding-right" ] = "0cm"; aGCProps[ "fo:padding-bottom" ] = "0cm"; - // remark: vertical mirroring is done in current OOO by - // mirroring horzontally and rotating 180 degrees - // this is quaint, but unfortunately it seems - // mirror=vertical is defined but not implemented in current code - if( elem.MirrorVertical ) - aGCProps[ "style:mirror" ] = "horizontal"; - StyleContainer::Style style1( "style:style", props1 ); StyleContainer::Style subStyle1( "style:graphic-properties", aGCProps ); style1.SubStyles.push_back(&subStyle1); diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx index 80d5cee5bd61..a1d653cf5de6 100644 --- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx +++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx @@ -351,7 +351,7 @@ void PDFIProcessor::setupImage(ImageId nImage) pFrame->h = pImageElement->h = aScale.getY(); pFrame->ZOrder = m_nNextZOrder++; - if (aScale.getY() > 0) + if (aScale.getY() < 0) pFrame->MirrorVertical = pImageElement->MirrorVertical = true; } |