officecfg/registry/schema/org/openoffice/Office/Writer.xcs | 12 ------- sw/qa/extras/ww8export/ww8export.cxx | 1 sw/qa/extras/ww8export/ww8export2.cxx | 8 ----- sw/qa/inc/swmodeltestbase.hxx | 8 ----- sw/qa/unit/swmodeltestbase.cxx | 20 ------------- 5 files changed, 49 deletions(-)
New commits: commit 41eeb4ef94b57c633b13b372aeb0cec4c14e30dc Author: Miklos Vajna <[email protected]> AuthorDate: Mon Apr 24 07:39:30 2023 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Wed Apr 26 11:05:49 2023 +0200 sw floattable: remove no longer needed ImportFloatingTableAsSplitFly setting This was useful while developing the DOCX and DOC filters, but those are now enabled by default, so this can be removed. (cherry picked from commit 5c59d6f51f837639f1f0f24e154814136bbdfda9) Conflicts: sw/qa/unit/swmodeltestbase.cxx Change-Id: I0ebde6ec5e1a84f368d35b362bd1c3b1aabc9d5a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150957 Tested-by: Miklos Vajna <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 19162e5c46b9..c4dec43ad67a 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -5663,18 +5663,6 @@ <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> - </prop> - </group> </group> </group> <group oor:name="Numbering"> diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 3afb2b6cd2fd..f4274a629d39 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -763,7 +763,6 @@ DECLARE_WW8EXPORT_TEST( testTdf105570, "tdf105570.doc" ) CPPUNIT_TEST_FIXTURE(Test, testTdf112346) { - SwModelTestBase::FlySplitGuard aGuard; auto verify = [this]() { // Multi-page table was imported as a single page. CPPUNIT_ASSERT_EQUAL(2, getPages()); diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx index d2a41c947111..2f66a7f369c0 100644 --- a/sw/qa/extras/ww8export/ww8export2.cxx +++ b/sw/qa/extras/ww8export/ww8export2.cxx @@ -87,8 +87,6 @@ DECLARE_WW8EXPORT_TEST(testTdf55528_relativeTableWidth, "tdf55528_relativeTableW CPPUNIT_TEST_FIXTURE(Test, testTdf128700_relativeTableWidth) { - SwModelTestBase::FlySplitGuard aGuard; - auto verify = [this]() { uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); uno::Reference<container::XIndexAccess> xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY); @@ -292,7 +290,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf116570_exportFootnote) CPPUNIT_TEST_FIXTURE(Test, testTdf80635_pageRightRTL) { - SwModelTestBase::FlySplitGuard aGuard; auto verify = [this]() { // tdf#80635 - assert horizontal position of the table. uno::Reference<drawing::XShape> xFly = getShape(1); @@ -308,7 +305,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf80635_pageRightRTL) CPPUNIT_TEST_FIXTURE(Test, testTdf80635_marginRTL) { - SwModelTestBase::FlySplitGuard aGuard; auto verify = [this]() { // tdf#80635 - assert the horizontal orientation of the table. uno::Reference<drawing::XShape> xFly = getShape(1); @@ -322,7 +318,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf80635_marginRTL) CPPUNIT_TEST_FIXTURE(Test, testTdf80635_marginLeft) { - SwModelTestBase::FlySplitGuard aGuard; auto verify = [this]() { // tdf#80635 - assert horizontal position of the table. uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); @@ -340,7 +335,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf80635_marginLeft) CPPUNIT_TEST_FIXTURE(Test, testTdf80635_pageLeft) { - SwModelTestBase::FlySplitGuard aGuard; auto verify = [this]() { // tdf#80635 - assert horizontal orient relation of the table. uno::Reference<drawing::XShape> xFly = getShape(1); @@ -365,8 +359,6 @@ DECLARE_WW8EXPORT_TEST(testTdf99197_defaultLTR, "tdf99197_defaultLTR.doc") CPPUNIT_TEST_FIXTURE(Test, testTdf107773) { - SwModelTestBase::FlySplitGuard aGuard; - auto verify = [this]() { // This failed, multi-page table was imported as a non-split frame. SwDoc* pDoc = getSwDoc(); diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx index 0d43d4aca3b9..43b3edfa7235 100644 --- a/sw/qa/inc/swmodeltestbase.hxx +++ b/sw/qa/inc/swmodeltestbase.hxx @@ -107,14 +107,6 @@ protected: void paste(std::u16string_view aFilename, css::uno::Reference<css::text::XTextRange> const& xTextRange); public: - /// Temporarily enables DOCX::ImportFloatingTableAsSplitFly. - class SWQAHELPER_DLLPUBLIC FlySplitGuard - { - bool m_bOldValue = false; - public: - FlySplitGuard(); - ~FlySplitGuard(); - }; SwModelTestBase(const OUString& pTestDocumentPath = OUString(), const char* pFilter = ""); protected: diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx index 4095dadb929c..b3e1855e543b 100644 --- a/sw/qa/unit/swmodeltestbase.cxx +++ b/sw/qa/unit/swmodeltestbase.cxx @@ -34,26 +34,6 @@ using namespace css; -SwModelTestBase::FlySplitGuard::FlySplitGuard() -{ - m_bOldValue - = officecfg::Office::Writer::Filter::Import::DOC::ImportFloatingTableAsSplitFly::get(); - std::shared_ptr<comphelper::ConfigurationChanges> pChanges( - comphelper::ConfigurationChanges::create()); - officecfg::Office::Writer::Filter::Import::DOC::ImportFloatingTableAsSplitFly::set(true, - pChanges); - pChanges->commit(); -} - -SwModelTestBase::FlySplitGuard::~FlySplitGuard() -{ - std::shared_ptr<comphelper::ConfigurationChanges> pChanges( - comphelper::ConfigurationChanges::create()); - officecfg::Office::Writer::Filter::Import::DOC::ImportFloatingTableAsSplitFly::set(m_bOldValue, - pChanges); - pChanges->commit(); -} - void SwModelTestBase::paste(std::u16string_view aFilename, uno::Reference<text::XTextRange> const& xTextRange) {
