mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
93d7fbf73f8be7f09dd36e86f0dd06dfc8daa65c
libreoffice/sc/qa/unit/SparklineTest.cxx

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

932 lines
34 KiB
C++
Raw Normal View History

sc: simple unit test for adding a new Sparkline to a new document Change-Id: Ifb42167300dadd0e6c48bf178b7e8902985db3d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132464 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-10 14:08:35 +09:00
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include "helper/qahelper.hxx"
#include <docsh.hxx>
sc: add support for copy/cut and paste of Sparklines Currently cut,copy and paste will copy the Sparkline and create a new SparklineGroup for each cell in the new cell range. This probably need to be adjusted so the SparklineGroup is shared. Change-Id: I6f86bb026753b2b4b5bfa46aca4ca9794721f311 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132473 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-19 12:52:21 +09:00
#include <tabvwsh.hxx>
#include <cliputil.hxx>
sc: add Undo/Redo for inserting Sparklines Move the code to insert a sparkline from the SparklineDialog to DocFunc and inside the UndoInsertSparkline, so there is no code duplication and the code can be tested. Change-Id: I85f4020190ae835b33e706ec9cb2cda9fd6fc752 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132474 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-20 20:49:18 +09:00
#include <docfunc.hxx>
sc: simple unit test for adding a new Sparkline to a new document Change-Id: Ifb42167300dadd0e6c48bf178b7e8902985db3d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132464 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-10 14:08:35 +09:00
#include <Sparkline.hxx>
#include <SparklineGroup.hxx>
sc: improve SparklineList to track added SparklineGroups SparklineList used to only track added Sparklines for a sheet, but usually (in an export) we want to start with SparklineGroups and then search for all sparklines belonging to a group. This changes to use that. Now there is a method getSparklineGroups() and then another method getSparklineFor(), which returns all sparklines for the input group. Also added SparklineListTest, and refactored the export code for OOXML and ODF. Change-Id: I975e30f649788d41aab92a9a3220e38998e39670 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132543 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-01 17:06:18 +09:00
#include <SparklineList.hxx>
sc: simple unit test for adding a new Sparkline to a new document Change-Id: Ifb42167300dadd0e6c48bf178b7e8902985db3d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132464 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-10 14:08:35 +09:00
using namespace css;
class SparklineTest : public ScBootstrapFixture
{
private:
uno::Reference<uno::XInterface> m_xCalcComponent;
public:
SparklineTest()
: ScBootstrapFixture("sc/qa/unit/data")
{
}
virtual void setUp() override
{
test::BootstrapFixture::setUp();
// This is a bit of a fudge, we do this to ensure that ScGlobals::ensure,
// which is a private symbol to us, gets called
m_xCalcComponent = getMultiServiceFactory()->createInstance(
"com.sun.star.comp.Calc.SpreadsheetDocument");
CPPUNIT_ASSERT_MESSAGE("no calc component!", m_xCalcComponent.is());
}
virtual void tearDown() override
{
uno::Reference<lang::XComponent>(m_xCalcComponent, uno::UNO_QUERY_THROW)->dispose();
test::BootstrapFixture::tearDown();
}
void testAddSparkline();
sc: add Undo/Redo for deleting a Sparkline Adds the code to delete the Sparkline via DocFunc + test. Change-Id: I710a1ee59a5fe5f2bfb91f8bf487501ef39ce949 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132475 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-21 17:26:30 +09:00
void testClearContentSprkline();
sc: add support for copy/cut and paste of Sparklines Currently cut,copy and paste will copy the Sparkline and create a new SparklineGroup for each cell in the new cell range. This probably need to be adjusted so the SparklineGroup is shared. Change-Id: I6f86bb026753b2b4b5bfa46aca4ca9794721f311 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132473 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-19 12:52:21 +09:00
void testCopyPasteSparkline();
void testCutPasteSparkline();
sc: add Undo/Redo for inserting Sparklines Move the code to insert a sparkline from the SparklineDialog to DocFunc and inside the UndoInsertSparkline, so there is no code duplication and the code can be tested. Change-Id: I85f4020190ae835b33e706ec9cb2cda9fd6fc752 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132474 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-20 20:49:18 +09:00
void testUndoRedoInsertSparkline();
sc: add Undo/Redo for deleting a Sparkline Adds the code to delete the Sparkline via DocFunc + test. Change-Id: I710a1ee59a5fe5f2bfb91f8bf487501ef39ce949 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132475 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-21 17:26:30 +09:00
void testUndoRedoDeleteSparkline();
sc: add "Delete Sparkline Group" context menu action + Undo/Redo Change-Id: I34e11a4881c564351c3e08d157fb42ac4bb8ef3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132544 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-01 23:03:52 +09:00
void testUndoRedoDeleteSparklineGroup();
sc: undo/redo for sparklines when deleting the cell content This adds support for undo/redo when clearing the content of a cell, which includes a sparkline. Change-Id: I79d9ef965e21cf5b35de84aa3b5cb93b644777ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132476 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-22 11:03:24 +09:00
void testUndoRedoClearContentForSparkline();
sc: add SparklineGroup Undo/Redo As SparklineAttributes are COW, we can just exchange them around in the SparklineGroup when undoing and redoing. This also changes SparklineDialog to work with a local copy of SparklineAttributes when editing, or an empty initial copy when inserting a new Sparkline into the sheet. Change-Id: I36e9c887ca640f40266f381e98e57f027a5ca07f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132542 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-31 23:07:44 +09:00
void testUndoRedoEditSparklineGroup();
sc: add Group and Ungroup to context menu for sparklines This change allows to group parklines together into a sparkline group, or ungroup them, so they use their own sparkline group. This also adds the undo and redo for this actions. Change-Id: I61b604203afaf2fe8c2d47b80082739ded15d6fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132545 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-03 09:02:38 +09:00
void testUndoRedoUngroupSparklines();
void testUndoRedoGroupSparklines();
sc: improve SparklineList to track added SparklineGroups SparklineList used to only track added Sparklines for a sheet, but usually (in an export) we want to start with SparklineGroups and then search for all sparklines belonging to a group. This changes to use that. Now there is a method getSparklineGroups() and then another method getSparklineFor(), which returns all sparklines for the input group. Also added SparklineListTest, and refactored the export code for OOXML and ODF. Change-Id: I975e30f649788d41aab92a9a3220e38998e39670 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132543 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-01 17:06:18 +09:00
void testSparklineList();
sc: simple unit test for adding a new Sparkline to a new document Change-Id: Ifb42167300dadd0e6c48bf178b7e8902985db3d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132464 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-10 14:08:35 +09:00
CPPUNIT_TEST_SUITE(SparklineTest);
CPPUNIT_TEST(testAddSparkline);
sc: add Undo/Redo for deleting a Sparkline Adds the code to delete the Sparkline via DocFunc + test. Change-Id: I710a1ee59a5fe5f2bfb91f8bf487501ef39ce949 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132475 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-21 17:26:30 +09:00
CPPUNIT_TEST(testClearContentSprkline);
sc: add support for copy/cut and paste of Sparklines Currently cut,copy and paste will copy the Sparkline and create a new SparklineGroup for each cell in the new cell range. This probably need to be adjusted so the SparklineGroup is shared. Change-Id: I6f86bb026753b2b4b5bfa46aca4ca9794721f311 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132473 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-19 12:52:21 +09:00
CPPUNIT_TEST(testCopyPasteSparkline);
CPPUNIT_TEST(testCutPasteSparkline);
sc: add Undo/Redo for inserting Sparklines Move the code to insert a sparkline from the SparklineDialog to DocFunc and inside the UndoInsertSparkline, so there is no code duplication and the code can be tested. Change-Id: I85f4020190ae835b33e706ec9cb2cda9fd6fc752 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132474 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-20 20:49:18 +09:00
CPPUNIT_TEST(testUndoRedoInsertSparkline);
sc: add Undo/Redo for deleting a Sparkline Adds the code to delete the Sparkline via DocFunc + test. Change-Id: I710a1ee59a5fe5f2bfb91f8bf487501ef39ce949 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132475 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-21 17:26:30 +09:00
CPPUNIT_TEST(testUndoRedoDeleteSparkline);
sc: add "Delete Sparkline Group" context menu action + Undo/Redo Change-Id: I34e11a4881c564351c3e08d157fb42ac4bb8ef3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132544 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-01 23:03:52 +09:00
CPPUNIT_TEST(testUndoRedoDeleteSparklineGroup);
sc: undo/redo for sparklines when deleting the cell content This adds support for undo/redo when clearing the content of a cell, which includes a sparkline. Change-Id: I79d9ef965e21cf5b35de84aa3b5cb93b644777ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132476 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-22 11:03:24 +09:00
CPPUNIT_TEST(testUndoRedoClearContentForSparkline);
sc: add SparklineGroup Undo/Redo As SparklineAttributes are COW, we can just exchange them around in the SparklineGroup when undoing and redoing. This also changes SparklineDialog to work with a local copy of SparklineAttributes when editing, or an empty initial copy when inserting a new Sparkline into the sheet. Change-Id: I36e9c887ca640f40266f381e98e57f027a5ca07f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132542 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-31 23:07:44 +09:00
CPPUNIT_TEST(testUndoRedoEditSparklineGroup);
sc: add Group and Ungroup to context menu for sparklines This change allows to group parklines together into a sparkline group, or ungroup them, so they use their own sparkline group. This also adds the undo and redo for this actions. Change-Id: I61b604203afaf2fe8c2d47b80082739ded15d6fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132545 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-03 09:02:38 +09:00
CPPUNIT_TEST(testUndoRedoUngroupSparklines);
CPPUNIT_TEST(testUndoRedoGroupSparklines);
sc: improve SparklineList to track added SparklineGroups SparklineList used to only track added Sparklines for a sheet, but usually (in an export) we want to start with SparklineGroups and then search for all sparklines belonging to a group. This changes to use that. Now there is a method getSparklineGroups() and then another method getSparklineFor(), which returns all sparklines for the input group. Also added SparklineListTest, and refactored the export code for OOXML and ODF. Change-Id: I975e30f649788d41aab92a9a3220e38998e39670 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132543 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-01 17:06:18 +09:00
CPPUNIT_TEST(testSparklineList);
sc: simple unit test for adding a new Sparkline to a new document Change-Id: Ifb42167300dadd0e6c48bf178b7e8902985db3d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132464 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-10 14:08:35 +09:00
CPPUNIT_TEST_SUITE_END();
};
sc: add Undo/Redo for inserting Sparklines Move the code to insert a sparkline from the SparklineDialog to DocFunc and inside the UndoInsertSparkline, so there is no code duplication and the code can be tested. Change-Id: I85f4020190ae835b33e706ec9cb2cda9fd6fc752 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132474 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-20 20:49:18 +09:00
namespace
{
void insertTestData(ScDocument& rDocument)
sc: add unit test to delete Sparkline, update add Sparkline test Change-Id: Ib0e60ea5aa246b29a06ae90be2cb4b905722b1a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132469 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-15 15:50:10 +09:00
{
rDocument.SetValue(0, 0, 0, 4);
rDocument.SetValue(0, 1, 0, -2);
rDocument.SetValue(0, 2, 0, 1);
rDocument.SetValue(0, 3, 0, -3);
rDocument.SetValue(0, 4, 0, 5);
rDocument.SetValue(0, 5, 0, 3);
sc: add Undo/Redo for inserting Sparklines Move the code to insert a sparkline from the SparklineDialog to DocFunc and inside the UndoInsertSparkline, so there is no code duplication and the code can be tested. Change-Id: I85f4020190ae835b33e706ec9cb2cda9fd6fc752 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132474 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-20 20:49:18 +09:00
}
sc::Sparkline* createTestSparkline(ScDocument& rDocument)
{
auto pSparklineGroup = std::make_shared<sc::SparklineGroup>();
sc::Sparkline* pSparkline = rDocument.CreateSparkline(ScAddress(0, 6, 0), pSparklineGroup);
if (!pSparkline)
return nullptr;
insertTestData(rDocument);
sc: add unit test to delete Sparkline, update add Sparkline test Change-Id: Ib0e60ea5aa246b29a06ae90be2cb4b905722b1a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132469 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-15 15:50:10 +09:00
ScRangeList aList;
aList.push_back(ScRange(0, 0, 0, 0, 5, 0));
pSparkline->setInputRange(aList);
return pSparkline;
}
sc: add Undo/Redo for inserting Sparklines Move the code to insert a sparkline from the SparklineDialog to DocFunc and inside the UndoInsertSparkline, so there is no code duplication and the code can be tested. Change-Id: I85f4020190ae835b33e706ec9cb2cda9fd6fc752 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132474 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-20 20:49:18 +09:00
} // end anonymous namespace
sc: simple unit test for adding a new Sparkline to a new document Change-Id: Ifb42167300dadd0e6c48bf178b7e8902985db3d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132464 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-10 14:08:35 +09:00
void SparklineTest::testAddSparkline()
{
ScDocShellRef xDocSh = loadEmptyDocument();
CPPUNIT_ASSERT(xDocSh);
ScDocument& rDocument = xDocSh->GetDocument();
sc: change GetSparkline to return a shared_ptr instead of raw ptr Change-Id: If3d7b3ad4b96eb7d3b126ee8b130f8d5e684cd3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132472 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-19 10:56:27 +09:00
auto pSparkline = createTestSparkline(rDocument);
sc: simple unit test for adding a new Sparkline to a new document Change-Id: Ifb42167300dadd0e6c48bf178b7e8902985db3d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132464 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-10 14:08:35 +09:00
CPPUNIT_ASSERT(pSparkline);
sc: add unit test to delete Sparkline, update add Sparkline test Change-Id: Ib0e60ea5aa246b29a06ae90be2cb4b905722b1a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132469 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-15 15:50:10 +09:00
sc: change GetSparkline to return a shared_ptr instead of raw ptr Change-Id: If3d7b3ad4b96eb7d3b126ee8b130f8d5e684cd3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132472 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-19 10:56:27 +09:00
auto pGetSparkline = rDocument.GetSparkline(ScAddress(0, 6, 0));
sc: add unit test to delete Sparkline, update add Sparkline test Change-Id: Ib0e60ea5aa246b29a06ae90be2cb4b905722b1a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132469 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-15 15:50:10 +09:00
CPPUNIT_ASSERT(pGetSparkline);
sc: change GetSparkline to return a shared_ptr instead of raw ptr Change-Id: If3d7b3ad4b96eb7d3b126ee8b130f8d5e684cd3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132472 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-19 10:56:27 +09:00
CPPUNIT_ASSERT_EQUAL(pGetSparkline.get(), pSparkline);
sc: add unit test to delete Sparkline, update add Sparkline test Change-Id: Ib0e60ea5aa246b29a06ae90be2cb4b905722b1a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132469 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-15 15:50:10 +09:00
sc: improve SparklineList to track added SparklineGroups SparklineList used to only track added Sparklines for a sheet, but usually (in an export) we want to start with SparklineGroups and then search for all sparklines belonging to a group. This changes to use that. Now there is a method getSparklineGroups() and then another method getSparklineFor(), which returns all sparklines for the input group. Also added SparklineListTest, and refactored the export code for OOXML and ODF. Change-Id: I975e30f649788d41aab92a9a3220e38998e39670 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132543 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-01 17:06:18 +09:00
sc::SparklineList* pList = rDocument.GetSparklineList(SCTAB(0));
sc: add unit test to delete Sparkline, update add Sparkline test Change-Id: Ib0e60ea5aa246b29a06ae90be2cb4b905722b1a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132469 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-15 15:50:10 +09:00
CPPUNIT_ASSERT(pList);
sc: improve SparklineList to track added SparklineGroups SparklineList used to only track added Sparklines for a sheet, but usually (in an export) we want to start with SparklineGroups and then search for all sparklines belonging to a group. This changes to use that. Now there is a method getSparklineGroups() and then another method getSparklineFor(), which returns all sparklines for the input group. Also added SparklineListTest, and refactored the export code for OOXML and ODF. Change-Id: I975e30f649788d41aab92a9a3220e38998e39670 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132543 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-01 17:06:18 +09:00
CPPUNIT_ASSERT_EQUAL(size_t(1), pList->getSparklineGroups().size());
auto const& aSparklineVector = pList->getSparklinesFor(pGetSparkline->getSparklineGroup());
sc: add unit test to delete Sparkline, update add Sparkline test Change-Id: Ib0e60ea5aa246b29a06ae90be2cb4b905722b1a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132469 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-15 15:50:10 +09:00
CPPUNIT_ASSERT_EQUAL(size_t(1), aSparklineVector.size());
CPPUNIT_ASSERT_EQUAL(aSparklineVector[0].get(), pSparkline);
xDocSh->DoClose();
}
sc: add Undo/Redo for deleting a Sparkline Adds the code to delete the Sparkline via DocFunc + test. Change-Id: I710a1ee59a5fe5f2bfb91f8bf487501ef39ce949 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132475 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-21 17:26:30 +09:00
void SparklineTest::testClearContentSprkline()
sc: add unit test to delete Sparkline, update add Sparkline test Change-Id: Ib0e60ea5aa246b29a06ae90be2cb4b905722b1a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132469 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-15 15:50:10 +09:00
{
ScDocShellRef xDocSh = loadEmptyDocument();
CPPUNIT_ASSERT(xDocSh);
ScDocument& rDocument = xDocSh->GetDocument();
sc: change GetSparkline to return a shared_ptr instead of raw ptr Change-Id: If3d7b3ad4b96eb7d3b126ee8b130f8d5e684cd3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132472 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-19 10:56:27 +09:00
auto pSparkline = createTestSparkline(rDocument);
sc: add unit test to delete Sparkline, update add Sparkline test Change-Id: Ib0e60ea5aa246b29a06ae90be2cb4b905722b1a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132469 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-15 15:50:10 +09:00
CPPUNIT_ASSERT(pSparkline);
clearRange(&rDocument, ScRange(0, 6, 0, 0, 6, 0));
sc: change GetSparkline to return a shared_ptr instead of raw ptr Change-Id: If3d7b3ad4b96eb7d3b126ee8b130f8d5e684cd3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132472 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-19 10:56:27 +09:00
auto pGetSparkline = rDocument.GetSparkline(ScAddress(0, 6, 0));
sc: add unit test to delete Sparkline, update add Sparkline test Change-Id: Ib0e60ea5aa246b29a06ae90be2cb4b905722b1a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132469 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-15 15:50:10 +09:00
CPPUNIT_ASSERT(!pGetSparkline);
xDocSh->DoClose();
sc: simple unit test for adding a new Sparkline to a new document Change-Id: Ifb42167300dadd0e6c48bf178b7e8902985db3d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132464 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-10 14:08:35 +09:00
}
sc: add support for copy/cut and paste of Sparklines Currently cut,copy and paste will copy the Sparkline and create a new SparklineGroup for each cell in the new cell range. This probably need to be adjusted so the SparklineGroup is shared. Change-Id: I6f86bb026753b2b4b5bfa46aca4ca9794721f311 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132473 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-19 12:52:21 +09:00
void SparklineTest::testCopyPasteSparkline()
{
ScDocShellRef xDocSh = loadEmptyDocument();
CPPUNIT_ASSERT(xDocSh);
ScDocument& rDocument = xDocSh->GetDocument();
ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
CPPUNIT_ASSERT(pViewShell);
auto* pCreatedSparkline = createTestSparkline(rDocument);
CPPUNIT_ASSERT(pCreatedSparkline);
ScRange aSourceRange(0, 6, 0, 0, 6, 0);
auto pSparkline = rDocument.GetSparkline(aSourceRange.aStart);
sc: use GUID for the SparklineGroup ID and use that This adds tools::Guid as the SparklineGroup ID. At import the Guid is parsed by tools::Guid and later it is used to identify the SparklineGroup. This is useful when copying sparklines so we can preserve to which group it belongs, when that is desired. Change-Id: I4f2b560d5ea74552e8add57bb05469be57cf4a69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132515 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-28 22:51:08 +09:00
auto const& pOriginalGroup = pSparkline->getSparklineGroup();
sc: add support for copy/cut and paste of Sparklines Currently cut,copy and paste will copy the Sparkline and create a new SparklineGroup for each cell in the new cell range. This probably need to be adjusted so the SparklineGroup is shared. Change-Id: I6f86bb026753b2b4b5bfa46aca4ca9794721f311 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132473 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-19 12:52:21 +09:00
CPPUNIT_ASSERT(pSparkline);
CPPUNIT_ASSERT_EQUAL(SCCOL(0), pSparkline->getColumn());
CPPUNIT_ASSERT_EQUAL(SCROW(6), pSparkline->getRow());
// CopyToClip / CopyFromClip with a aClipDoc
{
ScDocument aClipDoc(SCDOCMODE_CLIP);
copyToClip(&rDocument, aSourceRange, &aClipDoc);
auto pClipSparkline = aClipDoc.GetSparkline(aSourceRange.aStart);
CPPUNIT_ASSERT(pClipSparkline);
ScRange aPasteRange(0, 7, 0, 0, 7, 0);
ScMarkData aMark(rDocument.GetSheetLimits());
aMark.SetMarkArea(aPasteRange);
rDocument.CopyFromClip(aPasteRange, aMark, InsertDeleteFlags::ALL, nullptr, &aClipDoc);
auto pSparklineCopy = rDocument.GetSparkline(aPasteRange.aStart);
CPPUNIT_ASSERT(pSparklineCopy);
CPPUNIT_ASSERT_EQUAL(SCCOL(0), pSparklineCopy->getColumn());
CPPUNIT_ASSERT_EQUAL(SCROW(7), pSparklineCopy->getRow());
sc: use GUID for the SparklineGroup ID and use that This adds tools::Guid as the SparklineGroup ID. At import the Guid is parsed by tools::Guid and later it is used to identify the SparklineGroup. This is useful when copying sparklines so we can preserve to which group it belongs, when that is desired. Change-Id: I4f2b560d5ea74552e8add57bb05469be57cf4a69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132515 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-28 22:51:08 +09:00
auto const& pCopyGroup = pSparklineCopy->getSparklineGroup();
CPPUNIT_ASSERT_EQUAL(pOriginalGroup->getID(), pCopyGroup->getID());
CPPUNIT_ASSERT_EQUAL(pOriginalGroup.get(), pCopyGroup.get());
sc: add support for copy/cut and paste of Sparklines Currently cut,copy and paste will copy the Sparkline and create a new SparklineGroup for each cell in the new cell range. This probably need to be adjusted so the SparklineGroup is shared. Change-Id: I6f86bb026753b2b4b5bfa46aca4ca9794721f311 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132473 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-19 12:52:21 +09:00
}
// Copy / Paste with a ClipDoc
{
pViewShell->GetViewData().GetMarkData().SetMarkArea(aSourceRange);
// Copy
ScDocument aClipDoc(SCDOCMODE_CLIP);
pViewShell->GetViewData().GetView()->CopyToClip(&aClipDoc, false, false, false, false);
// Paste
ScRange aPasteRange(0, 8, 0, 0, 8, 0);
pViewShell->GetViewData().GetMarkData().SetMarkArea(aPasteRange);
pViewShell->GetViewData().GetView()->PasteFromClip(InsertDeleteFlags::ALL, &aClipDoc);
auto pSparklineCopy = rDocument.GetSparkline(aPasteRange.aStart);
CPPUNIT_ASSERT(pSparklineCopy);
CPPUNIT_ASSERT_EQUAL(SCCOL(0), pSparklineCopy->getColumn());
CPPUNIT_ASSERT_EQUAL(SCROW(8), pSparklineCopy->getRow());
sc: use GUID for the SparklineGroup ID and use that This adds tools::Guid as the SparklineGroup ID. At import the Guid is parsed by tools::Guid and later it is used to identify the SparklineGroup. This is useful when copying sparklines so we can preserve to which group it belongs, when that is desired. Change-Id: I4f2b560d5ea74552e8add57bb05469be57cf4a69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132515 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-28 22:51:08 +09:00
auto const& pCopyGroup = pSparklineCopy->getSparklineGroup();
CPPUNIT_ASSERT_EQUAL(pOriginalGroup->getID(), pCopyGroup->getID());
CPPUNIT_ASSERT_EQUAL(pOriginalGroup.get(), pCopyGroup.get());
sc: add support for copy/cut and paste of Sparklines Currently cut,copy and paste will copy the Sparkline and create a new SparklineGroup for each cell in the new cell range. This probably need to be adjusted so the SparklineGroup is shared. Change-Id: I6f86bb026753b2b4b5bfa46aca4ca9794721f311 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132473 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-19 12:52:21 +09:00
}
xDocSh->DoClose();
}
void SparklineTest::testCutPasteSparkline()
{
ScDocShellRef xDocSh = loadEmptyDocument();
CPPUNIT_ASSERT(xDocSh);
ScDocument& rDocument = xDocSh->GetDocument();
ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
CPPUNIT_ASSERT(pViewShell);
auto* pCreatedSparkline = createTestSparkline(rDocument);
CPPUNIT_ASSERT(pCreatedSparkline);
ScRange aSourceRange(0, 6, 0, 0, 6, 0);
auto pSparkline = rDocument.GetSparkline(aSourceRange.aStart);
CPPUNIT_ASSERT(pSparkline);
CPPUNIT_ASSERT_EQUAL(SCCOL(0), pSparkline->getColumn());
CPPUNIT_ASSERT_EQUAL(SCROW(6), pSparkline->getRow());
// Mark source range
pViewShell->GetViewData().GetMarkData().SetMarkArea(aSourceRange);
// Cut
pViewShell->GetViewData().GetView()->CopyToClip(nullptr, true /*bCut*/, false, false, true);
// Paste
ScRange aPasteRange(0, 7, 0, 0, 7, 0);
pViewShell->GetViewData().GetMarkData().SetMarkArea(aPasteRange);
ScClipUtil::PasteFromClipboard(pViewShell->GetViewData(), pViewShell, false);
// Check
auto pSparklineCopy = rDocument.GetSparkline(aPasteRange.aStart);
CPPUNIT_ASSERT(pSparklineCopy);
CPPUNIT_ASSERT_EQUAL(SCCOL(0), pSparklineCopy->getColumn());
CPPUNIT_ASSERT_EQUAL(SCROW(7), pSparklineCopy->getRow());
xDocSh->DoClose();
}
sc: add Undo/Redo for inserting Sparklines Move the code to insert a sparkline from the SparklineDialog to DocFunc and inside the UndoInsertSparkline, so there is no code duplication and the code can be tested. Change-Id: I85f4020190ae835b33e706ec9cb2cda9fd6fc752 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132474 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-20 20:49:18 +09:00
void SparklineTest::testUndoRedoInsertSparkline()
{
ScDocShellRef xDocSh = loadEmptyDocument();
CPPUNIT_ASSERT(xDocSh);
ScDocument& rDocument = xDocSh->GetDocument();
ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
CPPUNIT_ASSERT(pViewShell);
auto& rDocFunc = xDocSh->GetDocFunc();
// insert test data - A1:A6
insertTestData(rDocument);
// Sparkline range
ScRange aRange(0, 6, 0, 0, 6, 0);
// Check Sparkline at cell A7 doesn't exists
auto pSparkline = rDocument.GetSparkline(aRange.aStart);
CPPUNIT_ASSERT(!pSparkline);
auto pSparklineGroup = std::make_shared<sc::SparklineGroup>();
rDocFunc.InsertSparklines(ScRange(0, 0, 0, 0, 5, 0), aRange, pSparklineGroup);
// Check Sparkline at cell A7 exists
pSparkline = rDocument.GetSparkline(aRange.aStart);
CPPUNIT_ASSERT(pSparkline);
CPPUNIT_ASSERT_EQUAL(SCCOL(0), pSparkline->getColumn());
CPPUNIT_ASSERT_EQUAL(SCROW(6), pSparkline->getRow());
// Undo
rDocument.GetUndoManager()->Undo();
// Check Sparkline at cell A7 doesn't exists
pSparkline = rDocument.GetSparkline(aRange.aStart);
CPPUNIT_ASSERT(!pSparkline);
// Redo
rDocument.GetUndoManager()->Redo();
// Check Sparkline at cell A7 exists
pSparkline = rDocument.GetSparkline(aRange.aStart);
CPPUNIT_ASSERT(pSparkline);
CPPUNIT_ASSERT_EQUAL(SCCOL(0), pSparkline->getColumn());
CPPUNIT_ASSERT_EQUAL(SCROW(6), pSparkline->getRow());
xDocSh->DoClose();
}
sc: add Undo/Redo for deleting a Sparkline Adds the code to delete the Sparkline via DocFunc + test. Change-Id: I710a1ee59a5fe5f2bfb91f8bf487501ef39ce949 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132475 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-21 17:26:30 +09:00
void SparklineTest::testUndoRedoDeleteSparkline()
{
ScDocShellRef xDocSh = loadEmptyDocument();
CPPUNIT_ASSERT(xDocSh);
ScDocument& rDocument = xDocSh->GetDocument();
ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
CPPUNIT_ASSERT(pViewShell);
auto& rDocFunc = xDocSh->GetDocFunc();
// Try to delete sparkline that doesn't exist - returns false
CPPUNIT_ASSERT(!rDocFunc.DeleteSparkline(ScAddress(0, 6, 0)));
// insert test data - A1:A6
insertTestData(rDocument);
// Sparkline range
ScRange aRange(0, 6, 0, 0, 6, 0);
// Check Sparkline at cell A7 doesn't exists
auto pSparkline = rDocument.GetSparkline(aRange.aStart);
CPPUNIT_ASSERT(!pSparkline);
auto pSparklineGroup = std::make_shared<sc::SparklineGroup>();
CPPUNIT_ASSERT(rDocFunc.InsertSparklines(ScRange(0, 0, 0, 0, 5, 0), aRange, pSparklineGroup));
// Check Sparkline at cell A7 exists
pSparkline = rDocument.GetSparkline(aRange.aStart);
CPPUNIT_ASSERT(pSparkline);
CPPUNIT_ASSERT_EQUAL(SCCOL(0), pSparkline->getColumn());
CPPUNIT_ASSERT_EQUAL(SCROW(6), pSparkline->getRow());
// Delete Sparkline
CPPUNIT_ASSERT(rDocFunc.DeleteSparkline(ScAddress(0, 6, 0)));
// Check Sparkline at cell A7 doesn't exists
pSparkline = rDocument.GetSparkline(aRange.aStart);
CPPUNIT_ASSERT(!pSparkline);
// Undo
rDocument.GetUndoManager()->Undo();
// Check Sparkline at cell A7 exists
pSparkline = rDocument.GetSparkline(aRange.aStart);
CPPUNIT_ASSERT(pSparkline);
CPPUNIT_ASSERT_EQUAL(SCCOL(0), pSparkline->getColumn());
CPPUNIT_ASSERT_EQUAL(SCROW(6), pSparkline->getRow());
// Redo
rDocument.GetUndoManager()->Redo();
// Check Sparkline at cell A7 doesn't exists
pSparkline = rDocument.GetSparkline(aRange.aStart);
CPPUNIT_ASSERT(!pSparkline);
CPPUNIT_ASSERT(!rDocument.HasSparkline(aRange.aStart));
xDocSh->DoClose();
}
sc: add "Delete Sparkline Group" context menu action + Undo/Redo Change-Id: I34e11a4881c564351c3e08d157fb42ac4bb8ef3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132544 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-01 23:03:52 +09:00
void SparklineTest::testUndoRedoDeleteSparklineGroup()
{
ScDocShellRef xDocSh = loadEmptyDocument();
CPPUNIT_ASSERT(xDocSh);
ScDocument& rDocument = xDocSh->GetDocument();
ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
CPPUNIT_ASSERT(pViewShell);
auto& rDocFunc = xDocSh->GetDocFunc();
// insert test data - A1:A6
insertTestData(rDocument);
// Sparkline range
ScRange aDataRange(0, 0, 0, 3, 5, 0); //A1:D6
ScRange aRange(0, 6, 0, 3, 6, 0); // A7:D7
auto pSparklineGroup = std::make_shared<sc::SparklineGroup>();
CPPUNIT_ASSERT(rDocFunc.InsertSparklines(aDataRange, aRange, pSparklineGroup));
// Check Sparklines
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
// Delete Sparkline
CPPUNIT_ASSERT(rDocFunc.DeleteSparklineGroup(pSparklineGroup, SCTAB(0)));
// Check Sparklines
CPPUNIT_ASSERT_EQUAL(false, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(false, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(false, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(false, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
// Undo
rDocument.GetUndoManager()->Undo();
// Check Sparklines
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
// Check if the sparkline has the input range set
auto const& pSparkline = rDocument.GetSparkline(ScAddress(3, 6, 0));
ScRangeList rRangeList = pSparkline->getInputRange();
CPPUNIT_ASSERT_EQUAL(size_t(1), rRangeList.size());
CPPUNIT_ASSERT_EQUAL(ScRange(3, 0, 0, 3, 5, 0), rRangeList[0]);
// Redo
rDocument.GetUndoManager()->Redo();
// Check Sparklines
CPPUNIT_ASSERT_EQUAL(false, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(false, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(false, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(false, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
xDocSh->DoClose();
}
sc: undo/redo for sparklines when deleting the cell content This adds support for undo/redo when clearing the content of a cell, which includes a sparkline. Change-Id: I79d9ef965e21cf5b35de84aa3b5cb93b644777ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132476 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-22 11:03:24 +09:00
void SparklineTest::testUndoRedoClearContentForSparkline()
{
ScDocShellRef xDocSh = loadEmptyDocument();
CPPUNIT_ASSERT(xDocSh);
ScDocument& rDocument = xDocSh->GetDocument();
ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
CPPUNIT_ASSERT(pViewShell);
auto& rDocFunc = xDocSh->GetDocFunc();
// Try to delete sparkline that doesn't exist - returns false
CPPUNIT_ASSERT(!rDocFunc.DeleteSparkline(ScAddress(0, 6, 0)));
// insert test data - A1:A6
insertTestData(rDocument);
// Sparkline range
sc: improve keeping track of sparklines in SparklineList Issues can happen when saving a document with sparklines where a sparkline is deleted and then undo-ed. The reason for this is because the SparlineList wasn't correctly updated when deleting, copying or adding sparklines. This change adds hooks when new sparklines are created or when sparklines are deleted to report this into SparlineList. SparklineList garbage-collects itself but this is not enough when we rely that the non-deleted weak pointers to the sparkline groups contain the correct non-deleted weak pointers to the correct sparklines. Change-Id: I976cbe7e6168813d3dd5089c036cc7fe4e357fb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132554 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-03 15:53:55 +09:00
ScRange aDataRange(0, 0, 0, 3, 5, 0); //A1:D6
ScRange aRange(0, 6, 0, 3, 6, 0); // A7:D7
sc: undo/redo for sparklines when deleting the cell content This adds support for undo/redo when clearing the content of a cell, which includes a sparkline. Change-Id: I79d9ef965e21cf5b35de84aa3b5cb93b644777ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132476 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-22 11:03:24 +09:00
sc: improve keeping track of sparklines in SparklineList Issues can happen when saving a document with sparklines where a sparkline is deleted and then undo-ed. The reason for this is because the SparlineList wasn't correctly updated when deleting, copying or adding sparklines. This change adds hooks when new sparklines are created or when sparklines are deleted to report this into SparlineList. SparklineList garbage-collects itself but this is not enough when we rely that the non-deleted weak pointers to the sparkline groups contain the correct non-deleted weak pointers to the correct sparklines. Change-Id: I976cbe7e6168813d3dd5089c036cc7fe4e357fb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132554 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-03 15:53:55 +09:00
// Check Sparklines - none should exist
{
CPPUNIT_ASSERT(!rDocument.HasSparkline(ScAddress(0, 6, 0)));
CPPUNIT_ASSERT(!rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT(!rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT(!rDocument.HasSparkline(ScAddress(3, 6, 0)));
}
sc: undo/redo for sparklines when deleting the cell content This adds support for undo/redo when clearing the content of a cell, which includes a sparkline. Change-Id: I79d9ef965e21cf5b35de84aa3b5cb93b644777ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132476 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-22 11:03:24 +09:00
auto pSparklineGroup = std::make_shared<sc::SparklineGroup>();
sc: improve keeping track of sparklines in SparklineList Issues can happen when saving a document with sparklines where a sparkline is deleted and then undo-ed. The reason for this is because the SparlineList wasn't correctly updated when deleting, copying or adding sparklines. This change adds hooks when new sparklines are created or when sparklines are deleted to report this into SparlineList. SparklineList garbage-collects itself but this is not enough when we rely that the non-deleted weak pointers to the sparkline groups contain the correct non-deleted weak pointers to the correct sparklines. Change-Id: I976cbe7e6168813d3dd5089c036cc7fe4e357fb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132554 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-03 15:53:55 +09:00
CPPUNIT_ASSERT(rDocFunc.InsertSparklines(aDataRange, aRange, pSparklineGroup));
sc: undo/redo for sparklines when deleting the cell content This adds support for undo/redo when clearing the content of a cell, which includes a sparkline. Change-Id: I79d9ef965e21cf5b35de84aa3b5cb93b644777ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132476 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-22 11:03:24 +09:00
sc: improve keeping track of sparklines in SparklineList Issues can happen when saving a document with sparklines where a sparkline is deleted and then undo-ed. The reason for this is because the SparlineList wasn't correctly updated when deleting, copying or adding sparklines. This change adds hooks when new sparklines are created or when sparklines are deleted to report this into SparlineList. SparklineList garbage-collects itself but this is not enough when we rely that the non-deleted weak pointers to the sparkline groups contain the correct non-deleted weak pointers to the correct sparklines. Change-Id: I976cbe7e6168813d3dd5089c036cc7fe4e357fb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132554 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-03 15:53:55 +09:00
// Check Sparklines
{
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(0, 6, 0)));
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(2, 6, 0)));
// D7 exists
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(3, 6, 0)));
// Check D7
auto pSparkline = rDocument.GetSparkline(ScAddress(3, 6, 0));
CPPUNIT_ASSERT_EQUAL(SCCOL(3), pSparkline->getColumn());
CPPUNIT_ASSERT_EQUAL(SCROW(6), pSparkline->getRow());
// Check collections
auto* pSparklineList = rDocument.GetSparklineList(SCTAB(0));
auto pSparklineGroups = pSparklineList->getSparklineGroups();
CPPUNIT_ASSERT_EQUAL(size_t(1), pSparklineGroups.size());
auto pSparklines = pSparklineList->getSparklinesFor(pSparklineGroups[0]);
CPPUNIT_ASSERT_EQUAL(size_t(4), pSparklines.size());
}
sc: undo/redo for sparklines when deleting the cell content This adds support for undo/redo when clearing the content of a cell, which includes a sparkline. Change-Id: I79d9ef965e21cf5b35de84aa3b5cb93b644777ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132476 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-22 11:03:24 +09:00
sc: improve keeping track of sparklines in SparklineList Issues can happen when saving a document with sparklines where a sparkline is deleted and then undo-ed. The reason for this is because the SparlineList wasn't correctly updated when deleting, copying or adding sparklines. This change adds hooks when new sparklines are created or when sparklines are deleted to report this into SparlineList. SparklineList garbage-collects itself but this is not enough when we rely that the non-deleted weak pointers to the sparkline groups contain the correct non-deleted weak pointers to the correct sparklines. Change-Id: I976cbe7e6168813d3dd5089c036cc7fe4e357fb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132554 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-03 15:53:55 +09:00
// Clear content of cell D7 - including sparkline
{
ScMarkData aMark(rDocument.GetSheetLimits());
aMark.SetMarkArea(ScAddress(3, 6, 0));
rDocFunc.DeleteContents(aMark, InsertDeleteFlags::CONTENTS, true, true);
}
sc: undo/redo for sparklines when deleting the cell content This adds support for undo/redo when clearing the content of a cell, which includes a sparkline. Change-Id: I79d9ef965e21cf5b35de84aa3b5cb93b644777ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132476 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-22 11:03:24 +09:00
sc: improve keeping track of sparklines in SparklineList Issues can happen when saving a document with sparklines where a sparkline is deleted and then undo-ed. The reason for this is because the SparlineList wasn't correctly updated when deleting, copying or adding sparklines. This change adds hooks when new sparklines are created or when sparklines are deleted to report this into SparlineList. SparklineList garbage-collects itself but this is not enough when we rely that the non-deleted weak pointers to the sparkline groups contain the correct non-deleted weak pointers to the correct sparklines. Change-Id: I976cbe7e6168813d3dd5089c036cc7fe4e357fb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132554 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-03 15:53:55 +09:00
// Check Sparklines
{
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(2, 6, 0)));
// D7 is gone
CPPUNIT_ASSERT(!rDocument.HasSparkline(ScAddress(3, 6, 0)));
// Check collections
auto* pSparklineList = rDocument.GetSparklineList(SCTAB(0));
auto pSparklineGroups = pSparklineList->getSparklineGroups();
CPPUNIT_ASSERT_EQUAL(size_t(1), pSparklineGroups.size());
auto pSparklines = pSparklineList->getSparklinesFor(pSparklineGroups[0]);
CPPUNIT_ASSERT_EQUAL(size_t(3), pSparklines.size());
}
sc: undo/redo for sparklines when deleting the cell content This adds support for undo/redo when clearing the content of a cell, which includes a sparkline. Change-Id: I79d9ef965e21cf5b35de84aa3b5cb93b644777ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132476 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-22 11:03:24 +09:00
// Undo
rDocument.GetUndoManager()->Undo();
sc: improve keeping track of sparklines in SparklineList Issues can happen when saving a document with sparklines where a sparkline is deleted and then undo-ed. The reason for this is because the SparlineList wasn't correctly updated when deleting, copying or adding sparklines. This change adds hooks when new sparklines are created or when sparklines are deleted to report this into SparlineList. SparklineList garbage-collects itself but this is not enough when we rely that the non-deleted weak pointers to the sparkline groups contain the correct non-deleted weak pointers to the correct sparklines. Change-Id: I976cbe7e6168813d3dd5089c036cc7fe4e357fb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132554 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-03 15:53:55 +09:00
// Check Sparkline
{
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(0, 6, 0)));
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(2, 6, 0)));
// D7 exists - again
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(3, 6, 0)));
// Check D7
auto pSparkline = rDocument.GetSparkline(ScAddress(3, 6, 0));
CPPUNIT_ASSERT_EQUAL(SCCOL(3), pSparkline->getColumn());
CPPUNIT_ASSERT_EQUAL(SCROW(6), pSparkline->getRow());
auto* pSparklineList = rDocument.GetSparklineList(SCTAB(0));
auto pSparklineGroups = pSparklineList->getSparklineGroups();
CPPUNIT_ASSERT_EQUAL(size_t(1), pSparklineGroups.size());
auto pSparklines = pSparklineList->getSparklinesFor(pSparklineGroups[0]);
CPPUNIT_ASSERT_EQUAL(size_t(4), pSparklines.size());
}
sc: undo/redo for sparklines when deleting the cell content This adds support for undo/redo when clearing the content of a cell, which includes a sparkline. Change-Id: I79d9ef965e21cf5b35de84aa3b5cb93b644777ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132476 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-22 11:03:24 +09:00
// Redo
rDocument.GetUndoManager()->Redo();
sc: improve keeping track of sparklines in SparklineList Issues can happen when saving a document with sparklines where a sparkline is deleted and then undo-ed. The reason for this is because the SparlineList wasn't correctly updated when deleting, copying or adding sparklines. This change adds hooks when new sparklines are created or when sparklines are deleted to report this into SparlineList. SparklineList garbage-collects itself but this is not enough when we rely that the non-deleted weak pointers to the sparkline groups contain the correct non-deleted weak pointers to the correct sparklines. Change-Id: I976cbe7e6168813d3dd5089c036cc7fe4e357fb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132554 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-03 15:53:55 +09:00
// Check Sparklines
{
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT(rDocument.HasSparkline(ScAddress(2, 6, 0)));
// D7 is gone - again
CPPUNIT_ASSERT(!rDocument.HasSparkline(ScAddress(3, 6, 0)));
// Check collections
auto* pSparklineList = rDocument.GetSparklineList(SCTAB(0));
auto pSparklineGroups = pSparklineList->getSparklineGroups();
CPPUNIT_ASSERT_EQUAL(size_t(1), pSparklineGroups.size());
auto pSparklines = pSparklineList->getSparklinesFor(pSparklineGroups[0]);
CPPUNIT_ASSERT_EQUAL(size_t(3), pSparklines.size());
}
sc: undo/redo for sparklines when deleting the cell content This adds support for undo/redo when clearing the content of a cell, which includes a sparkline. Change-Id: I79d9ef965e21cf5b35de84aa3b5cb93b644777ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132476 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-22 11:03:24 +09:00
xDocSh->DoClose();
}
sc: add SparklineGroup Undo/Redo As SparklineAttributes are COW, we can just exchange them around in the SparklineGroup when undoing and redoing. This also changes SparklineDialog to work with a local copy of SparklineAttributes when editing, or an empty initial copy when inserting a new Sparkline into the sheet. Change-Id: I36e9c887ca640f40266f381e98e57f027a5ca07f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132542 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-31 23:07:44 +09:00
void SparklineTest::testUndoRedoEditSparklineGroup()
{
ScDocShellRef xDocSh = loadEmptyDocument();
CPPUNIT_ASSERT(xDocSh);
ScDocument& rDocument = xDocSh->GetDocument();
ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
CPPUNIT_ASSERT(pViewShell);
auto& rDocFunc = xDocSh->GetDocFunc();
auto pSparklineGroup = std::make_shared<sc::SparklineGroup>();
{
sc::SparklineAttributes& rAttibutes = pSparklineGroup->getAttributes();
rAttibutes.setType(sc::SparklineType::Column);
rAttibutes.setColorSeries(COL_YELLOW);
rAttibutes.setColorAxis(COL_GREEN);
}
rDocument.CreateSparkline(ScAddress(0, 6, 0), pSparklineGroup);
sc::SparklineAttributes aNewAttributes;
aNewAttributes.setType(sc::SparklineType::Stacked);
aNewAttributes.setColorSeries(COL_BLACK);
aNewAttributes.setColorAxis(COL_BLUE);
sc::SparklineAttributes aInitialAttibutes(pSparklineGroup->getAttributes());
CPPUNIT_ASSERT(aNewAttributes != aInitialAttibutes);
CPPUNIT_ASSERT_EQUAL(true, aInitialAttibutes == pSparklineGroup->getAttributes());
CPPUNIT_ASSERT_EQUAL(false, aNewAttributes == pSparklineGroup->getAttributes());
CPPUNIT_ASSERT_EQUAL(sc::SparklineType::Column, pSparklineGroup->getAttributes().getType());
CPPUNIT_ASSERT_EQUAL(COL_YELLOW, pSparklineGroup->getAttributes().getColorSeries());
CPPUNIT_ASSERT_EQUAL(COL_GREEN, pSparklineGroup->getAttributes().getColorAxis());
rDocFunc.ChangeSparklineGroupAttributes(pSparklineGroup, aNewAttributes);
CPPUNIT_ASSERT_EQUAL(false, aInitialAttibutes == pSparklineGroup->getAttributes());
CPPUNIT_ASSERT_EQUAL(true, aNewAttributes == pSparklineGroup->getAttributes());
CPPUNIT_ASSERT_EQUAL(sc::SparklineType::Stacked, pSparklineGroup->getAttributes().getType());
CPPUNIT_ASSERT_EQUAL(COL_BLACK, pSparklineGroup->getAttributes().getColorSeries());
CPPUNIT_ASSERT_EQUAL(COL_BLUE, pSparklineGroup->getAttributes().getColorAxis());
rDocument.GetUndoManager()->Undo();
CPPUNIT_ASSERT_EQUAL(true, aInitialAttibutes == pSparklineGroup->getAttributes());
CPPUNIT_ASSERT_EQUAL(false, aNewAttributes == pSparklineGroup->getAttributes());
CPPUNIT_ASSERT_EQUAL(sc::SparklineType::Column, pSparklineGroup->getAttributes().getType());
CPPUNIT_ASSERT_EQUAL(COL_YELLOW, pSparklineGroup->getAttributes().getColorSeries());
CPPUNIT_ASSERT_EQUAL(COL_GREEN, pSparklineGroup->getAttributes().getColorAxis());
rDocument.GetUndoManager()->Redo();
CPPUNIT_ASSERT_EQUAL(false, aInitialAttibutes == pSparklineGroup->getAttributes());
CPPUNIT_ASSERT_EQUAL(true, aNewAttributes == pSparklineGroup->getAttributes());
CPPUNIT_ASSERT_EQUAL(sc::SparklineType::Stacked, pSparklineGroup->getAttributes().getType());
CPPUNIT_ASSERT_EQUAL(COL_BLACK, pSparklineGroup->getAttributes().getColorSeries());
CPPUNIT_ASSERT_EQUAL(COL_BLUE, pSparklineGroup->getAttributes().getColorAxis());
xDocSh->DoClose();
}
sc: add Group and Ungroup to context menu for sparklines This change allows to group parklines together into a sparkline group, or ungroup them, so they use their own sparkline group. This also adds the undo and redo for this actions. Change-Id: I61b604203afaf2fe8c2d47b80082739ded15d6fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132545 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-03 09:02:38 +09:00
void SparklineTest::testUndoRedoUngroupSparklines()
{
ScDocShellRef xDocSh = loadEmptyDocument();
CPPUNIT_ASSERT(xDocSh);
ScDocument& rDocument = xDocSh->GetDocument();
ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
CPPUNIT_ASSERT(pViewShell);
auto& rDocFunc = xDocSh->GetDocFunc();
// insert test data - A1:A6
insertTestData(rDocument);
// Sparkline range
ScRange aDataRange(0, 0, 0, 3, 5, 0); //A1:D6
ScRange aRange(0, 6, 0, 3, 6, 0); // A7:D7
auto pSparklineGroup = std::make_shared<sc::SparklineGroup>();
CPPUNIT_ASSERT(rDocFunc.InsertSparklines(aDataRange, aRange, pSparklineGroup));
// Check Sparklines
{
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
auto pGroup1 = rDocument.GetSparkline(ScAddress(0, 6, 0))->getSparklineGroup();
auto pGroup2 = rDocument.GetSparkline(ScAddress(1, 6, 0))->getSparklineGroup();
auto pGroup3 = rDocument.GetSparkline(ScAddress(2, 6, 0))->getSparklineGroup();
auto pGroup4 = rDocument.GetSparkline(ScAddress(3, 6, 0))->getSparklineGroup();
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup2);
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup3);
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup4);
CPPUNIT_ASSERT_EQUAL(pGroup3, pGroup4);
}
CPPUNIT_ASSERT(rDocFunc.UngroupSparklines(ScRange(2, 6, 0, 3, 6, 0)));
// Check Sparklines
{
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
auto pGroup1 = rDocument.GetSparkline(ScAddress(0, 6, 0))->getSparklineGroup();
auto pGroup2 = rDocument.GetSparkline(ScAddress(1, 6, 0))->getSparklineGroup();
auto pGroup3 = rDocument.GetSparkline(ScAddress(2, 6, 0))->getSparklineGroup();
auto pGroup4 = rDocument.GetSparkline(ScAddress(3, 6, 0))->getSparklineGroup();
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup2);
CPPUNIT_ASSERT(pGroup1 != pGroup3);
CPPUNIT_ASSERT(pGroup1 != pGroup4);
CPPUNIT_ASSERT(pGroup3 != pGroup4);
}
// Undo
rDocument.GetUndoManager()->Undo();
// Check Sparklines
{
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
auto pGroup1 = rDocument.GetSparkline(ScAddress(0, 6, 0))->getSparklineGroup();
auto pGroup2 = rDocument.GetSparkline(ScAddress(1, 6, 0))->getSparklineGroup();
auto pGroup3 = rDocument.GetSparkline(ScAddress(2, 6, 0))->getSparklineGroup();
auto pGroup4 = rDocument.GetSparkline(ScAddress(3, 6, 0))->getSparklineGroup();
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup2);
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup3);
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup4);
CPPUNIT_ASSERT_EQUAL(pGroup3, pGroup4);
}
// Redo
rDocument.GetUndoManager()->Redo();
// Check Sparklines
{
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
auto pGroup1 = rDocument.GetSparkline(ScAddress(0, 6, 0))->getSparklineGroup();
auto pGroup2 = rDocument.GetSparkline(ScAddress(1, 6, 0))->getSparklineGroup();
auto pGroup3 = rDocument.GetSparkline(ScAddress(2, 6, 0))->getSparklineGroup();
auto pGroup4 = rDocument.GetSparkline(ScAddress(3, 6, 0))->getSparklineGroup();
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup2);
CPPUNIT_ASSERT(pGroup1 != pGroup3);
CPPUNIT_ASSERT(pGroup1 != pGroup4);
CPPUNIT_ASSERT(pGroup3 != pGroup4);
}
xDocSh->DoClose();
}
void SparklineTest::testUndoRedoGroupSparklines()
{
ScDocShellRef xDocSh = loadEmptyDocument();
CPPUNIT_ASSERT(xDocSh);
ScDocument& rDocument = xDocSh->GetDocument();
ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
CPPUNIT_ASSERT(pViewShell);
auto& rDocFunc = xDocSh->GetDocFunc();
// insert test data - A1:A6
insertTestData(rDocument);
// Sparkline range
ScRange aDataRange(0, 0, 0, 3, 5, 0); //A1:D6
ScRange aRange(0, 6, 0, 3, 6, 0); // A7:D7
auto pSparklineGroup = std::make_shared<sc::SparklineGroup>();
CPPUNIT_ASSERT(rDocFunc.InsertSparklines(aDataRange, aRange, pSparklineGroup));
// Check Sparklines
{
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
auto pGroup1 = rDocument.GetSparkline(ScAddress(0, 6, 0))->getSparklineGroup();
auto pGroup2 = rDocument.GetSparkline(ScAddress(1, 6, 0))->getSparklineGroup();
auto pGroup3 = rDocument.GetSparkline(ScAddress(2, 6, 0))->getSparklineGroup();
auto pGroup4 = rDocument.GetSparkline(ScAddress(3, 6, 0))->getSparklineGroup();
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup2);
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup3);
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup4);
CPPUNIT_ASSERT_EQUAL(pGroup3, pGroup4);
}
CPPUNIT_ASSERT(rDocFunc.UngroupSparklines(ScRange(2, 6, 0, 3, 6, 0)));
// Check Sparklines
{
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
auto pGroup1 = rDocument.GetSparkline(ScAddress(0, 6, 0))->getSparklineGroup();
auto pGroup2 = rDocument.GetSparkline(ScAddress(1, 6, 0))->getSparklineGroup();
auto pGroup3 = rDocument.GetSparkline(ScAddress(2, 6, 0))->getSparklineGroup();
auto pGroup4 = rDocument.GetSparkline(ScAddress(3, 6, 0))->getSparklineGroup();
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup2);
CPPUNIT_ASSERT(pGroup1 != pGroup3);
CPPUNIT_ASSERT(pGroup1 != pGroup4);
CPPUNIT_ASSERT(pGroup3 != pGroup4);
}
{
auto pGroup = rDocument.GetSparkline(ScAddress(3, 6, 0))->getSparklineGroup();
CPPUNIT_ASSERT(rDocFunc.GroupSparklines(ScRange(1, 6, 0, 3, 6, 0), pGroup));
}
// Check Sparklines
{
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
auto pGroup1 = rDocument.GetSparkline(ScAddress(0, 6, 0))->getSparklineGroup();
auto pGroup2 = rDocument.GetSparkline(ScAddress(1, 6, 0))->getSparklineGroup();
auto pGroup3 = rDocument.GetSparkline(ScAddress(2, 6, 0))->getSparklineGroup();
auto pGroup4 = rDocument.GetSparkline(ScAddress(3, 6, 0))->getSparklineGroup();
CPPUNIT_ASSERT(pGroup1 != pGroup2);
CPPUNIT_ASSERT(pGroup1 != pGroup3);
CPPUNIT_ASSERT(pGroup1 != pGroup4);
CPPUNIT_ASSERT_EQUAL(pGroup2, pGroup3);
CPPUNIT_ASSERT_EQUAL(pGroup2, pGroup4);
CPPUNIT_ASSERT_EQUAL(pGroup3, pGroup4);
}
// Undo
rDocument.GetUndoManager()->Undo();
// Check Sparklines
{
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
auto pGroup1 = rDocument.GetSparkline(ScAddress(0, 6, 0))->getSparklineGroup();
auto pGroup2 = rDocument.GetSparkline(ScAddress(1, 6, 0))->getSparklineGroup();
auto pGroup3 = rDocument.GetSparkline(ScAddress(2, 6, 0))->getSparklineGroup();
auto pGroup4 = rDocument.GetSparkline(ScAddress(3, 6, 0))->getSparklineGroup();
CPPUNIT_ASSERT_EQUAL(pGroup1, pGroup2);
CPPUNIT_ASSERT(pGroup1 != pGroup3);
CPPUNIT_ASSERT(pGroup1 != pGroup4);
CPPUNIT_ASSERT(pGroup3 != pGroup4);
}
// Redo
rDocument.GetUndoManager()->Redo();
// Check Sparklines
{
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(0, 6, 0))); // A7
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(1, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(2, 6, 0)));
CPPUNIT_ASSERT_EQUAL(true, rDocument.HasSparkline(ScAddress(3, 6, 0))); // D7
auto pGroup1 = rDocument.GetSparkline(ScAddress(0, 6, 0))->getSparklineGroup();
auto pGroup2 = rDocument.GetSparkline(ScAddress(1, 6, 0))->getSparklineGroup();
auto pGroup3 = rDocument.GetSparkline(ScAddress(2, 6, 0))->getSparklineGroup();
auto pGroup4 = rDocument.GetSparkline(ScAddress(3, 6, 0))->getSparklineGroup();
CPPUNIT_ASSERT(pGroup1 != pGroup2);
CPPUNIT_ASSERT(pGroup1 != pGroup3);
CPPUNIT_ASSERT(pGroup1 != pGroup4);
CPPUNIT_ASSERT_EQUAL(pGroup2, pGroup3);
CPPUNIT_ASSERT_EQUAL(pGroup2, pGroup4);
CPPUNIT_ASSERT_EQUAL(pGroup3, pGroup4);
}
xDocSh->DoClose();
}
sc: improve SparklineList to track added SparklineGroups SparklineList used to only track added Sparklines for a sheet, but usually (in an export) we want to start with SparklineGroups and then search for all sparklines belonging to a group. This changes to use that. Now there is a method getSparklineGroups() and then another method getSparklineFor(), which returns all sparklines for the input group. Also added SparklineListTest, and refactored the export code for OOXML and ODF. Change-Id: I975e30f649788d41aab92a9a3220e38998e39670 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132543 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-04-01 17:06:18 +09:00
void SparklineTest::testSparklineList()
{
ScDocShellRef xDocSh = loadEmptyDocument();
CPPUNIT_ASSERT(xDocSh);
ScDocument& rDocument = xDocSh->GetDocument();
auto pSparklineGroup = std::make_shared<sc::SparklineGroup>();
rDocument.CreateSparkline(ScAddress(0, 6, 0), pSparklineGroup);
{
auto* pSparklineList = rDocument.GetSparklineList(SCTAB(0));
auto pSparklineGroups = pSparklineList->getSparklineGroups();
CPPUNIT_ASSERT_EQUAL(size_t(1), pSparklineGroups.size());
auto pSparklines = pSparklineList->getSparklinesFor(pSparklineGroups[0]);
CPPUNIT_ASSERT_EQUAL(size_t(1), pSparklines.size());
}
rDocument.CreateSparkline(ScAddress(1, 6, 0), pSparklineGroup);
rDocument.CreateSparkline(ScAddress(2, 6, 0), pSparklineGroup);
{
auto* pSparklineList = rDocument.GetSparklineList(SCTAB(0));
auto pSparklineGroups = pSparklineList->getSparklineGroups();
CPPUNIT_ASSERT_EQUAL(size_t(1), pSparklineGroups.size());
auto pSparklines = pSparklineList->getSparklinesFor(pSparklineGroups[0]);
CPPUNIT_ASSERT_EQUAL(size_t(3), pSparklines.size());
}
{
auto pSparklineGroup2 = std::make_shared<sc::SparklineGroup>();
rDocument.CreateSparkline(ScAddress(3, 6, 0), pSparklineGroup2);
auto* pSparklineList = rDocument.GetSparklineList(SCTAB(0));
auto pSparklineGroups = pSparklineList->getSparklineGroups();
CPPUNIT_ASSERT_EQUAL(size_t(2), pSparklineGroups.size());
auto pSparklines2 = pSparklineList->getSparklinesFor(pSparklineGroup2);
CPPUNIT_ASSERT_EQUAL(size_t(1), pSparklines2.size());
}
rDocument.DeleteSparkline(ScAddress(3, 6, 0));
{
auto* pSparklineList = rDocument.GetSparklineList(SCTAB(0));
auto pSparklineGroups = pSparklineList->getSparklineGroups();
CPPUNIT_ASSERT_EQUAL(size_t(1), pSparklineGroups.size());
auto pSparklines = pSparklineList->getSparklinesFor(pSparklineGroups[0]);
CPPUNIT_ASSERT_EQUAL(size_t(3), pSparklines.size());
}
xDocSh->DoClose();
}
sc: simple unit test for adding a new Sparkline to a new document Change-Id: Ifb42167300dadd0e6c48bf178b7e8902985db3d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132464 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2022-03-10 14:08:35 +09:00
CPPUNIT_TEST_SUITE_REGISTRATION(SparklineTest);
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Reference in New Issue Copy Permalink