sc/CppunitTest_sc_bugfix_test.mk | 92 ------ sc/Module_sc.mk | 1 sc/qa/unit/bugfix-test.cxx | 445 -------------------------------- sc/qa/unit/subsequent_filters_test3.cxx | 407 +++++++++++++++++++++++++++++ 4 files changed, 407 insertions(+), 538 deletions(-)
New commits: commit bccd3f299f3e29578d1a0f041aeeba3bf28f778f Author: Xisco Fauli <[email protected]> AuthorDate: Wed Mar 1 10:54:39 2023 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Mar 1 16:21:23 2023 +0000 sc: move import tests where they belong and remove CppunitTest_sc_bugfix_test, which is no longer needed Change-Id: Idb1cff6580c621e325ce0b836695190d25467a0a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148035 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/CppunitTest_sc_bugfix_test.mk b/sc/CppunitTest_sc_bugfix_test.mk deleted file mode 100644 index 05bde6db007c..000000000000 --- a/sc/CppunitTest_sc_bugfix_test.mk +++ /dev/null @@ -1,92 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_CppunitTest_CppunitTest,sc_bugfix_test)) - -$(eval $(call gb_CppunitTest_use_common_precompiled_header,sc_bugfix_test)) - -$(eval $(call gb_CppunitTest_add_exception_objects,sc_bugfix_test, \ - sc/qa/unit/bugfix-test \ -)) - -$(eval $(call gb_CppunitTest_use_externals,sc_bugfix_test, \ - boost_headers \ - mdds_headers \ - libxml2 \ -)) - -$(eval $(call gb_CppunitTest_use_libraries,sc_bugfix_test, \ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - drawinglayer \ - drawinglayercore \ - editeng \ - for \ - forui \ - i18nlangtag \ - msfilter \ - oox \ - sal \ - salhelper \ - sax \ - sb \ - sc \ - scqahelper \ - sfx \ - sot \ - subsequenttest \ - svl \ - svt \ - svx \ - svxcore \ - test \ - tk \ - tl \ - ucbhelper \ - unotest \ - utl \ - $(call gb_Helper_optional,SCRIPTING, \ - vbahelper) \ - vcl \ - xo \ -)) - -$(eval $(call gb_CppunitTest_set_include,sc_bugfix_test,\ - -I$(SRCDIR)/sc/source/ui/inc \ - -I$(SRCDIR)/sc/inc \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_CppunitTest_use_api,sc_bugfix_test,\ - udkapi \ - offapi \ - oovbaapi \ -)) - -$(eval $(call gb_CppunitTest_use_ure,sc_bugfix_test)) -$(eval $(call gb_CppunitTest_use_vcl,sc_bugfix_test)) - -$(eval $(call gb_CppunitTest_use_rdb,sc_bugfix_test,services)) - -$(eval $(call gb_CppunitTest_use_configuration,sc_bugfix_test)) - -ifeq ($(OS),WNT) -# gpgme-w32spawn.exe is needed in workdir/LinkTarget/Executable -$(eval $(call gb_CppunitTest_use_packages,sc_bugfix_test,\ - $(call gb_Helper_optional,GPGMEPP,gpgmepp)\ -)) -endif - -$(eval $(call gb_CppunitTest_add_arguments,sc_bugfix_test, \ - -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 8364a6b260f0..b55a717574ba 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -54,7 +54,6 @@ $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_ucalc_sharedformula \ CppunitTest_sc_ucalc_sparkline \ CppunitTest_sc_ucalc_sort \ - CppunitTest_sc_bugfix_test \ CppunitTest_sc_filters_test \ CppunitTest_sc_mark_test \ CppunitTest_sc_core \ diff --git a/sc/qa/unit/bugfix-test.cxx b/sc/qa/unit/bugfix-test.cxx deleted file mode 100644 index 8c671eba0837..000000000000 --- a/sc/qa/unit/bugfix-test.cxx +++ /dev/null @@ -1,445 +0,0 @@ -/* -*- 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 <sal/config.h> - -#include <cstdlib> -#include <string_view> - -#include <postit.hxx> -#include <validat.hxx> -#include <tabvwsh.hxx> -#include <com/sun/star/drawing/FillStyle.hpp> -#include "helper/qahelper.hxx" -#include <svx/svdocapt.hxx> -#include <svx/xfillit0.hxx> -#include <svx/xflclit.hxx> -#include <svx/xflgrit.hxx> -#include <svx/xflhtit.hxx> -#include <drwlayer.hxx> -#include <svx/svdpage.hxx> -#include <userdat.hxx> -#include <stlpool.hxx> - -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; - -class ScFiltersTest : public ScModelTestBase -{ -public: - ScFiltersTest(); -}; - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf137216_HideCol) -{ - // The document contains a shape anchored "To Cell (resize with cell)" with start in C3. - // Error was, that hiding column C did not make the shape invisible. - - // Get document - createScDoc("ods/tdf137216_HideCol.ods"); - ScDocument* pDoc = getScDoc(); - - // Get shape - ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer(); - CPPUNIT_ASSERT_MESSAGE("Load: No ScDrawLayer", pDrawLayer); - const SdrPage* pPage = pDrawLayer->GetPage(0); - CPPUNIT_ASSERT_MESSAGE("Load: No draw page", pPage); - SdrObject* pObj = pPage->GetObj(0); - CPPUNIT_ASSERT_MESSAGE("Load: No object found", pObj); - - // Assert object is visible before and invisible after hiding column. - CPPUNIT_ASSERT_MESSAGE("before column hide: Object should be visible", pObj->IsVisible()); - pDoc->SetColHidden(2, 2, 0, true); // col C in UI = col index 2 to 2. - CPPUNIT_ASSERT_MESSAGE("after column hide: Object should be invisible", !pObj->IsVisible()); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf64229) -{ - createScDoc("ods/fdo64229b.ods"); - - ScDocShell* pDocSh = getScDocShell(); - pDocSh->DoHardRecalc(); - - ScDocument* pDoc = getScDoc(); - - //test hard recalc: document has an incorrect cached formula result - //hard recalc should have updated to the correct result - OUString aCSVFileName = createFilePath(u"contentCSV/fdo64229b.csv"); - testFile(aCSVFileName, *pDoc, 0); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf36933) -{ - createScDoc("ods/fdo36933test.ods"); - - ScDocShell* pDocSh = getScDocShell(); - pDocSh->DoHardRecalc(); - - ScDocument* pDoc = getScDoc(); - - //test hard recalc: document has an incorrect cached formula result - //hard recalc should have updated to the correct result - OUString aCSVFileName = createFilePath(u"contentCSV/fdo36933test.csv"); - testFile(aCSVFileName, *pDoc, 0); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf43700) -{ - createScDoc("ods/fdo43700test.ods"); - - ScDocShell* pDocSh = getScDocShell(); - pDocSh->DoHardRecalc(); - - ScDocument* pDoc = getScDoc(); - - //test hard recalc: document has an incorrect cached formula result - //hard recalc should have updated to the correct result - OUString aCSVFileName = createFilePath(u"contentCSV/fdo43700test.csv"); - testFile(aCSVFileName, *pDoc, 0); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf43534) -{ - createScDoc("ods/fdo43534test.ods"); - - ScDocShell* pDocSh = getScDocShell(); - pDocSh->DoHardRecalc(); - - //test hard recalc: document has an incorrect cached formula result - //hard recalc should have updated to the correct result - // createCSVPath("fdo43534test.", aCSVFileName); - // testFile(aCSVFileName, rDoc, 0); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf91979) -{ - createScDoc(); - - ScDocument* pDoc = getScDoc(); - ScTabViewShell* pViewShell = getViewShell(); - auto& aViewData = pViewShell->GetViewData(); - - // Check coordinates of a distant cell - Point aPos = aViewData.GetScrPos(pDoc->MaxCol() - 1, 10000, SC_SPLIT_TOPLEFT, true); - int nColWidth = ScViewData::ToPixel(pDoc->GetColWidth(0, 0), aViewData.GetPPTX()); - int nRowHeight = ScViewData::ToPixel(pDoc->GetRowHeight(0, 0), aViewData.GetPPTY()); - CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>((pDoc->MaxCol() - 1) * nColWidth), aPos.getX()); - CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(10000 * nRowHeight), aPos.getY()); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf98657) -{ - createScDoc("ods/tdf98657.ods"); - ScDocument* pDoc = getScDoc(); - - ScDocShell* pDocSh = getScDocShell(); - pDocSh->DoHardRecalc(); - - // this was a NaN before the fix - CPPUNIT_ASSERT_EQUAL(285.0, pDoc->GetValue(ScAddress(1, 1, 0))); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf88821) -{ - setImportFilterName("calc_HTML_WebQuery"); - createScDoc("html/tdf88821.html"); - ScDocument* pDoc = getScDoc(); - - // B2 should be 'Périmètre', not 'Périmètre' - CPPUNIT_ASSERT_EQUAL(OStringToOUString("P\xC3\xA9rim\xC3\xA8tre", RTL_TEXTENCODING_UTF8), - pDoc->GetString(1, 1, 0)); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf88821_2) -{ - setImportFilterName("calc_HTML_WebQuery"); - createScDoc("html/tdf88821-2.html"); - ScDocument* pDoc = getScDoc(); - - // A2 should be 'ABCabcČŠŽčšž', not 'ABCabcČŠŽÄﾍšž' - CPPUNIT_ASSERT_EQUAL(OStringToOUString("ABCabc\xC4\x8C\xC5\xA0\xC5\xBD\xC4\x8D\xC5\xA1\xC5\xBE", - RTL_TEXTENCODING_UTF8), - pDoc->GetString(0, 1, 0)); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf103960) -{ - setImportFilterName("calc_HTML_WebQuery"); - createScDoc("html/tdf103960.html"); - ScDocument* pDoc = getScDoc(); - - // A1 should be 'Data', not the entire content of the file - CPPUNIT_ASSERT_EQUAL(OStringToOUString("Data", RTL_TEXTENCODING_UTF8), - pDoc->GetString(0, 0, 0)); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testRhbz1390776) -{ - createScDoc("xml/rhbz1390776.xml"); - ScDocument* pDoc = getScDoc(); - - CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong range", OUString("=SUM(A18:A23)"), - pDoc->GetFormula(0, 27, 0)); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf104310) -{ - // 1. Test x14 extension - { - createScDoc("xlsx/tdf104310.xlsx"); - ScDocument* pDoc = getScDoc(); - - const ScValidationData* pData = pDoc->GetValidationEntry(1); - CPPUNIT_ASSERT(pData); - - // Make sure the list is correct. - std::vector<ScTypedStrData> aList; - pData->FillSelectionList(aList, ScAddress(0, 1, 0)); - CPPUNIT_ASSERT_EQUAL(size_t(5), aList.size()); - for (size_t i = 0; i < 5; ++i) - CPPUNIT_ASSERT_DOUBLES_EQUAL(double(i + 1), aList[i].GetValue(), 1e-8); - } - - // 2. Test x12ac extension - { - createScDoc("xlsx/tdf104310-2.xlsx"); - ScDocument* pDoc = getScDoc(); - - const ScValidationData* pData = pDoc->GetValidationEntry(1); - CPPUNIT_ASSERT(pData); - - // Make sure the list is correct. - std::vector<ScTypedStrData> aList; - pData->FillSelectionList(aList, ScAddress(0, 1, 0)); - CPPUNIT_ASSERT_EQUAL(size_t(3), aList.size()); - CPPUNIT_ASSERT_EQUAL(OUString("1"), aList[0].GetString()); - CPPUNIT_ASSERT_EQUAL(OUString("2,3"), aList[1].GetString()); - CPPUNIT_ASSERT_EQUAL(OUString("4"), aList[2].GetString()); - } -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf31231) -{ - // We must open it read-write to allow setting modified flag - createScDoc("ods/tdf31231.ods"); - ScDocShell* pDocSh = getScDocShell(); - - CPPUNIT_ASSERT_MESSAGE("The spreadsheet must be allowed to set modified state", - pDocSh->IsEnableSetModified()); - CPPUNIT_ASSERT_MESSAGE("The spreadsheet must not be modified on open", !pDocSh->IsModified()); - - pDocSh->DoHardRecalc(); - - CPPUNIT_ASSERT_MESSAGE("The spreadsheet must be allowed to set modified state", - pDocSh->IsEnableSetModified()); - CPPUNIT_ASSERT_MESSAGE("The spreadsheet must not be modified on open", pDocSh->IsModified()); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf141914) -{ - // We must open it read-write to allow setting modified flag - createScDoc("ods/tdf141914.ods"); - ScDocShell* pDocSh = getScDocShell(); - - CPPUNIT_ASSERT_MESSAGE("The spreadsheet must be allowed to set modified state", - pDocSh->IsEnableSetModified()); - CPPUNIT_ASSERT_MESSAGE("The spreadsheet must not be modified on open", !pDocSh->IsModified()); - - pDocSh->DoHardRecalc(); - - CPPUNIT_ASSERT_MESSAGE("The spreadsheet must be allowed to set modified state", - pDocSh->IsEnableSetModified()); - CPPUNIT_ASSERT_MESSAGE("The spreadsheet must not be modified on open", pDocSh->IsModified()); -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf128951) -{ - createScDoc(); - - // 2. Create a new sheet instance - css::uno::Reference<css::lang::XMultiServiceFactory> xFac(mxComponent, - css::uno::UNO_QUERY_THROW); - auto xSheet = xFac->createInstance("com.sun.star.sheet.Spreadsheet"); - - // 3. Insert sheet into the spreadsheet (was throwing IllegalArgumentException) - css::uno::Reference<css::sheet::XSpreadsheetDocument> xDoc(mxComponent, - css::uno::UNO_QUERY_THROW); - CPPUNIT_ASSERT_NO_THROW(xDoc->getSheets()->insertByName("mustNotThrow", css::uno::Any(xSheet))); -} - -namespace -{ -SdrCaptionObj* checkCaption(ScDocument& rDoc, const ScAddress& rAddress, bool bIsShown) -{ - ScPostIt* pNote = rDoc.GetNote(rAddress); - - CPPUNIT_ASSERT(pNote); - CPPUNIT_ASSERT_EQUAL(pNote->IsCaptionShown(), bIsShown); - - if (!bIsShown) - pNote->ShowCaption(rAddress, true); - - SdrCaptionObj* pCaption = pNote->GetCaption(); - CPPUNIT_ASSERT(pCaption); - - return pCaption; -} -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf129789) -{ - createScDoc("ods/tdf129789.ods"); - ScDocument* pDoc = getScDoc(); - - { - // Fill: None - SdrCaptionObj* const pCaptionB2 = checkCaption(*pDoc, ScAddress(1, 1, 0), true); - - const XFillStyleItem& rStyleItemB2 = pCaptionB2->GetMergedItem(XATTR_FILLSTYLE); - - CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, rStyleItemB2.GetValue()); - - SdrCaptionObj* const pCaptionB9 = checkCaption(*pDoc, ScAddress(1, 8, 0), false); - - const XFillStyleItem& rStyleItemB9 = pCaptionB9->GetMergedItem(XATTR_FILLSTYLE); - - CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, rStyleItemB9.GetValue()); - } - - { - // Fill: Solid - SdrCaptionObj* const pCaptionE2 = checkCaption(*pDoc, ScAddress(4, 1, 0), true); - - const XFillStyleItem& rStyleItemE2 = pCaptionE2->GetMergedItem(XATTR_FILLSTYLE); - - CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, rStyleItemE2.GetValue()); - - const XFillColorItem& rColorItem = pCaptionE2->GetMergedItem(XATTR_FILLCOLOR); - CPPUNIT_ASSERT_EQUAL(Color(0xffffc0), rColorItem.GetColorValue()); - - SdrCaptionObj* const pCaptionE9 = checkCaption(*pDoc, ScAddress(4, 8, 0), false); - - const XFillStyleItem& rStyleItemE9 = pCaptionE9->GetMergedItem(XATTR_FILLSTYLE); - - CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, rStyleItemE9.GetValue()); - - const XFillColorItem& rColorItem2 = pCaptionE9->GetMergedItem(XATTR_FILLCOLOR); - CPPUNIT_ASSERT_EQUAL(Color(0xffffc0), rColorItem2.GetColorValue()); - } - - { - // Fill: Gradient - SdrCaptionObj* const pCaptionH2 = checkCaption(*pDoc, ScAddress(7, 1, 0), true); - - const XFillStyleItem& rStyleItemH2 = pCaptionH2->GetMergedItem(XATTR_FILLSTYLE); - - CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_GRADIENT, rStyleItemH2.GetValue()); - const XFillGradientItem& rGradientItem = pCaptionH2->GetMergedItem(XATTR_FILLGRADIENT); - CPPUNIT_ASSERT_EQUAL(Color(0xdde8cb), rGradientItem.GetGradientValue().GetStartColor()); - CPPUNIT_ASSERT_EQUAL(Color(0xffd7d7), rGradientItem.GetGradientValue().GetEndColor()); - - SdrCaptionObj* const pCaptionH9 = checkCaption(*pDoc, ScAddress(7, 8, 0), false); - - const XFillStyleItem& rStyleItemH9 = pCaptionH9->GetMergedItem(XATTR_FILLSTYLE); - - CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_GRADIENT, rStyleItemH9.GetValue()); - const XFillGradientItem& rGradientItem2 = pCaptionH2->GetMergedItem(XATTR_FILLGRADIENT); - CPPUNIT_ASSERT_EQUAL(Color(0xdde8cb), rGradientItem2.GetGradientValue().GetStartColor()); - CPPUNIT_ASSERT_EQUAL(Color(0xffd7d7), rGradientItem2.GetGradientValue().GetEndColor()); - } - - { - // Fill: Hatch - SdrCaptionObj* const pCaptionK2 = checkCaption(*pDoc, ScAddress(10, 1, 0), true); - - const XFillStyleItem& rStyleItemK2 = pCaptionK2->GetMergedItem(XATTR_FILLSTYLE); - - CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_HATCH, rStyleItemK2.GetValue()); - const XFillHatchItem& rHatchItem = pCaptionK2->GetMergedItem(XATTR_FILLHATCH); - CPPUNIT_ASSERT_EQUAL(Color(0x000080), rHatchItem.GetHatchValue().GetColor()); - - SdrCaptionObj* const pCaptionK9 = checkCaption(*pDoc, ScAddress(10, 8, 0), false); - - const XFillStyleItem& rStyleItemK9 = pCaptionK9->GetMergedItem(XATTR_FILLSTYLE); - - CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_HATCH, rStyleItemK9.GetValue()); - const XFillHatchItem& rHatchItem2 = pCaptionK9->GetMergedItem(XATTR_FILLHATCH); - CPPUNIT_ASSERT_EQUAL(Color(0x000080), rHatchItem2.GetHatchValue().GetColor()); - } - - { - // Fill: Bitmap - SdrCaptionObj* const pCaptionN2 = checkCaption(*pDoc, ScAddress(13, 1, 0), true); - - const XFillStyleItem& rStyleItemN2 = pCaptionN2->GetMergedItem(XATTR_FILLSTYLE); - - CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, rStyleItemN2.GetValue()); - - SdrCaptionObj* const pCaptionN9 = checkCaption(*pDoc, ScAddress(13, 8, 0), false); - - const XFillStyleItem& rStyleItemN9 = pCaptionN9->GetMergedItem(XATTR_FILLSTYLE); - - CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, rStyleItemN9.GetValue()); - } -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf130725) -{ - createScDoc(); - - uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW); - - // 2. Insert 0.0042 into a cell as a formula, to force the conversion from string to double - css::uno::Reference<css::sheet::XCellRangesAccess> xSheets(xDoc->getSheets(), - css::uno::UNO_QUERY_THROW); - css::uno::Reference<css::table::XCell> xCell = xSheets->getCellByPosition(0, 0, 0); - xCell->setFormula("0.0042"); // this assumes en-US locale - - // 3. Check that the value is the nearest double-precision representation of the decimal 0.0042 - // (it was 0.0042000000000000006 instead of 0.0041999999999999997). - CPPUNIT_ASSERT_EQUAL_MESSAGE("Value must be the nearest representation of decimal 0.0042", - 0.0042, xCell->getValue()); // strict equality -} - -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf104502_hiddenColsCountedInPageCount) -{ - createScDoc("ods/tdf104502_hiddenColsCountedInPageCount.ods"); - - ScDocument* pDoc = getScDoc(); - - //Check that hidden columns are not calculated into Print Area - SCCOL nEndCol = 0; - SCROW nEndRow = 0; - CPPUNIT_ASSERT(pDoc->GetPrintArea(0, nEndCol, nEndRow, false)); - CPPUNIT_ASSERT_EQUAL(SCCOL(0), nEndCol); - CPPUNIT_ASSERT_EQUAL(SCROW(55), nEndRow); -} -CPPUNIT_TEST_FIXTURE(ScFiltersTest, testTdf108188_pagestyle) -{ - createScDoc("ods/tdf108188_pagestyle.ods"); - - // Check if the user defined page style is present - const OUString aTestPageStyle = "TestPageStyle"; - ScDocument* pDoc = getScDoc(); - CPPUNIT_ASSERT_EQUAL(aTestPageStyle, pDoc->GetPageStyle(0)); - - // Without the accompanying fix in place, the page styles are always used - ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); - CPPUNIT_ASSERT(pStylePool->Find(aTestPageStyle, SfxStyleFamily::Page)->IsUsed()); - CPPUNIT_ASSERT(!pStylePool->Find("Default", SfxStyleFamily::Page)->IsUsed()); -} - -ScFiltersTest::ScFiltersTest() - : ScModelTestBase("sc/qa/unit/data") -{ -} - -CPPUNIT_PLUGIN_IMPLEMENT(); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/qa/unit/subsequent_filters_test3.cxx b/sc/qa/unit/subsequent_filters_test3.cxx index 5e2683fe875b..dd9f92eea7ba 100644 --- a/sc/qa/unit/subsequent_filters_test3.cxx +++ b/sc/qa/unit/subsequent_filters_test3.cxx @@ -13,7 +13,12 @@ #include <sfx2/docfile.hxx> #include <svx/svdpage.hxx> +#include <svx/svdocapt.hxx> #include <svx/svdoole2.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xflclit.hxx> +#include <svx/xflgrit.hxx> +#include <svx/xflhtit.hxx> #include <editeng/borderline.hxx> #include <editeng/lineitem.hxx> #include <dbdata.hxx> @@ -28,7 +33,9 @@ #include <hints.hxx> #include <detfunc.hxx> #include <scerrors.hxx> +#include <tabvwsh.hxx> +#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> @@ -1314,6 +1321,406 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf151818_SmartArtFontColor) } } +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf137216_HideCol) +{ + // The document contains a shape anchored "To Cell (resize with cell)" with start in C3. + // Error was, that hiding column C did not make the shape invisible. + + // Get document + createScDoc("ods/tdf137216_HideCol.ods"); + ScDocument* pDoc = getScDoc(); + + // Get shape + ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer(); + CPPUNIT_ASSERT_MESSAGE("Load: No ScDrawLayer", pDrawLayer); + const SdrPage* pPage = pDrawLayer->GetPage(0); + CPPUNIT_ASSERT_MESSAGE("Load: No draw page", pPage); + SdrObject* pObj = pPage->GetObj(0); + CPPUNIT_ASSERT_MESSAGE("Load: No object found", pObj); + + // Assert object is visible before and invisible after hiding column. + CPPUNIT_ASSERT_MESSAGE("before column hide: Object should be visible", pObj->IsVisible()); + pDoc->SetColHidden(2, 2, 0, true); // col C in UI = col index 2 to 2. + CPPUNIT_ASSERT_MESSAGE("after column hide: Object should be invisible", !pObj->IsVisible()); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf64229) +{ + createScDoc("ods/fdo64229b.ods"); + + ScDocShell* pDocSh = getScDocShell(); + pDocSh->DoHardRecalc(); + + ScDocument* pDoc = getScDoc(); + + //test hard recalc: document has an incorrect cached formula result + //hard recalc should have updated to the correct result + OUString aCSVFileName = createFilePath(u"contentCSV/fdo64229b.csv"); + testFile(aCSVFileName, *pDoc, 0); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf36933) +{ + createScDoc("ods/fdo36933test.ods"); + + ScDocShell* pDocSh = getScDocShell(); + pDocSh->DoHardRecalc(); + + ScDocument* pDoc = getScDoc(); + + //test hard recalc: document has an incorrect cached formula result + //hard recalc should have updated to the correct result + OUString aCSVFileName = createFilePath(u"contentCSV/fdo36933test.csv"); + testFile(aCSVFileName, *pDoc, 0); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf43700) +{ + createScDoc("ods/fdo43700test.ods"); + + ScDocShell* pDocSh = getScDocShell(); + pDocSh->DoHardRecalc(); + + ScDocument* pDoc = getScDoc(); + + //test hard recalc: document has an incorrect cached formula result + //hard recalc should have updated to the correct result + OUString aCSVFileName = createFilePath(u"contentCSV/fdo43700test.csv"); + testFile(aCSVFileName, *pDoc, 0); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf43534) +{ + createScDoc("ods/fdo43534test.ods"); + + ScDocShell* pDocSh = getScDocShell(); + pDocSh->DoHardRecalc(); + + //test hard recalc: document has an incorrect cached formula result + //hard recalc should have updated to the correct result + // createCSVPath("fdo43534test.", aCSVFileName); + // testFile(aCSVFileName, rDoc, 0); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf91979) +{ + createScDoc(); + + ScDocument* pDoc = getScDoc(); + ScTabViewShell* pViewShell = getViewShell(); + auto& aViewData = pViewShell->GetViewData(); + + // Check coordinates of a distant cell + Point aPos = aViewData.GetScrPos(pDoc->MaxCol() - 1, 10000, SC_SPLIT_TOPLEFT, true); + int nColWidth = ScViewData::ToPixel(pDoc->GetColWidth(0, 0), aViewData.GetPPTX()); + int nRowHeight = ScViewData::ToPixel(pDoc->GetRowHeight(0, 0), aViewData.GetPPTY()); + CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>((pDoc->MaxCol() - 1) * nColWidth), aPos.getX()); + CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(10000 * nRowHeight), aPos.getY()); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf98657) +{ + createScDoc("ods/tdf98657.ods"); + ScDocument* pDoc = getScDoc(); + + ScDocShell* pDocSh = getScDocShell(); + pDocSh->DoHardRecalc(); + + // this was a NaN before the fix + CPPUNIT_ASSERT_EQUAL(285.0, pDoc->GetValue(ScAddress(1, 1, 0))); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf88821) +{ + setImportFilterName("calc_HTML_WebQuery"); + createScDoc("html/tdf88821.html"); + ScDocument* pDoc = getScDoc(); + + // B2 should be 'Périmètre', not 'Périmètre' + CPPUNIT_ASSERT_EQUAL(OStringToOUString("P\xC3\xA9rim\xC3\xA8tre", RTL_TEXTENCODING_UTF8), + pDoc->GetString(1, 1, 0)); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf88821_2) +{ + setImportFilterName("calc_HTML_WebQuery"); + createScDoc("html/tdf88821-2.html"); + ScDocument* pDoc = getScDoc(); + + // A2 should be 'ABCabcČŠŽčšž', not 'ABCabcČŠŽÄﾍšž' + CPPUNIT_ASSERT_EQUAL(OStringToOUString("ABCabc\xC4\x8C\xC5\xA0\xC5\xBD\xC4\x8D\xC5\xA1\xC5\xBE", + RTL_TEXTENCODING_UTF8), + pDoc->GetString(0, 1, 0)); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf103960) +{ + setImportFilterName("calc_HTML_WebQuery"); + createScDoc("html/tdf103960.html"); + ScDocument* pDoc = getScDoc(); + + // A1 should be 'Data', not the entire content of the file + CPPUNIT_ASSERT_EQUAL(OStringToOUString("Data", RTL_TEXTENCODING_UTF8), + pDoc->GetString(0, 0, 0)); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testRhbz1390776) +{ + createScDoc("xml/rhbz1390776.xml"); + ScDocument* pDoc = getScDoc(); + + CPPUNIT_ASSERT_EQUAL_MESSAGE("Wrong range", OUString("=SUM(A18:A23)"), + pDoc->GetFormula(0, 27, 0)); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf104310) +{ + // 1. Test x14 extension + { + createScDoc("xlsx/tdf104310.xlsx"); + ScDocument* pDoc = getScDoc(); + + const ScValidationData* pData = pDoc->GetValidationEntry(1); + CPPUNIT_ASSERT(pData); + + // Make sure the list is correct. + std::vector<ScTypedStrData> aList; + pData->FillSelectionList(aList, ScAddress(0, 1, 0)); + CPPUNIT_ASSERT_EQUAL(size_t(5), aList.size()); + for (size_t i = 0; i < 5; ++i) + CPPUNIT_ASSERT_DOUBLES_EQUAL(double(i + 1), aList[i].GetValue(), 1e-8); + } + + // 2. Test x12ac extension + { + createScDoc("xlsx/tdf104310-2.xlsx"); + ScDocument* pDoc = getScDoc(); + + const ScValidationData* pData = pDoc->GetValidationEntry(1); + CPPUNIT_ASSERT(pData); + + // Make sure the list is correct. + std::vector<ScTypedStrData> aList; + pData->FillSelectionList(aList, ScAddress(0, 1, 0)); + CPPUNIT_ASSERT_EQUAL(size_t(3), aList.size()); + CPPUNIT_ASSERT_EQUAL(OUString("1"), aList[0].GetString()); + CPPUNIT_ASSERT_EQUAL(OUString("2,3"), aList[1].GetString()); + CPPUNIT_ASSERT_EQUAL(OUString("4"), aList[2].GetString()); + } +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf31231) +{ + // We must open it read-write to allow setting modified flag + createScDoc("ods/tdf31231.ods"); + ScDocShell* pDocSh = getScDocShell(); + + CPPUNIT_ASSERT_MESSAGE("The spreadsheet must be allowed to set modified state", + pDocSh->IsEnableSetModified()); + CPPUNIT_ASSERT_MESSAGE("The spreadsheet must not be modified on open", !pDocSh->IsModified()); + + pDocSh->DoHardRecalc(); + + CPPUNIT_ASSERT_MESSAGE("The spreadsheet must be allowed to set modified state", + pDocSh->IsEnableSetModified()); + CPPUNIT_ASSERT_MESSAGE("The spreadsheet must not be modified on open", pDocSh->IsModified()); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf141914) +{ + // We must open it read-write to allow setting modified flag + createScDoc("ods/tdf141914.ods"); + ScDocShell* pDocSh = getScDocShell(); + + CPPUNIT_ASSERT_MESSAGE("The spreadsheet must be allowed to set modified state", + pDocSh->IsEnableSetModified()); + CPPUNIT_ASSERT_MESSAGE("The spreadsheet must not be modified on open", !pDocSh->IsModified()); + + pDocSh->DoHardRecalc(); + + CPPUNIT_ASSERT_MESSAGE("The spreadsheet must be allowed to set modified state", + pDocSh->IsEnableSetModified()); + CPPUNIT_ASSERT_MESSAGE("The spreadsheet must not be modified on open", pDocSh->IsModified()); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf128951) +{ + createScDoc(); + + // 2. Create a new sheet instance + css::uno::Reference<css::lang::XMultiServiceFactory> xFac(mxComponent, + css::uno::UNO_QUERY_THROW); + auto xSheet = xFac->createInstance("com.sun.star.sheet.Spreadsheet"); + + // 3. Insert sheet into the spreadsheet (was throwing IllegalArgumentException) + css::uno::Reference<css::sheet::XSpreadsheetDocument> xDoc(mxComponent, + css::uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT_NO_THROW(xDoc->getSheets()->insertByName("mustNotThrow", css::uno::Any(xSheet))); +} + +namespace +{ +SdrCaptionObj* checkCaption(ScDocument& rDoc, const ScAddress& rAddress, bool bIsShown) +{ + ScPostIt* pNote = rDoc.GetNote(rAddress); + + CPPUNIT_ASSERT(pNote); + CPPUNIT_ASSERT_EQUAL(pNote->IsCaptionShown(), bIsShown); + + if (!bIsShown) + pNote->ShowCaption(rAddress, true); + + SdrCaptionObj* pCaption = pNote->GetCaption(); + CPPUNIT_ASSERT(pCaption); + + return pCaption; +} +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf129789) +{ + createScDoc("ods/tdf129789.ods"); + ScDocument* pDoc = getScDoc(); + + { + // Fill: None + SdrCaptionObj* const pCaptionB2 = checkCaption(*pDoc, ScAddress(1, 1, 0), true); + + const XFillStyleItem& rStyleItemB2 = pCaptionB2->GetMergedItem(XATTR_FILLSTYLE); + + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, rStyleItemB2.GetValue()); + + SdrCaptionObj* const pCaptionB9 = checkCaption(*pDoc, ScAddress(1, 8, 0), false); + + const XFillStyleItem& rStyleItemB9 = pCaptionB9->GetMergedItem(XATTR_FILLSTYLE); + + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, rStyleItemB9.GetValue()); + } + + { + // Fill: Solid + SdrCaptionObj* const pCaptionE2 = checkCaption(*pDoc, ScAddress(4, 1, 0), true); + + const XFillStyleItem& rStyleItemE2 = pCaptionE2->GetMergedItem(XATTR_FILLSTYLE); + + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, rStyleItemE2.GetValue()); + + const XFillColorItem& rColorItem = pCaptionE2->GetMergedItem(XATTR_FILLCOLOR); + CPPUNIT_ASSERT_EQUAL(Color(0xffffc0), rColorItem.GetColorValue()); + + SdrCaptionObj* const pCaptionE9 = checkCaption(*pDoc, ScAddress(4, 8, 0), false); + + const XFillStyleItem& rStyleItemE9 = pCaptionE9->GetMergedItem(XATTR_FILLSTYLE); + + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, rStyleItemE9.GetValue()); + + const XFillColorItem& rColorItem2 = pCaptionE9->GetMergedItem(XATTR_FILLCOLOR); + CPPUNIT_ASSERT_EQUAL(Color(0xffffc0), rColorItem2.GetColorValue()); + } + + { + // Fill: Gradient + SdrCaptionObj* const pCaptionH2 = checkCaption(*pDoc, ScAddress(7, 1, 0), true); + + const XFillStyleItem& rStyleItemH2 = pCaptionH2->GetMergedItem(XATTR_FILLSTYLE); + + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_GRADIENT, rStyleItemH2.GetValue()); + const XFillGradientItem& rGradientItem = pCaptionH2->GetMergedItem(XATTR_FILLGRADIENT); + CPPUNIT_ASSERT_EQUAL(Color(0xdde8cb), rGradientItem.GetGradientValue().GetStartColor()); + CPPUNIT_ASSERT_EQUAL(Color(0xffd7d7), rGradientItem.GetGradientValue().GetEndColor()); + + SdrCaptionObj* const pCaptionH9 = checkCaption(*pDoc, ScAddress(7, 8, 0), false); + + const XFillStyleItem& rStyleItemH9 = pCaptionH9->GetMergedItem(XATTR_FILLSTYLE); + + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_GRADIENT, rStyleItemH9.GetValue()); + const XFillGradientItem& rGradientItem2 = pCaptionH2->GetMergedItem(XATTR_FILLGRADIENT); + CPPUNIT_ASSERT_EQUAL(Color(0xdde8cb), rGradientItem2.GetGradientValue().GetStartColor()); + CPPUNIT_ASSERT_EQUAL(Color(0xffd7d7), rGradientItem2.GetGradientValue().GetEndColor()); + } + + { + // Fill: Hatch + SdrCaptionObj* const pCaptionK2 = checkCaption(*pDoc, ScAddress(10, 1, 0), true); + + const XFillStyleItem& rStyleItemK2 = pCaptionK2->GetMergedItem(XATTR_FILLSTYLE); + + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_HATCH, rStyleItemK2.GetValue()); + const XFillHatchItem& rHatchItem = pCaptionK2->GetMergedItem(XATTR_FILLHATCH); + CPPUNIT_ASSERT_EQUAL(Color(0x000080), rHatchItem.GetHatchValue().GetColor()); + + SdrCaptionObj* const pCaptionK9 = checkCaption(*pDoc, ScAddress(10, 8, 0), false); + + const XFillStyleItem& rStyleItemK9 = pCaptionK9->GetMergedItem(XATTR_FILLSTYLE); + + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_HATCH, rStyleItemK9.GetValue()); + const XFillHatchItem& rHatchItem2 = pCaptionK9->GetMergedItem(XATTR_FILLHATCH); + CPPUNIT_ASSERT_EQUAL(Color(0x000080), rHatchItem2.GetHatchValue().GetColor()); + } + + { + // Fill: Bitmap + SdrCaptionObj* const pCaptionN2 = checkCaption(*pDoc, ScAddress(13, 1, 0), true); + + const XFillStyleItem& rStyleItemN2 = pCaptionN2->GetMergedItem(XATTR_FILLSTYLE); + + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, rStyleItemN2.GetValue()); + + SdrCaptionObj* const pCaptionN9 = checkCaption(*pDoc, ScAddress(13, 8, 0), false); + + const XFillStyleItem& rStyleItemN9 = pCaptionN9->GetMergedItem(XATTR_FILLSTYLE); + + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, rStyleItemN9.GetValue()); + } +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf130725) +{ + createScDoc(); + + uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW); + + // 2. Insert 0.0042 into a cell as a formula, to force the conversion from string to double + css::uno::Reference<css::sheet::XCellRangesAccess> xSheets(xDoc->getSheets(), + css::uno::UNO_QUERY_THROW); + css::uno::Reference<css::table::XCell> xCell = xSheets->getCellByPosition(0, 0, 0); + xCell->setFormula("0.0042"); // this assumes en-US locale + + // 3. Check that the value is the nearest double-precision representation of the decimal 0.0042 + // (it was 0.0042000000000000006 instead of 0.0041999999999999997). + CPPUNIT_ASSERT_EQUAL_MESSAGE("Value must be the nearest representation of decimal 0.0042", + 0.0042, xCell->getValue()); // strict equality +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf104502_hiddenColsCountedInPageCount) +{ + createScDoc("ods/tdf104502_hiddenColsCountedInPageCount.ods"); + + ScDocument* pDoc = getScDoc(); + + //Check that hidden columns are not calculated into Print Area + SCCOL nEndCol = 0; + SCROW nEndRow = 0; + CPPUNIT_ASSERT(pDoc->GetPrintArea(0, nEndCol, nEndRow, false)); + CPPUNIT_ASSERT_EQUAL(SCCOL(0), nEndCol); + CPPUNIT_ASSERT_EQUAL(SCROW(55), nEndRow); +} + +CPPUNIT_TEST_FIXTURE(ScFiltersTest3, testTdf108188_pagestyle) +{ + createScDoc("ods/tdf108188_pagestyle.ods"); + + // Check if the user defined page style is present + const OUString aTestPageStyle = "TestPageStyle"; + ScDocument* pDoc = getScDoc(); + CPPUNIT_ASSERT_EQUAL(aTestPageStyle, pDoc->GetPageStyle(0)); + + // Without the accompanying fix in place, the page styles are always used + ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); + CPPUNIT_ASSERT(pStylePool->Find(aTestPageStyle, SfxStyleFamily::Page)->IsUsed()); + CPPUNIT_ASSERT(!pStylePool->Find("Default", SfxStyleFamily::Page)->IsUsed()); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
