diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-04-16 10:14:05 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-04-16 10:58:49 +0200 |
| commit | 21cd910d144b14ead358bccd1146650806346eb5 (patch) | |
| tree | 2b949bdd9ae68b5f44b596e7073e47e31577e822 /sw/source/filter/html/htmlreqifreader.hxx | |
| parent | 0255a3f1704e50c478bd9a9e3e389a5e1f23ae81 (diff) | |
sw html/reqif export: fix size of embedded object
We used to write the size of the underlying OLE object, which may or may
not match the user-configured size. The PNG preview was correct, which
works with the size from the SwFormatFlyCnt ("as-char formatting"). Do
the same when writing the "object size" (i.e. \objw and \objh in the RTF
snippet).
Change-Id: I7e240c1e115846c17b0945376b0de02d19769100
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114197
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/source/filter/html/htmlreqifreader.hxx')
| -rw-r--r-- | sw/source/filter/html/htmlreqifreader.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/filter/html/htmlreqifreader.hxx b/sw/source/filter/html/htmlreqifreader.hxx index 3d0816739d6a..5f757d0fbf1d 100644 --- a/sw/source/filter/html/htmlreqifreader.hxx +++ b/sw/source/filter/html/htmlreqifreader.hxx @@ -13,6 +13,7 @@ class Graphic; class Size; class SvStream; class SwOLENode; +class SwFrameFormat; namespace SwReqIfReader { @@ -24,7 +25,8 @@ namespace SwReqIfReader bool ExtractOleFromRtf(SvStream& rRtf, SvStream& rOle, bool& bOwnFormat); /// Wraps an OLE2 container binary in an RTF fragment. -bool WrapOleInRtf(SvStream& rOle2, SvStream& rRtf, SwOLENode& rOLENode); +bool WrapOleInRtf(SvStream& rOle2, SvStream& rRtf, SwOLENode& rOLENode, + const SwFrameFormat& rFormat); /** * Wraps an image in an RTF fragment. |