diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-02-11 09:51:14 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-02-11 12:52:23 +0100 |
| commit | bf25e69f8f657d5e3bcdd0bd54c5fa0d66ec85fe (patch) | |
| tree | fb39228f0e197fed10c072cc7df9591c169c163c /sw | |
| parent | 52ee72a0e5ea6e590a98d3388e1cf12fa75583b6 (diff) | |
DOCX import: fix margins of inline shapes with effects, imported as Draw shapes
Effects have an extent, and unhandled effects (like this blurred shadow)
need to take space in the margin of the shape to make sure they use the
correct amount of space in the layout.
This was working in general, but not in case the importer decided to
import the shape as Draw shape + the shape was inline.
(And also disable a new CppunitTest_sw_uibase_shells test on Windows,
which is only stable on Linux, it seems.)
Change-Id: I9d0531d9393d8c2cd274e6f54bbbfe8024bf270f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88427
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/uibase/shells/shells.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/qa/uibase/shells/shells.cxx b/sw/qa/uibase/shells/shells.cxx index 57ad5687f7d2..5c9468f3f991 100644 --- a/sw/qa/uibase/shells/shells.cxx +++ b/sw/qa/uibase/shells/shells.cxx @@ -79,8 +79,8 @@ CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testTdf130179) CPPUNIT_TEST_FIXTURE(SwUibaseShellsTest, testShapeTextAlignment) { -// FIXME find out why this fails on macOS -#ifndef MACOSX +// FIXME find out why this fails on macOS/Windows +#if !defined(MACOSX) && !defined(_WIN32) // Create a document with a rectangle in it. SwDoc* pDoc = createDoc(); SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); |