summaryrefslogtreecommitdiff
path: root/sc/source/ui/view
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2019-11-11 11:08:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-11-11 17:24:53 +0100
commita8a064d11c05feed83f05b0ce8209f7054afd804 (patch)
tree3a64572d1d12d64b707c50607056f405c3615fcf /sc/source/ui/view
parent33d966ecc1f9fc44016cdeeed15dbaf6bda68eda (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/source/ui/view')
-rw-r--r--sc/source/ui/view/cellsh1.cxx2
-rw-r--r--sc/source/ui/view/gridwin.cxx2
-rw-r--r--sc/source/ui/view/gridwin4.cxx2
-rw-r--r--sc/source/ui/view/viewdata.cxx2
-rw-r--r--sc/source/ui/view/viewfun4.cxx2
-rw-r--r--sc/source/ui/view/viewfun5.cxx2
-rw-r--r--sc/source/ui/view/viewfunc.cxx4
7 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index f2fab305f9aa..44ef3d49c330 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2401,7 +2401,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScViewData* pData = GetViewData();
ScMarkData& rMark = pData->GetMarkData();
ScDocument* pDoc = pData->GetDocument();
- ScMarkData aNewMark;
+ ScMarkData aNewMark(pDoc->MaxRow(), pDoc->MaxCol());
ScRangeList aRangeList;
for (auto const& rTab : rMark.GetSelectedTabs())
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 0f72c2954a1b..c286b7b5d173 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5385,7 +5385,7 @@ bool ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang
//! cache the Ranges in Table!!!!
- ScMarkData aMarks;
+ ScMarkData aMarks(pDoc->MaxRow(), pDoc->MaxCol());
for (SCTAB i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++)
pDoc->MarkScenario( i, nTab, aMarks, false, ScScenarioFlags::ShowFrame );
ScRangeList aRanges;
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index acaa81842a97..d0e530be77e8 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -198,7 +198,7 @@ static void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, S
//! cache the ranges in table!!!!
- ScMarkData aMarks;
+ ScMarkData aMarks(pDoc->MaxRow(), pDoc->MaxCol());
for (SCTAB i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++)
pDoc->MarkScenario( i, nTab, aMarks, false, ScScenarioFlags::ShowFrame );
ScRangeListRef xRanges = new ScRangeList;
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 97dbaacfac2a..5cdb89ec4890 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -732,7 +732,7 @@ ScSplitPos ScViewDataTable::SanitizeWhichActive() const
ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) :
nPPTX(0.0),
nPPTY(0.0),
- mpMarkData(new ScMarkData),
+ mpMarkData(new ScMarkData(pDocSh->GetDocument().MaxRow(), pDocSh->GetDocument().MaxCol()) ),
pDocShell ( pDocSh ),
pDoc ( nullptr ),
pView ( pViewSh ),
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index cf1cd4656ed4..0778c2b5a710 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -142,7 +142,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
rDoc.CopyToDocument( nStartCol,nStartRow,nTab, nStartCol,nEndRow,nTab, InsertDeleteFlags::ALL|InsertDeleteFlags::NOCAPTIONS, false, *pRedoDoc );
ScRange aMarkRange(nStartCol, nStartRow, nTab, nStartCol, nEndRow, nTab);
- ScMarkData aDestMark;
+ ScMarkData aDestMark(rDoc.MaxRow(), rDoc.MaxCol());
aDestMark.SetMarkArea( aMarkRange );
pDocSh->GetUndoManager()->AddUndoAction(
std::make_unique<ScUndoPaste>( pDocSh, aMarkRange, aDestMark,
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 1cffceff6e57..cdac007fc8df 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -139,7 +139,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
if (!rSrcDoc.HasTable(nSrcTab))
nSrcTab = 0;
- ScMarkData aSrcMark;
+ ScMarkData aSrcMark(rSrcDoc.MaxRow(), rSrcDoc.MaxCol());
aSrcMark.SelectOneTable( nSrcTab ); // for CopyToClip
ScDocumentUniquePtr pClipDoc(new ScDocument( SCDOCMODE_CLIP ));
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 7ed93ac0b0b4..21d10fcd1726 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -213,7 +213,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
if ( !pSource->GetItem(ATTR_MERGE).IsMerged() )
{
ScRange aRange( nCol, nRow, nTab, nCol, nRow, nTab );
- ScMarkData aMark;
+ ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol());
aMark.SetMarkArea( aRange );
ScDocFunc &rFunc = GetViewData().GetDocFunc();
@@ -552,7 +552,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab,
const sal_uInt32 nFormat = pFormatter->GetStandardFormat( SvNumFormatType::NUMBER, nLang);
ScPatternAttr aPattern( pDoc->GetPool());
aPattern.GetItemSet().Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nFormat));
- ScMarkData aMark;
+ ScMarkData aMark(pDoc->MaxRow(), pDoc->MaxCol());
aMark.SelectTable( i, true);
aMark.SetMarkArea( ScRange( aPos));
rFunc.ApplyAttributes( aMark, aPattern, false);