diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2023-04-20 08:13:12 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2023-04-20 11:03:20 +0200 |
| commit | 61be351ac83acec75788d2f79a9038486163160f (patch) | |
| tree | 16a473f83ce9b19fc1ceac69833277e541ceb82b | |
| parent | 3109c2a04998dc144d936d62824c832eba47b165 (diff) | |
sw floattable: import floating tables from DOC as split flys by default
To get wider testing.
Change-Id: Id9d21aeca3bb9c00a5b4adfd45934a242e7559bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150597
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 2 | ||||
| -rw-r--r-- | sw/qa/filter/ww8/ww8.cxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 917ea0289934..cef727b23c8b 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -5680,7 +5680,7 @@ <desc>Specifies whether a floating table should be imported as a split text frame.</desc> <label>Import floating table as split frame.</label> </info> - <value>false</value> + <value>true</value> </prop> </group> </group> diff --git a/sw/qa/filter/ww8/ww8.cxx b/sw/qa/filter/ww8/ww8.cxx index f4db23ac6f8b..c7dc85669a2c 100644 --- a/sw/qa/filter/ww8/ww8.cxx +++ b/sw/qa/filter/ww8/ww8.cxx @@ -232,7 +232,6 @@ CPPUNIT_TEST_FIXTURE(Test, testDocxFloatingTableExport) CPPUNIT_TEST_FIXTURE(Test, testDocFloatingTableImport) { - SwModelTestBase::FlySplitGuard aGuard; // Given a document with 2 pages: createSwDoc("floattable-compat14.doc"); diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 45a210d8bc0d..eed7d978a939 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -2468,7 +2468,7 @@ bool IsFlySplitAllowed(bool bFuzzing) if (!bRet) { - bRet = getenv("SW_FORCE_FLY_SPLIT") != nullptr; + bRet = getenv("SW_DISABLE_FLY_SPLIT") == nullptr; } return bRet; |