diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2020-01-23 18:05:26 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2020-01-24 11:31:17 +0100 |
commit | 77dc17ee6b718e311250a190d4f5d529a2e9e5e4 (patch) | |
tree | 48c5a181475cbf22b98667928c23cd295bb99299 /framework | |
parent | lok: add id information to the selected graphic (diff) | |
download | core-77dc17ee6b718e311250a190d4f5d529a2e9e5e4.tar.gz core-77dc17ee6b718e311250a190d4f5d529a2e9e5e4.zip |
sw DoNotCaptureDrawObjsOnPage: don't capture wrap-through Writer images, ...
.. either
This compat flag was originally added in commit
7961b14c4f9f00696b241e5ad9bf9ba18041fe22 (INTEGRATION: CWS
swdrawobjpos203 (1.12.54); FILE MERGED, 2006-03-22) for compatibility
with OOo 1.x.
Later commit af313fc149f80adb0f1680ca20e19745ccb7fede (tdf#105143 DOCX
import: enable DoNotCaptureDrawObjsOnPage layout compat option,
2017-01-06) also turned it on for DOCX documents.
One overlooked difference was that the compat flag disables "capturing"
of draw objects only, but not wrap-through Writer images. The DOCX case
wants the same for wrap-through Writer images as well, since Word does
no capturing in either case.
Fix the problem by disabling capturing for wrap-through Writer images as
well; if this turns out to be too problematic, we can have a dedicated
compat flag just for OOo 1.x documents, but that comes at some cost as
well. (Need to write the new compat flag to each & every new ODT.)
TextBoxes are handled separately (see testTDF91260 in
CppunitTest_sw_ooxmlexport8), so leave their handling unchanged.
(cherry picked from commit 195eae4852012eed6da72c0a9f55094a09aa2867)
Conflicts:
sw/qa/extras/layout/layout.cxx
Change-Id: I74f434ed7518d7784c7cba085deb6ff8baf1770a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87327
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'framework')
0 files changed, 0 insertions, 0 deletions