forked from amazingfate/loongoffice
85d41c3a1b
Open the bugdoc, the poor layout expects Writer to not capture the shape at the top of the page, but we captured it. This went wrong with commit a0b6587c4acb1d74e1b00904147821640c98b323 (tdf#161199 sw DoNotCaptureDrawObjsOnPage: capture wrap=none draw objects, 2024-06-13), which had a draw obj (part of a draw-fly format pair, forming a textbox), that was captured in Word, but not in Writer. Notice how the old bugdoc was a textbox draw obj, but the new draw obj is not a textbox one. Fix the problem by once again refining the condition when to capture objects inside the page frame. When it comes to draw objects, continue to capture wrap=none ones, but only in case they are part of a textbox. This keeps the wanted capturing for the old case and restores the lack of capturing for the new case. Note that the in-header shape is actually wrap-through in Word, and at the moment not in Writer, which would be also nice to fix, but that's not done here. Change-Id: I163ea9366bb34b09b2319c91c4cd53b82c19964a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183085 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit f60266597212b12039b9055de7db1724fd06cd3e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183102