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/source/ui/docshell/docfunc.cxx | |
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/source/ui/docshell/docfunc.cxx')
-rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 957b515759fb..1a2a61e263fa 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -1184,7 +1184,7 @@ void ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, aPattern.GetItemSet().ClearItem( ATTR_HOR_JUSTIFY ); // wasn't removed above if no edit object if ( aPattern.GetItemSet().Count() > 0 ) { - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); aMark.SelectTable( rPos.Tab(), true ); aMark.SetMarkArea( ScRange( rPos ) ); ApplyAttributes( aMark, aPattern, bApi ); @@ -1740,7 +1740,7 @@ bool ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark, if (bRecord && !rDoc.IsUndoEnabled()) bRecord = false; - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); if (pTabMark) aMark = *pTabMark; else @@ -2245,7 +2245,7 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, if (!rDoc.IsUndoEnabled()) bRecord = false; - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); if (pTabMark) aMark = *pTabMark; else @@ -2827,7 +2827,7 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, ScDocumentUniquePtr pClipDoc(new ScDocument(SCDOCMODE_CLIP)); - ScMarkData aSourceMark; + ScMarkData aSourceMark(rDoc.MaxRow(), rDoc.MaxCol()); for (nTab=nStartTab; nTab<=nEndTab; nTab++) aSourceMark.SelectTable( nTab, true ); // select source aSourceMark.SetMarkArea( rSource ); @@ -2948,7 +2948,7 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, bool bSourceHeight = false; // adjust heights? if (bCut) { - ScMarkData aDelMark; // only for tables + ScMarkData aDelMark(rDoc.MaxRow(), rDoc.MaxCol()); // only for tables for (nTab=nStartTab; nTab<=nEndTab; nTab++) { rDoc.DeleteAreaTab( nStartCol,nStartRow, nOldEndCol,nOldEndRow, nTab, InsertDeleteFlags::ALL ); @@ -2983,7 +2983,7 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, ScRange aPasteDest( nDestCol, nDestRow, nDestTab, nDestEndCol, nDestEndRow, nDestEndTab ); - ScMarkData aDestMark; + ScMarkData aDestMark(rDoc.MaxRow(), rDoc.MaxCol()); for (nTab=nDestTab; nTab<=nDestEndTab; nTab++) aDestMark.SelectTable( nTab, true ); // select destination aDestMark.SetMarkArea( aPasteDest ); @@ -3733,7 +3733,7 @@ bool ScDocFunc::SetWidthOrHeight( if (bRecord) { - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); aMark.SelectOneTable( nTab ); rDocShell.GetUndoManager()->AddUndoAction( std::make_unique<ScUndoWidthOrHeight>( @@ -4169,7 +4169,7 @@ bool ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark, bool bRecord = true; if (!rDoc.IsUndoEnabled()) bRecord = false; - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); if (pTabMark) aMark = *pTabMark; else @@ -4283,7 +4283,7 @@ bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark, SCROW nEndRow = rRange.aEnd.Row(); SCTAB nEndTab = rRange.aEnd.Tab(); - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); if (pTabMark) aMark = *pTabMark; else @@ -4370,7 +4370,7 @@ bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark, if (bRecord && !rDoc.IsUndoEnabled()) bRecord = false; - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); if (pTabMark) aMark = *pTabMark; else @@ -4514,7 +4514,7 @@ bool ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark, if (!rDoc.IsUndoEnabled()) bRecord = false; - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); if (pTabMark) aMark = *pTabMark; else @@ -4627,7 +4627,7 @@ bool ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark, if (!rDoc.IsUndoEnabled()) bRecord = false; - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); if (pTabMark) aMark = *pTabMark; else @@ -4760,7 +4760,7 @@ bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e if (bRecord && !rDoc.IsUndoEnabled()) bRecord = false; - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); if (pTabMark) aMark = *pTabMark; else @@ -5439,7 +5439,7 @@ void ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd aFormula = aFormula.copy(1, aFormula.getLength()-2); - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); aMark.SetMarkArea( rOldRange ); aMark.SelectTable( nTab, true ); ScRange aNewRange( rOldRange.aStart, rNewEnd ); |