[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - officecfg/registry sw/qa sw/source

[Miklos Vajna (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |    2 +-
 sw/qa/filter/ww8/ww8.cxx                                   |    1 -
 sw/source/filter/ww8/ww8par6.cxx                           |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit b4fa588e6b17c2bfa5aa30524c0038e91e534c1a
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Apr 20 08:13:12 2023 +0200
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Wed Apr 26 10:49:39 2023 +0200

    sw floattable: import floating tables from DOC as split flys by default
    
    To get wider testing.
    
    (cherry picked from commit 61be351ac83acec75788d2f79a9038486163160f)
    
    Change-Id: Id9d21aeca3bb9c00a5b4adfd45934a242e7559bc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150742
    Tested-by: Miklos Vajna <vmik...@collabora.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 49fffc591993..19162e5c46b9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -5672,7 +5672,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 21a960aa8f9a..938b4b5f92d1 100644
--- a/sw/qa/filter/ww8/ww8.cxx
+++ b/sw/qa/filter/ww8/ww8.cxx
@@ -234,7 +234,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 28eb3592319a..4e30b9b1cf67 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2468,7 +2468,7 @@ bool IsFlySplitAllowed()
 
     if (!bRet)
     {
-        bRet = getenv("SW_FORCE_FLY_SPLIT") != nullptr;
+        bRet = getenv("SW_DISABLE_FLY_SPLIT") == nullptr;
     }
 
     return bRet;