diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-11 11:08:55 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-11-11 17:24:53 +0100 |
commit | a8a064d11c05feed83f05b0ce8209f7054afd804 (patch) | |
tree | 3a64572d1d12d64b707c50607056f405c3615fcf /sc/qa/unit | |
parent | 33d966ecc1f9fc44016cdeeed15dbaf6bda68eda (diff) |
sc: rowcol: tdf#50916 convert mark data structures
Change-Id: I9b706c9bcc2925f72cc024142ffe72af5ddea82a
Reviewed-on: https://gerrit.libreoffice.org/82419
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sc/qa/unit')
-rw-r--r-- | sc/qa/unit/copy_paste_test.cxx | 2 | ||||
-rw-r--r-- | sc/qa/unit/mark_test.cxx | 24 | ||||
-rw-r--r-- | sc/qa/unit/parallelism.cxx | 6 | ||||
-rw-r--r-- | sc/qa/unit/subsequent_filters-test.cxx | 4 | ||||
-rw-r--r-- | sc/qa/unit/ucalc.cxx | 88 | ||||
-rw-r--r-- | sc/qa/unit/ucalc_condformat.cxx | 2 | ||||
-rw-r--r-- | sc/qa/unit/ucalc_formula.cxx | 70 | ||||
-rw-r--r-- | sc/qa/unit/ucalc_sharedformula.cxx | 20 |
8 files changed, 108 insertions, 108 deletions
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx index 6f3b0622366b..71adbe5c8c8d 100644 --- a/sc/qa/unit/copy_paste_test.cxx +++ b/sc/qa/unit/copy_paste_test.cxx @@ -88,7 +88,7 @@ void ScCopyPasteTest::testCopyPasteXLS() ScRefFlags nRes = aSrcRange.Parse("B2:C5", &rDoc, rDoc.GetAddressConvention()); CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & ScRefFlags::VALID)); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aSrcRange); pViewShell->GetViewData().GetMarkData().SetMarkArea(aSrcRange); diff --git a/sc/qa/unit/mark_test.cxx b/sc/qa/unit/mark_test.cxx index ad6124c82530..400392d7873c 100644 --- a/sc/qa/unit/mark_test.cxx +++ b/sc/qa/unit/mark_test.cxx @@ -135,7 +135,7 @@ void Test::testSimpleMark( const ScRange& rRange, const ScRange& rSelectionCover const ScRangeList& rLeftEnvelope, const ScRangeList& rRightEnvelope, const ScRangeList& rTopEnvelope, const ScRangeList& rBottomEnvelope ) { - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); CPPUNIT_ASSERT( !aMark.IsMarked() && !aMark.IsMultiMarked() ); aMark.SetMarkArea( rRange ); @@ -240,8 +240,8 @@ void Test::testSimpleMark_Row() void Test::testMultiMark( const MultiMarkTestData& rMarksData ) { - ScMarkData aMark; - ScMultiSel aMultiSel; + ScMarkData aMark(MAXROW, MAXCOL); + ScMultiSel aMultiSel(MAXROW, MAXCOL); CPPUNIT_ASSERT( !aMark.IsMarked() && !aMark.IsMultiMarked() ); CPPUNIT_ASSERT_EQUAL( SCCOL(0), aMultiSel.GetMultiSelectionCount() ); CPPUNIT_ASSERT( !aMultiSel.HasAnyMarks() ); @@ -817,7 +817,7 @@ void Test::testMultiMark_NegativeMarking() void Test::testInsertTabBeforeSelected() { - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); aMark.InsertTab(0); CPPUNIT_ASSERT_EQUAL(SCTAB(1), aMark.GetSelectCount()); @@ -826,7 +826,7 @@ void Test::testInsertTabBeforeSelected() void Test::testInsertTabAfterSelected() { - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); aMark.InsertTab(1); CPPUNIT_ASSERT_EQUAL(SCTAB(1), aMark.GetSelectCount()); @@ -835,7 +835,7 @@ void Test::testInsertTabAfterSelected() void Test::testDeleteTabBeforeSelected() { - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(1); aMark.DeleteTab(0); CPPUNIT_ASSERT_EQUAL(SCTAB(1), aMark.GetSelectCount()); @@ -844,7 +844,7 @@ void Test::testDeleteTabBeforeSelected() void Test::testDeleteTabAfterSelected() { - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); aMark.DeleteTab(1); CPPUNIT_ASSERT_EQUAL(SCTAB(1), aMark.GetSelectCount()); @@ -863,14 +863,14 @@ void Test::testScMarkArraySearch() { // empty { - ScMarkArray ar; + ScMarkArray ar(MAXROW); testScMarkArraySearch_check(ar, -1, false, 0); testScMarkArraySearch_check(ar, 100, false, 0); } // one range { - ScMarkArray ar; + ScMarkArray ar(MAXROW); ar.SetMarkArea(10, 20, true); // 0-9,10-20,21+ @@ -891,7 +891,7 @@ void Test::testScMarkArraySearch() // three ranges { - ScMarkArray ar; + ScMarkArray ar(MAXROW); ar.SetMarkArea(10, 20, true); ar.SetMarkArea(21, 30, true); ar.SetMarkArea(50, 100, true); @@ -912,7 +912,7 @@ void Test::testScMarkArraySearch() // three single-row ranges { - ScMarkArray ar; + ScMarkArray ar(MAXROW); ar.SetMarkArea(4, 4, true); ar.SetMarkArea(6, 6, true); ar.SetMarkArea(8, 8, true); @@ -932,7 +932,7 @@ void Test::testScMarkArraySearch() // one range { - ScMarkArray ar; + ScMarkArray ar(MAXROW); ar.SetMarkArea(10, MAXROW, true); // 0-10,11+ diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx index 965220e572d6..9af1daaca9e0 100644 --- a/sc/qa/unit/parallelism.cxx +++ b/sc/qa/unit/parallelism.cxx @@ -104,7 +104,7 @@ ScUndoCut* ScParallelismTest::cutToClip(ScDocShell& rDocSh, const ScRange& rRang ScDocument* pSrcDoc = &rDocSh.GetDocument(); ScClipParam aClipParam(rRange, true); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(rRange); pSrcDoc->CopyToClip(aClipParam, pClipDoc, &aMark, false, false); @@ -135,7 +135,7 @@ ScUndoCut* ScParallelismTest::cutToClip(ScDocShell& rDocSh, const ScRange& rRang void ScParallelismTest::pasteFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, ScDocument* pClipDoc) { - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(rDestRange); pDestDoc->CopyFromClip(rDestRange, aMark, InsertDeleteFlags::ALL, nullptr, pClipDoc); } @@ -884,7 +884,7 @@ void ScParallelismTest::testFormulaGroupsInCyclesAndWithSelfReference() m_pDoc->SetAutoCalc(true); const ScRange aChangeRange(1, 1, 0, 1, 4, 0); // B2:B5 - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // Set up clip document. diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx index 8524db0273ff..cba2aa701ce5 100644 --- a/sc/qa/unit/subsequent_filters-test.cxx +++ b/sc/qa/unit/subsequent_filters-test.cxx @@ -798,7 +798,7 @@ void ScFiltersTest::testFormulaDepDeleteContentsODS() // Delete D2:D5. ScDocFunc& rFunc = xDocSh->GetDocFunc(); ScRange aRange(3,1,0,3,4,0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aRange); aMark.MarkToMulti(); bool bGood = rFunc.DeleteContents(aMark, InsertDeleteFlags::ALL, true, true); @@ -2832,7 +2832,7 @@ void ScFiltersTest::testOptimalHeightReset() // delete content of A1 ScRange aDelRange(0,0,0,0,0,0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aDelRange); bool bRet = rFunc.DeleteContents( aMark, InsertDeleteFlags::ALL, false, true ); CPPUNIT_ASSERT_MESSAGE("DeleteContents failed", bRet); diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index e3fdc96c32d4..ae28aadeae31 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -366,7 +366,7 @@ void Test::testRangeList() void Test::testMarkData() { - ScMarkData aMarkData; + ScMarkData aMarkData(MAXROW, MAXCOL); // Empty mark. Nothing is selected. std::vector<sc::ColRowSpan> aSpans = aMarkData.GetMarkedRowSpans(); @@ -599,7 +599,7 @@ void Test::testSelectionFunction() ScRangeList aRanges; aRanges.push_back(ScRange(1,1,0,1,7,0)); // B2:B8 aRanges.push_back(ScRange(3,1,0,3,7,0)); // D2:D8 - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.MarkFromRangeList(aRanges, true); struct Check @@ -658,7 +658,7 @@ void Test::testSelectionFunction() } // Make sure that when no selection is present, use the current cursor position. - ScMarkData aEmpty; + ScMarkData aEmpty(MAXROW, MAXCOL); { // D3 (numeric cell containing 5.) @@ -747,7 +747,7 @@ void Test::testMarkedCellIteration() m_pDoc->SetFormula(ScAddress(2,2,0), "=SUM(1,2,3)", m_pDoc->GetGrammar()); // Select A1:C5. - ScMarkData aMarkData; + ScMarkData aMarkData(MAXROW, MAXCOL); aMarkData.SetMarkArea(ScRange(0,0,0,2,4,0)); aMarkData.MarkToMulti(); // TODO : we shouldn't have to do this. @@ -1881,7 +1881,7 @@ void Test::testMatrixComparisonWithErrors() // Create a matrix formula in B3:B4 referencing A1:A2 and doing a greater // than comparison on it's values. Error value must be propagated. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(1, 2, 1, 3, aMark, "=A1:A2>0"); @@ -1899,7 +1899,7 @@ void Test::testMatrixConditionalBooleanResult() // Create matrix formulas in A1:B1,A2:B2,A3:B3,A4:B4 producing mixed // boolean and numeric results in an unformatted area. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula( 0,0, 1,0, aMark, "=IF({1,0};TRUE();42)"); // {TRUE,42} m_pDoc->InsertMatrixFormula( 0,1, 1,1, aMark, "=IF({0,1};TRUE();42)"); // {42,1} aim for {42,TRUE} @@ -1931,7 +1931,7 @@ void Test::testEnterMixedMatrix() m_pDoc->SetValue(1, 1, 0, val); // Create a matrix range in A4:B5 referencing A1:B2. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(0, 3, 1, 4, aMark, "=A1:B2"); @@ -1958,7 +1958,7 @@ void Test::testMatrixEditable() // A3:A4 is a matrix. ScRange aMatRange(0,2,0,0,3,0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aMatRange); m_pDoc->InsertMatrixFormula(0, 2, 0, 3, aMark, "=TRANSPOSE(A1:B1)"); @@ -3340,7 +3340,7 @@ void Test::testCopyPaste() ScDocumentUniquePtr pUndoDoc(new ScDocument(SCDOCMODE_UNDO)); pUndoDoc->InitUndo(m_pDoc, 1, 1, true, true); std::unique_ptr<ScUndoPaste> pUndo(createUndoPaste(getDocShell(), aRange, std::move(pUndoDoc))); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aRange); m_pDoc->CopyFromClip(aRange, aMark, InsertDeleteFlags::ALL, nullptr, &aClipDoc); @@ -3466,7 +3466,7 @@ void Test::testCopyPasteAsLink() copyToClip(m_pDoc, aRange, &aClipDoc); aRange = ScRange(1,1,1,1,3,1); // Paste to B2:B4 on Sheet2. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aRange); // Paste range as link. m_pDoc->CopyFromClip(aRange, aMark, InsertDeleteFlags::CONTENTS, nullptr, &aClipDoc, true, true); @@ -3525,7 +3525,7 @@ void Test::testCopyPasteTranspose() aNewClipDoc.TransposeClip(pTransClip.get(), InsertDeleteFlags::ALL, false); ScRange aDestRange(3,1,1,3,3,1);//target: Sheet2.D2:D4 - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aDestRange); m_pDoc->CopyFromClip(aDestRange, aMark, InsertDeleteFlags::ALL, nullptr, pTransClip.get()); pTransClip.reset(); @@ -3580,7 +3580,7 @@ void Test::testCopyPasteMultiRange() } } - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // Copy A2:B2, A4:B4, and A6:B6 to clipboard. @@ -3677,7 +3677,7 @@ void Test::testCopyPasteSkipEmpty() ScRange aSrcRange(0,0,0,0,4,0); ScRange aDestRange(1,0,0,1,4,0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aDestRange); // Put some texts in B1:B5. @@ -3810,7 +3810,7 @@ void Test::testCopyPasteSkipEmpty2() // Paste to A3 with the skip empty option set. This used to freeze. (fdo#77735) ScRange aDestRange(0,2,0,2,2,0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aDestRange); m_pDoc->CopyFromClip(aDestRange, aMark, InsertDeleteFlags::ALL, nullptr, &aClipDoc, false, false, true, true); @@ -3834,7 +3834,7 @@ void Test::testCutPasteRefUndo() // A2 references B2. m_pDoc->SetString(ScAddress(0,1,0), "=B2"); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // Set up clip document for cutting of B2. @@ -3911,7 +3911,7 @@ void Test::testCutPasteGroupRefUndo() CPPUNIT_ASSERT_EQUAL_MESSAGE("Initial formula failure", OUString::createFromAscii(aDataCheck[i][1]), aString); } - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // Set up clip document. @@ -4034,7 +4034,7 @@ void Test::testUndoCut() CPPUNIT_ASSERT_EQUAL(111.0, m_pDoc->GetValue(0,3,0)); // Select A1:A3. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); ScRange aRange(0,0,0,0,2,0); aMark.SetMarkArea(aRange); aMark.MarkToMulti(); @@ -4148,7 +4148,7 @@ void Test::testCopyPasteRelativeFormula() // Select and copy B3:B4 to the clipboard. ScRange aRange(1,2,0,1,3,0); ScClipParam aClipParam(aRange, false); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aRange); ScDocument aClipDoc(SCDOCMODE_CLIP); m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMark, false, false); @@ -4203,7 +4203,7 @@ void Test::testCopyPasteRepeatOneFormula() m_pDoc->InsertTab(0, "Test"); ScDocument aClipDoc(SCDOCMODE_CLIP); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); // Insert values in A1:B10. for (SCROW i = 0; i < 10; ++i) @@ -4359,7 +4359,7 @@ void Test::testMergedCells() m_pDoc->ExtendMerge( 1, 1, nEndCol, nEndRow, 0); CPPUNIT_ASSERT_MESSAGE("did not merge cells", nEndCol == 3 && nEndRow == 3); ScRange aRange(0,2,0,MAXCOL,2,0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aRange); getDocShell().GetDocFunc().InsertCells(aRange, &aMark, INS_INSROWS_BEFORE, true, true); m_pDoc->ExtendMerge(1, 1, nEndCol, nEndRow, 0); @@ -4546,7 +4546,7 @@ void Test::testSearchCells() SvxSearchItem aItem(SID_SEARCH_ITEM); aItem.SetSearchString("A"); aItem.SetCommand(SvxSearchCmd::FIND_ALL); - ScMarkData aMarkData; + ScMarkData aMarkData(MAXROW, MAXCOL); aMarkData.SelectOneTable(0); SCCOL nCol = 0; SCROW nRow = 0; @@ -4686,7 +4686,7 @@ void Test::testAutoFill() m_pDoc->SetValue(0,0,0,1); - ScMarkData aMarkData; + ScMarkData aMarkData(MAXROW, MAXCOL); aMarkData.SelectTable(0, true); m_pDoc->Fill( 0, 0, 0, 0, nullptr, aMarkData, 5); @@ -4806,7 +4806,7 @@ void Test::testAutoFillSimple() m_pDoc->SetValue(0, 0, 0, 1); m_pDoc->SetString(0, 1, 0, "=10"); - ScMarkData aMarkData; + ScMarkData aMarkData(MAXROW, MAXCOL); aMarkData.SelectTable(0, true); m_pDoc->Fill( 0, 0, 0, 1, nullptr, aMarkData, 6, FILL_TO_BOTTOM, FILL_AUTO); @@ -4896,13 +4896,13 @@ void Test::testCopyPasteFormulasExternalDoc() ScRange aRange(0,0,0,0,5,0); ScClipParam aClipParam(aRange, false); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aRange); ScDocument aClipDoc(SCDOCMODE_CLIP); m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMark, false, false); aRange = ScRange(1,1,1,1,6,1); - ScMarkData aMarkData2; + ScMarkData aMarkData2(MAXROW, MAXCOL); aMarkData2.SetMarkArea(aRange); rExtDoc.CopyFromClip(aRange, aMarkData2, InsertDeleteFlags::ALL, nullptr, &aClipDoc); @@ -4951,13 +4951,13 @@ void Test::testCopyPasteReferencesExternalDoc() ScRange aRange(0,2,0,0,5,0); ScClipParam aClipParam(aRange, false); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aRange); ScDocument aClipDoc(SCDOCMODE_CLIP); m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMark, false, false); aRange = ScRange(0,0,0,0,3,0); - ScMarkData aMarkData2; + ScMarkData aMarkData2(MAXROW, MAXCOL); aMarkData2.SetMarkArea(aRange); rExtDoc.CopyFromClip(aRange, aMarkData2, InsertDeleteFlags::ALL, nullptr, &aClipDoc); @@ -5258,7 +5258,7 @@ void Test::testNoteDeleteRow() // Delete row 2. ScDocFunc& rDocFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); rDocFunc.DeleteCells(ScRange(0,1,0,MAXCOL,1,0), &aMark, DelCellCmd::CellsUp, true); @@ -5362,7 +5362,7 @@ void Test::testNoteLifeCycle() ScClipParam aClipParam(aPos, false); ScDocument aClipDoc(SCDOCMODE_CLIP); - ScMarkData aMarkData; + ScMarkData aMarkData(MAXROW, MAXCOL); aMarkData.SelectOneTable(0); m_pDoc->CopyToClip(aClipParam, &aClipDoc, &aMarkData, false, true); @@ -5497,7 +5497,7 @@ void Test::testNoteCopyPaste() pNote->SetText(aPos, "Note2"); // Copy B2:B4 to clipboard. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); ScRange aCopyRange(1,1,0,1,3,0); ScDocument aClipDoc(SCDOCMODE_CLIP); @@ -5988,7 +5988,7 @@ void Test::testDeleteContents() // Delete D2:D6. ScRange aRange(3,1,0,3,5,0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); aMark.SetMarkArea(aRange); @@ -6019,7 +6019,7 @@ void Test::testTransliterateText() m_pDoc->SetString(ScAddress(0,2,0), "Oscar"); // Change them to uppercase. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(ScRange(0,0,0,0,2,0)); ScDocFunc& rFunc = getDocShell().GetDocFunc(); rFunc.TransliterateText( @@ -6396,7 +6396,7 @@ void Test::testCopyPasteMatrixFormula() m_pDoc->SetValue(ScAddress(3,2,0), 11.0); // D3 // Insert matrix formula to A1 - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(0, 0, 0, 0, aMark, "=COUNTIF(ISBLANK(B1:D1);TRUE())"); m_pDoc->CalcAll(); @@ -6480,7 +6480,7 @@ void Test::testUndoDataAnchor() //pDrawLayer->BeginCalcUndo(false); // Insert a new row at row 3. ScDocFunc& rFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); rFunc.InsertCells(ScRange( 0, aOldStart.Row() - 1, 0, MAXCOL, aOldStart.Row(), 0 ), &aMark, INS_INSROWS_BEFORE, true, true); @@ -6680,7 +6680,7 @@ void Test::printRange(ScDocument* pDoc, const ScRange& rRange, const char* pCapt void Test::clearRange(ScDocument* pDoc, const ScRange& rRange) { - ScMarkData aMarkData; + ScMarkData aMarkData(MAXROW, MAXCOL); aMarkData.SetMarkArea(rRange); pDoc->DeleteArea( rRange.aStart.Col(), rRange.aStart.Row(), @@ -6698,7 +6698,7 @@ ScUndoCut* Test::cutToClip(ScDocShell& rDocSh, const ScRange& rRange, ScDocument ScDocument* pSrcDoc = &rDocSh.GetDocument(); ScClipParam aClipParam(rRange, true); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(rRange); pSrcDoc->CopyToClip(aClipParam, pClipDoc, &aMark, false, false); @@ -6730,21 +6730,21 @@ ScUndoCut* Test::cutToClip(ScDocShell& rDocSh, const ScRange& rRange, ScDocument void Test::copyToClip(ScDocument* pSrcDoc, const ScRange& rRange, ScDocument* pClipDoc) { ScClipParam aClipParam(rRange, false); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(rRange); pSrcDoc->CopyToClip(aClipParam, pClipDoc, &aMark, false, false); } void Test::pasteFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, ScDocument* pClipDoc) { - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(rDestRange); pDestDoc->CopyFromClip(rDestRange, aMark, InsertDeleteFlags::ALL, nullptr, pClipDoc); } void Test::pasteOneCellFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, ScDocument* pClipDoc, InsertDeleteFlags eFlags) { - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(rDestRange); sc::CopyFromClipContext aCxt(*pDestDoc, nullptr, pClipDoc, eFlags, false, false); aCxt.setDestRange(rDestRange.aStart.Col(), rDestRange.aStart.Row(), @@ -6757,7 +6757,7 @@ void Test::pasteOneCellFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, ScUndoPaste* Test::createUndoPaste(ScDocShell& rDocSh, const ScRange& rRange, ScDocumentUniquePtr pUndoDoc) { ScDocument& rDoc = rDocSh.GetDocument(); - ScMarkData aMarkData; + ScMarkData aMarkData(MAXROW, MAXCOL); aMarkData.SetMarkArea(rRange); std::unique_ptr<ScRefUndoData> pRefUndoData(new ScRefUndoData(&rDoc)); @@ -7004,7 +7004,7 @@ void Test::testProtectedSheetEditByRow() // Try to delete row 3. It should fail. ScRange aRow3(0,2,0,MAXCOL,2,0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); bool bDeleted = rDocFunc.DeleteCells(aRow3, &aMark, DelCellCmd::Rows, true); CPPUNIT_ASSERT_MESSAGE("deletion of row 3 should fail.", !bDeleted); @@ -7042,7 +7042,7 @@ void Test::testProtectedSheetEditByRow() { // Insert matrix into B2:C3. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(1); m_pDoc->InsertMatrixFormula(1, 1, 2, 2, aMark, "={1;2|3;4}"); @@ -7080,7 +7080,7 @@ void Test::testProtectedSheetEditByColumn() // Try to delete column C. It should fail. ScRange aCol3(2,0,0,2,MAXROW,0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); bool bDeleted = rDocFunc.DeleteCells(aCol3, &aMark, DelCellCmd::Cols, true); CPPUNIT_ASSERT_MESSAGE("deletion of column 3 should fail.", !bDeleted); @@ -7118,7 +7118,7 @@ void Test::testProtectedSheetEditByColumn() { // Insert matrix into B2:C3. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(1); m_pDoc->InsertMatrixFormula(1, 1, 2, 2, aMark, "={1;2|3;4}"); diff --git a/sc/qa/unit/ucalc_condformat.cxx b/sc/qa/unit/ucalc_condformat.cxx index 7392943f7f3e..6fbcb54a4880 100644 --- a/sc/qa/unit/ucalc_condformat.cxx +++ b/sc/qa/unit/ucalc_condformat.cxx @@ -33,7 +33,7 @@ void Test::testCopyPasteSkipEmptyConditionalFormatting() ScRange aDestRange(0,0,0,1,2,0); ScRange aSrcRange(3,3,0,5,4,0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(aDestRange); m_pDoc->SetValue(0,0,0,1); diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index 7952c0c46e58..6bbe59d067ea 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -1260,7 +1260,7 @@ void Test::testFormulaCompilerImplicitIntersection1ParamNoChange() { if (rCase.bMatrixFormula) { - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); SCCOL nColStart = rCase.aCellAddress.Col(); SCROW nRowStart = rCase.aCellAddress.Row(); @@ -2241,7 +2241,7 @@ void Test::testFormulaRefUpdateInsertRows() CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(ScAddress(1,4,0))); // Insert rows over rows 1:2. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); ScDocFunc& rFunc = getDocShell().GetDocFunc(); rFunc.InsertCells(ScRange(0,0,0,m_pDoc->MaxCol(),1,0), &aMark, INS_INSROWS_BEFORE, false, true); @@ -2396,7 +2396,7 @@ void Test::testFormulaRefUpdateInsertColumns() CPPUNIT_ASSERT_EQUAL(4.0, m_pDoc->GetValue(ScAddress(2,3,0))); // Insert columns over A:B. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); ScDocFunc& rFunc = getDocShell().GetDocFunc(); rFunc.InsertCells(ScRange(0,0,0,1,m_pDoc->MaxRow(),0), &aMark, INS_INSCOLS_BEFORE, false, true); @@ -2994,7 +2994,7 @@ void Test::testFormulaRefUpdateDeleteContent() // Delete B2. ScDocFunc& rFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(ScAddress(1,1,0)); rFunc.DeleteContents(aMark, InsertDeleteFlags::CONTENTS, true, true); @@ -3034,7 +3034,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftLeft() CPPUNIT_ASSERT_EQUAL(15.0, m_pDoc->GetValue(aPos)); // Delete columns D:E (middle of the reference). - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); ScDocFunc& rFunc = getDocShell().GetDocFunc(); bool bDeleted = rFunc.DeleteCells(ScRange(3,0,0,4,m_pDoc->MaxRow(),0), &aMark, DelCellCmd::CellsLeft, true); @@ -3169,7 +3169,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftLeft2() funcCheckOriginal(); // Delete Column A. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); ScDocFunc& rFunc = getDocShell().GetDocFunc(); bool bDeleted = rFunc.DeleteCells(ScRange(0,0,0,0,m_pDoc->MaxRow(),0), &aMark, DelCellCmd::CellsLeft, true); @@ -3208,7 +3208,7 @@ void Test::testFormulaRefUpdateDeleteAndShiftUp() CPPUNIT_ASSERT_EQUAL(15.0, m_pDoc->GetValue(aPos)); // Delete rows 4:5 (middle of the reference). - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); ScDocFunc& rFunc = getDocShell().GetDocFunc(); bool bDeleted = rFunc.DeleteCells(ScRange(0,3,0,m_pDoc->MaxCol(),4,0), &aMark, DelCellCmd::CellsUp, true); @@ -3549,7 +3549,7 @@ void Test::testFormulaRefUpdateNameExpandRef() // Insert a new row at row 4, which should expand the named range to A1:A4. ScDocFunc& rFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); rFunc.InsertCells(ScRange(0,3,0,m_pDoc->MaxCol(),3,0), &aMark, INS_INSROWS_BEFORE, false, true); ScRangeData* pName = m_pDoc->GetRangeName()->findByUpperName("MYRANGE"); @@ -3663,7 +3663,7 @@ void Test::testFormulaRefUpdateNameExpandRef2() // Insert a new row at row 4, which should expand the named range to A1:A4. ScDocFunc& rFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // Insert a new column at column 3, which should expand the named @@ -3708,7 +3708,7 @@ void Test::testFormulaRefUpdateNameDeleteRow() ScDocFunc& rFunc = getDocShell().GetDocFunc(); // Delete row 3. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); rFunc.DeleteCells(ScRange(0,2,0,m_pDoc->MaxCol(),2,0), &aMark, DelCellCmd::CellsUp, true); @@ -3773,7 +3773,7 @@ void Test::testFormulaRefUpdateNameDeleteRow() m_pDoc->InsertTab(1, "test2"); - ScMarkData aMark2; + ScMarkData aMark2(MAXROW, MAXCOL); aMark2.SelectOneTable(1); rFunc.DeleteCells(ScRange(0,2,1,m_pDoc->MaxCol(),2,1), &aMark2, DelCellCmd::CellsUp, true); @@ -4094,7 +4094,7 @@ void Test::testFormulaRefUpdateValidity() CPPUNIT_ASSERT_MESSAGE("Initial list is incorrect.", bGood); ScDocFunc& rFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // Insert a new column at Column B, to move the list from C2:C4 to D2:D4. @@ -4218,7 +4218,7 @@ void Test::testMultipleOperations() aParam.aRefFormulaCell = ScRefAddress(1,0,0); aParam.aRefFormulaEnd = aParam.aRefFormulaCell; aParam.aRefColCell = ScRefAddress(0,0,0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SetMarkArea(ScRange(0,2,0,1,4,0)); // Select A3:B5. m_pDoc->InsertTableOp(aParam, 0, 2, 1, 4, aMark); CPPUNIT_ASSERT_EQUAL(20.0, m_pDoc->GetValue(1,2,0)); @@ -4303,7 +4303,7 @@ void Test::testFuncCOUNT() CPPUNIT_ASSERT_EQUAL(6.0, m_pDoc->GetValue(aPos)); // Matrix in C1. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(2, 0, 2, 0, aMark, "=COUNT(SEARCH(\"a\";{\"a\";\"b\";\"a\"}))"); // Check that the #VALUE! error of "a" not found in "b" is not counted. @@ -4408,7 +4408,7 @@ void Test::testFuncROW() // Insert a new row at row 4. ScDocFunc& rFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); rFunc.InsertCells(ScRange(0,3,0,m_pDoc->MaxCol(),3,0), &aMark, INS_INSROWS_BEFORE, false, true); ASSERT_FORMULA_EQUAL(*m_pDoc, ScAddress(0,1,0), "ROW(A6)", "Wrong formula!"); @@ -4620,7 +4620,7 @@ void Test::testFuncMIN() m_pDoc->SetValue(ScAddress(1,1,0), 2.0); // Matrix in C1:C2. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(2, 0, 2, 1, aMark, "=MIN(IF(A1:A2=\"c\";B1:B2))"); @@ -4832,7 +4832,7 @@ void Test::testFuncCOUNTIF() // Another test case adopted from tdf#99291, empty array elements should // not match empty cells, but cells with 0. clearSheet(m_pDoc, 0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(0,0, 0,1, aMark, "=COUNTIF(B1:B5;C1:C2)"); // As we will be testing for 0.0 values, check that formulas are actually present. @@ -4870,7 +4870,7 @@ void Test::testFuncIF() CPPUNIT_ASSERT_EQUAL(OUString("not two"), m_pDoc->GetString(ScAddress(0,0,0))); // Test nested IF in array/matrix if the nested IF condition is a scalar. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(0,2, 1,2, aMark, "=IF({1;0};IF(1;23);42)"); // Results must be 23 and 42. @@ -4987,7 +4987,7 @@ void Test::testFuncIFERROR() // Create a matrix range in last two rows of the range above, actual data // of the placeholders. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(0, 20 + nRows-2, 0, 20 + nRows-1, aMark, "=IFERROR(3*A11:A12;1998)"); @@ -5170,7 +5170,7 @@ void Test::testFuncLEN() // Leave A1:A3 empty, and insert an array of LEN in B1:B3 that references // these empty cells. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(1, 0, 1, 2, aMark, "=LEN(A1:A3)"); @@ -6118,7 +6118,7 @@ void Test::testFormulaDepTrackingDeleteRow() // Delete row 2. ScDocFunc& rFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); rFunc.DeleteCells(ScRange(0,1,0,m_pDoc->MaxCol(),1,0), &aMark, DelCellCmd::CellsUp, true); @@ -6176,7 +6176,7 @@ void Test::testFormulaDepTrackingDeleteCol() // Delete column A. A1, B1, A3:A4 and B3:B4 should all show #REF!. ScDocFunc& rFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); rFunc.DeleteCells(ScRange(0,0,0,0,m_pDoc->MaxRow(),0), &aMark, DelCellCmd::CellsLeft, true); @@ -6261,7 +6261,7 @@ void Test::testFormulaMatrixResultUpdate() // Set a numeric value to A1. m_pDoc->SetValue(ScAddress(0,0,0), 11.0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(1, 0, 1, 0, aMark, "=A1"); CPPUNIT_ASSERT_EQUAL(11.0, m_pDoc->GetValue(ScAddress(1,0,0))); @@ -6633,7 +6633,7 @@ void Test::testExternalRefFunctions() FormulaError nErr = pFC->GetErrCode(); CPPUNIT_ASSERT_EQUAL_MESSAGE("huge external range reference expected to yield FormulaError::MatrixSize", int(FormulaError::MatrixSize), static_cast<int>(nErr)); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(0,0,0,0, aMark, "'file:///extdata.fake'#Data.B1:AMJ1048575"); pFC = m_pDoc->GetFormulaCell( ScAddress(0,0,0)); @@ -6890,7 +6890,7 @@ void Test::testFuncFORMULA() } // Matrix in D4:D6, no intersection with B1:B3 - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(3, 3, 3, 5, aMark, "=FORMULA(B1:B3)"); for (size_t i=0; i < SAL_N_ELEMENTS(aChecks); ++i) @@ -6906,7 +6906,7 @@ void Test::testFuncTableRef() sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc. m_pDoc->InsertTab(0, "Sheet1"); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); ScDocFunc& rDocFunc = getDocShell().GetDocFunc(); @@ -8120,7 +8120,7 @@ void Test::testFormulaErrorPropagation() m_pDoc->InsertTab(0, "Sheet1"); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); ScAddress aPos, aPos2; const OUString aTRUE("TRUE"); @@ -8213,7 +8213,7 @@ public: std::function<double(SCROW )> const & lExpected ) const { ScDocument aClipDoc(SCDOCMODE_CLIP); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); ScAddress aPos(nColumn, m_nStart1, 0); m_pDoc->SetString(aPos, rFormula); @@ -8334,7 +8334,7 @@ void Test::testTdf97587() } ScDocument aClipDoc(SCDOCMODE_CLIP); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); ScAddress aPos(1, 0, 0); m_pDoc->SetString(aPos, "=SUM(A1:A10)"); @@ -8372,7 +8372,7 @@ void Test::testMatConcat() } } - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(0, 12, 9, 21, aMark, "=A1:J10&A1:J10"); @@ -8435,7 +8435,7 @@ void Test::testMatConcatReplication() } } - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(0, 12, 9, 21, aMark, "=A1:J10&A1:J1"); @@ -8607,7 +8607,7 @@ void Test::testFuncSUMIFS() insertRangeData(m_pDoc, ScAddress(0,0,0), aData); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // Matrix formula in C8:C10 with SUMIFS m_pDoc->InsertMatrixFormula(2, 7, 2, 9, aMark, "=SUMIFS(B1:B7;A1:A7;A9:A11)"); @@ -8768,7 +8768,7 @@ void Test::testFuncRefListArraySUBTOTAL() m_pDoc->SetValue(0,5,0, 32.0); // A6 // Matrix in B7:B9, individual SUM of A2:A3, A3:A4 and A4:A5 - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); m_pDoc->InsertMatrixFormula(1, 6, 1, 8, aMark, "=SUBTOTAL(9;OFFSET(A1;ROW(1:3);0;2))"); ScAddress aPos(1,6,0); @@ -8888,7 +8888,7 @@ void Test::testFuncJumpMatrixArrayIF() }; // A7:B9 insertRangeData(m_pDoc, ScAddress(0,6,0), aData); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // Matrix in C10, summing B7,B9 @@ -8917,7 +8917,7 @@ void Test::testFuncJumpMatrixArrayOFFSET() }; insertRangeData(m_pDoc, ScAddress(0,0,0), aData); // A1:A3 - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // Matrix in C5:C7, COLUMN()-3 here offsets by 0 but the entire expression diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx index 5086af6515ee..7cb85e8c9bbf 100644 --- a/sc/qa/unit/ucalc_sharedformula.cxx +++ b/sc/qa/unit/ucalc_sharedformula.cxx @@ -675,7 +675,7 @@ void Test::testSharedFormulasRefUpdateRangeDeleteRow() // Delete row 3. This will merge the two formula groups. ScDocFunc& rFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); rFunc.DeleteCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, DelCellCmd::Rows, true); @@ -788,7 +788,7 @@ void Test::testSharedFormulasRefUpdateExternal() // Delete rows 1 and 2. This should not change the references in the formula cells below. ScDocFunc& rDocFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); rDocFunc.DeleteCells(ScRange(0,0,0,MAXCOL,1,0), &aMark, DelCellCmd::CellsUp, true); @@ -902,7 +902,7 @@ void Test::testSharedFormulasInsertRow() // Insert a new row at row 3. ScDocFunc& rFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); rFunc.InsertCells(ScRange(0,2,0,MAXCOL,2,0), &aMark, INS_INSROWS_BEFORE, true, true); @@ -1023,7 +1023,7 @@ void Test::testSharedFormulasDeleteColumns() FormulaGrammarSwitch aFGSwitch(m_pDoc, formula::FormulaGrammar::GRAM_ENGLISH_XL_R1C1); ScDocFunc& rFunc = getDocShell().GetDocFunc(); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // First, test a single cell case. A value in B1 and formula in C1. @@ -2262,7 +2262,7 @@ void Test::testSharedFormulaUpdateOnReplacement() // Set up an undo object for deleting A4. ScRange aUndoRange(0,3,0,0,3,0); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); aMark.SetMultiMarkArea(aUndoRange); ScDocumentUniquePtr pUndoDoc(new ScDocument(SCDOCMODE_UNDO)); @@ -2404,7 +2404,7 @@ void Test::testSharedFormulaDeleteTopCell() CPPUNIT_ASSERT_EQUAL( 3.0, m_pDoc->GetValue( ScAddress(0,1,0))); // Delete cell A1. - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); getDocShell().GetDocFunc().DeleteCell( ScAddress(0,0,0), aMark, InsertDeleteFlags::CONTENTS, false); // Check it's gone. @@ -2439,7 +2439,7 @@ void Test::testSharedFormulaCutCopyMoveIntoRef() const ScAddress aOrgPos(0,0,0); insertRangeData( m_pDoc, aOrgPos, aData); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // Set up clip document. @@ -2486,7 +2486,7 @@ void Test::testSharedFormulaCutCopyMoveIntoRef() aPos.IncRow(); } - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // Set up clip document. @@ -2553,7 +2553,7 @@ void Test::testSharedFormulaCutCopyMoveWithRef() const ScAddress aOrgPos(0,0,0); insertRangeData( m_pDoc, aOrgPos, aData); - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); ScAddress aPos( ScAddress::UNINITIALIZED); @@ -2647,7 +2647,7 @@ void Test::testSharedFormulaCutCopyMoveWithinRun() aPos.IncRow(); } - ScMarkData aMark; + ScMarkData aMark(MAXROW, MAXCOL); aMark.SelectOneTable(0); // Set up clip document. |