summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2016-01-28 18:33:11 +1000
committerArmin Le Grand <Armin.Le.Grand@cib.de>2016-02-01 16:28:09 +0000
commitf8058b556d7ef23098bf6265f41e3f01f0529879 (patch)
treec3e046a62868bac50864b28363078378d03f0a58 /sdext
parent0e5a0cd29c2b98b8e8262a0727795dd8b5b22649 (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>
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/pdfimport/tree/drawtreevisiting.cxx13
-rw-r--r--sdext/source/pdfimport/tree/pdfiprocessor.cxx2
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 567f25654944..c91bef382ac9 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -350,7 +350,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;
}