From b0067dee80e8c33e5be9ca8acaafe7dab6cfc085 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.com>
Date: Fri, 14 Apr 2023 08:11:49 +0200
Subject: sw floatable: teach the DOC import about SwFormatFlySplit

- add a new DOC/ImportFloatingTableAsSplitFly setting, replacing the old
  (enabled by default DOCX/ImportFloatingTableAsSplitFly) one

- clean up old uses of SwModelTestBase::FlySplitGuard

- if SwWW8ImplReader::StartApo has a table position, then map that to
  SwFormatFlySplit=true in the ImportFloatingTableAsSplitFly case

- testcase for this

Change-Id: Ibd798ea7eb79d7ec00620dd8921797232f4732d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150381
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
---
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'officecfg/registry')

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 200572a620f3..dcd5dc71e68f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -5662,12 +5662,17 @@
             </info>
             <value>true</value>
           </prop>
+        </group>
+        <group oor:name="DOC">
+          <info>
+            <desc>Contains settings for importing DOC.</desc>
+          </info>
           <prop oor:name="ImportFloatingTableAsSplitFly" oor:type="xs:boolean" oor:nillable="false">
             <info>
               <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>true</value>
+            <value>false</value>
           </prop>
         </group>
       </group>
-- 
cgit