diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-11-04 11:27:44 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-11-04 12:47:40 +0100 |
| commit | 995a6b38d5b8ac8aabca54f991caaaf35e6db395 (patch) | |
| tree | 4461ac03328bde76115358da09dd9f4809fcc12d /writerfilter/CppunitTest_writerfilter_rtftok.mk | |
| parent | 8b7dbd220dbdfd286de2d770503dae8bf6d2e53e (diff) | |
RTF import: fix too small graphic size when both picwgoal and picw are provided
The original document provided \picwgoal and \pichgoal, stating the
desired size of the image in twips. \picw and \pich is not provided, but
we write it on export. The value of \picw and \pich is ignored by Word
(it can calculate both the current and the original size from picw/hgoal
and picscalex/h), so it displays the document correctly.
Use the same trick in our RTF import: picscalex/y has a specified
default value (100%), so if we have picwgoal and pichgoal, then we can
also ignore picw and pich.
This is needed, otherwise the much smaller size from picw/pich is used
as the original size, so the layout "zooms in" so much that only a small
white rectangle of the top left area is visible, as if the images would
be all lost.
Change-Id: I924e5f8b68613c654c857a57561c8a2e3a6db2f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124679
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'writerfilter/CppunitTest_writerfilter_rtftok.mk')
| -rw-r--r-- | writerfilter/CppunitTest_writerfilter_rtftok.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index 07271b777ae0..6cad1e4c7b8d 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -16,6 +16,7 @@ $(eval $(call gb_CppunitTest_use_externals,writerfilter_rtftok,\ )) $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \ + writerfilter/qa/cppunittests/rtftok/rtfdocumentimpl \ writerfilter/qa/cppunittests/rtftok/rtfsdrimport \ writerfilter/qa/cppunittests/rtftok/rtfsprm \ writerfilter/qa/cppunittests/rtftok/rtftokenizer \ @@ -29,6 +30,7 @@ $(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \ sal \ test \ unotest \ + vcl \ )) $(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_rtftok)) |