sw HTML export: fix pixel size of shapes

- the twips logic size was set, but it was consumed as mm100 logic size,
so the pixel size was about half of the correct one

- the HTML export didn't write a logic size ("CSS pixels size") for
shapes

Change-Id: I37f6b4acde9d1298fae81f9975e9db95485631ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116691
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

1 files changed, 5 insertions, 2 deletions

diff --git a/vcl/source/gdi/vectorgraphicdata.cxx b/vcl/source/gdi/vectorgraphicdata.cxx
index 8430ebe2b289..b424d4dcd503 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -48,7 +48,8 @@ using namespace ::com::sun::star;
 BitmapEx convertPrimitive2DSequenceToBitmapEx(
     const std::deque< css::uno::Reference< css::graphic::XPrimitive2D > >& rSequence,
     const basegfx::B2DRange& rTargetRange,
-    const sal_uInt32 nMaximumQuadraticPixels)
+    const sal_uInt32 nMaximumQuadraticPixels,
+    const o3tl::Length eTargetUnit)
 {
     BitmapEx aRetval;
 
@@ -61,7 +62,9 @@ BitmapEx convertPrimitive2DSequenceToBitmapEx(
             uno::Reference< uno::XComponentContext > xContext(::comphelper::getProcessComponentContext());
             const uno::Reference< graphic::XPrimitive2DRenderer > xPrimitive2DRenderer = graphic::Primitive2DTools::create(xContext);
 
-            uno::Sequence< beans::PropertyValue > aViewParameters;
+            uno::Sequence< beans::PropertyValue > aViewParameters = {
+                comphelper::makePropertyValue("RangeUnit", static_cast<sal_Int32>(eTargetUnit)),
+            };
             geometry::RealRectangle2D aRealRect;
 
             aRealRect.X1 = rTargetRange.getMinX();