summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Writer.xcs2
-rw-r--r--sw/qa/filter/ww8/ww8.cxx1
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx2
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;