From 210ec3ef966b2f9206e9e52781f4cb9d2ed46300 Mon Sep 17 00:00:00 2001
From: László Németh <nemeth@numbertext.org>
Date: Mon, 30 Nov 2020 17:58:46 +0100
Subject: Revert "tdf#138483 sc: update red circles after merging cells"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 3741b90abe478fb04db88207b496a5238df35bb8.

Reason for revert: error: invalid use of incomplete type
‘const class ScMergeFlagAttr’

Change-Id: I5acb47a1edb4821c441944c879dc314156358ed9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106828
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
---
 sc/qa/unit/subsequent_filters-test.cxx | 35 ----------------------------------
 1 file changed, 35 deletions(-)

(limited to 'sc/qa/unit/subsequent_filters-test.cxx')

diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 2ef3cf4fb326..9c087549ec3e 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -65,8 +65,6 @@
 #include <stlpool.hxx>
 #include <hints.hxx>
 #include <detfunc.hxx>
-#include <cellmergeoption.hxx>
-#include <undoblk.hxx>
 
 #include <orcusfilters.hxx>
 #include <filter.hxx>
@@ -104,7 +102,6 @@ public:
     virtual void tearDown() override;
 
     //ods, xls, xlsx filter tests
-    void testUpdateCircleInMergedCellODS();
     void testDeleteCircleInMergedCellODS();
     void testBooleanFormatXLSX();
     void testBasicCellContentODS();
@@ -295,7 +292,6 @@ public:
     void testDeleteCirclesInRowAndCol();
 
     CPPUNIT_TEST_SUITE(ScFiltersTest);
-    CPPUNIT_TEST(testUpdateCircleInMergedCellODS);
     CPPUNIT_TEST(testDeleteCircleInMergedCellODS);
     CPPUNIT_TEST(testBooleanFormatXLSX);
     CPPUNIT_TEST(testBasicCellContentODS);
@@ -530,37 +526,6 @@ void testRangeNameImpl(const ScDocument& rDoc)
 
 }
 
-void ScFiltersTest::testUpdateCircleInMergedCellODS()
-{
-    ScDocShellRef xDocSh = loadDoc("updateCircleInMergedCell.", FORMAT_ODS);
-    CPPUNIT_ASSERT_MESSAGE("Failed to load updateCircleInMergedCell.ods", xDocSh.is());
-
-    ScDocument& rDoc = xDocSh->GetDocument();
-    rDoc.EnableChangeReadOnly(true);
-
-    ScDrawLayer* pDrawLayer = rDoc.GetDrawLayer();
-    SdrPage* pPage = pDrawLayer->GetPage(0);
-    CPPUNIT_ASSERT_MESSAGE("draw page for sheet 1 should exist.", pPage);
-
-    // There should be four circle objects!
-    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), pPage->GetObjCount());
-
-    ScCellMergeOption aCellMergeOption(0,0,1,1); // A1:B2
-    aCellMergeOption.maTabs.insert(0);
-    xDocSh->GetDocFunc().MergeCells(aCellMergeOption, false, true, true, false);
-
-    // There should be a circle object!
-    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), pPage->GetObjCount());
-
-    std::unique_ptr<ScUndoRemoveMerge> pUndoRemoveMerge;
-    xDocSh->GetDocFunc().UnmergeCells(aCellMergeOption, true, pUndoRemoveMerge.get());
-
-    // There should be four circle objects!
-    CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(4), pPage->GetObjCount());
-
-    xDocSh->DoClose();
-}
-
 void ScFiltersTest::testDeleteCircleInMergedCellODS()
 {
     ScDocShellRef xDocSh = loadDoc("deleteCircleInMergedCell.", FORMAT_ODS);
-- 
cgit v1.2.3