diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2024-06-13 08:04:30 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2024-06-13 09:44:46 +0200 |
commit | a0b6587c4acb1d74e1b00904147821640c98b323 (patch) | |
tree | 38504ad4444c83068f82cef0b8f1fe76c46d9a0a /sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | |
parent | e702e27795bc32de9c68ed05fd4f3476b8d1ebc2 (diff) |
tdf#161199 sw DoNotCaptureDrawObjsOnPage: capture wrap=none draw objectsHEADmaster
Regression from commit af313fc149f80adb0f1680ca20e19745ccb7fede
(tdf#105143 DOCX import: enable DoNotCaptureDrawObjsOnPage layout compat
option, 2017-01-06), the second page of the document has an off-page
positioned draw shape, which is still kept inside the page frame in
Word, but not in Writer anymore.
Reading the SwAnchoredObjectPosition::GetInfoAboutObj() code, there are
a number of conditions at play here, but the relevant one is that fly
frames have the restriction that the "do not capture" behavior is
restricted to wrap=through, but the wrap type was ignored in the draw
shape case.
Fix the problem by being consistent here: require wrap=through for both
fly frames and draw shapes that moves the shape back inside the page
frame.
Note that Word goes a bit further here and even keeps the shape inside
the body text area, but that doesn't seem to be a regression, so leave
that unchanged for now.
Change-Id: I3b6331c13d2376cac9b0de90f6f57289a7a0f0e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168762
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx')
0 files changed, 0 insertions, 0 deletions