[Libreoffice-commits] core.git: writerfilter/source

[Xisco Fauli (via logerrit)]

 writerfilter/source/rtftok/rtfsdrimport.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 166412cb09eef1a65219f7ba27a219440a5a89ea
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Thu Mar 18 10:55:14 2021 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Mar 18 14:04:54 2021 +0100

    writerfilter: remove another pointless convertMm100ToTwip
    
    Similar to c9e5640c8fcad7beb42a66f9bee0252eee9fe323
    < tdf#118693: no need to use convertMm100ToTwip() for line shapes
    anymore >
    This was added in 6046062719f30849cd97161c6a89d27a0b0d2a20
    < tdf#90097 RTF import: handle fRelFlipV property for line shapes >
    and it's not needed since 36bade04d3780bc54c51b46bb0b63e69789658a5
    < tdf106792 Get rid of SvxShapePolyPolygonBezier > when
    ForceMetricToItemPoolMetric was added to SvxShapePolyPolygon::setPropertyValueImpl
    to convert from 100thmm to twips as can be read
    
    The unittest was rewritten in a7afdcd8d191248fd143743e818aa9985b95743c
    < tdf#90097 rtfimport: rewrite unit test so it run reliably >
    so no tweaking is needed there
    
    Change-Id: I31bac5a39005054e2b37dc1c76cb2194a3753684
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112665
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 2308fdaf54c7..2eeb8598c09f 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -977,9 +977,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
                 for (sal_Int32 i = 0; i < rPolygon.getLength(); ++i)
                 {
                     basegfx::B2DPoint aPoint(aPoly.getB2DPoint(i));
-                    rPolygon[i]
-                        = awt::Point(static_cast<sal_Int32>(convertMm100ToTwip(aPoint.getX())),
-                                     static_cast<sal_Int32>(convertMm100ToTwip(aPoint.getY())));
+                    rPolygon[i] = awt::Point(static_cast<sal_Int32>(aPoint.getX()),
+                                             static_cast<sal_Int32>(aPoint.getY()));
                 }
                 xPropertySet->setPropertyValue("PolyPolygon", uno::makeAny(aPolyPolySequence));
             }