diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2021-06-04 14:02:52 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2021-06-04 14:54:45 +0200 |
commit | 26d2b19d4e9388072b8dae574efdf00d7f7a0f2f (patch) | |
tree | 15f52f1275de376a98386b9ded7d787d211aba40 /svx | |
parent | 4839b7ca3b5a730edf90ebebc749db145efec098 (diff) |
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
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/svdraw/svdxcgv.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 1cf15c720a31..7d52431cd2b7 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -490,11 +490,20 @@ BitmapEx SdrExchangeView::GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked) const if(!aRange.isEmpty()) { + o3tl::Length eRangeUnit = o3tl::Length::mm100; + + if (GetModel()->IsWriter()) + { + eRangeUnit = o3tl::Length::twip; + } + // if we have geometry and it has a range, convert to BitmapEx using // common tooling aBmp = convertPrimitive2DSequenceToBitmapEx( xPrimitives, - aRange); + aRange, + /*nMaximumQuadraticPixels=*/ 500000, + eRangeUnit); } } } |