diff options
Diffstat (limited to 'sc/source/ui/docshell')
-rw-r--r-- | sc/source/ui/docshell/arealink.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/dbdocimp.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 28 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh5.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/impex.cxx | 4 |
7 files changed, 24 insertions, 24 deletions
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index fab53d07bd8c..366f17198650 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -374,7 +374,7 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, { ScRange const & rTokenRange( aSourceRanges[nRange]); SCTAB nSrcTab = rTokenRange.aStart.Tab(); - ScMarkData aSourceMark; + ScMarkData aSourceMark(rSrcDoc.MaxRow(), rSrcDoc.MaxCol()); aSourceMark.SelectOneTable( nSrcTab ); // selecting for CopyToClip aSourceMark.SetMarkArea( rTokenRange ); @@ -394,7 +394,7 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, aNewTokenRange.aEnd.SetCol( aNewTokenRange.aStart.Col() + (rTokenRange.aEnd.Col() - rTokenRange.aStart.Col()) ); aNewTokenRange.aEnd.SetRow( aNewTokenRange.aStart.Row() + (rTokenRange.aEnd.Row() - rTokenRange.aStart.Row()) ); - ScMarkData aDestMark; + ScMarkData aDestMark(rDoc.MaxRow(), rDoc.MaxCol()); aDestMark.SelectOneTable( nDestTab ); aDestMark.SetMarkArea( aNewTokenRange ); rDoc.CopyFromClip( aNewTokenRange, aDestMark, InsertDeleteFlags::ALL, nullptr, &aClipDoc, false ); diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 77c8b507277a..b4dff2ee24b8 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -837,7 +837,7 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, aOldForm.aEnd.SetRow( aOldDest.aEnd.Row() ); rDoc.FitBlock( aOldForm, aNewForm, false ); - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); aMark.SelectOneTable(nDestTab); SCROW nFStartY = aLocalParam.nRow1 + ( aLocalParam.bHasHeader ? 1 : 0 ); diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 5bba7356a653..4e95f43169c2 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -471,7 +471,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, pUndoDBData.reset(new ScDBData( *pDBData )); } - ScMarkData aNewMark; + ScMarkData aNewMark(rDoc.MaxRow(), rDoc.MaxCol()); aNewMark.SelectOneTable( nTab ); if (bRecord) @@ -535,7 +535,7 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nEndCol+nFormulaCols, nEndRow, nTab, InsertDeleteFlags::ATTRIB, false, rDoc); // fill formulas - ScMarkData aMark; + ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol()); aMark.SelectOneTable(nTab); sal_uLong nProgCount = nFormulaCols; 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 ); diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 556d4645f50b..0fd41c54d957 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1602,7 +1602,7 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) m_aDocument.GetCellArea( nTab, nEndCol, nEndRow ); aColWidthRange.aEnd.SetCol( nEndCol ); aColWidthRange.aEnd.SetRow( nEndRow ); - ScMarkData aMark; + ScMarkData aMark(m_aDocument.MaxRow(), m_aDocument.MaxCol()); aMark.SetMarkArea( aColWidthRange ); aMark.MarkToMulti(); diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index efeff05e94e7..ea851d9b9d1b 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -442,7 +442,7 @@ void ScDocShell::UpdatePendingRowHeights( SCTAB nUpdateTab, bool bBefore ) if ( nUpdateTab >= nTabCount ) nUpdateTab = nTabCount-1; // nUpdateTab is inclusive - ScMarkData aUpdateSheets; + ScMarkData aUpdateSheets(m_aDocument.MaxRow(), m_aDocument.MaxCol()); SCTAB nTab; for (nTab=0; nTab<=nUpdateTab; ++nTab) if ( m_aDocument.IsPendingRowHeights( nTab ) ) @@ -681,7 +681,7 @@ void ScDocShell::UseScenario( SCTAB nTab, const OUString& rName, bool bRecord ) if ( m_aDocument.TestCopyScenario( nSrcTab, nTab ) ) // test cell protection { ScDocShellModificator aModificator( *this ); - ScMarkData aScenMark; + ScMarkData aScenMark(m_aDocument.MaxRow(), m_aDocument.MaxCol()); m_aDocument.MarkScenario( nSrcTab, nTab, aScenMark ); ScRange aMultiRange; aScenMark.GetMultiMarkArea( aMultiRange ); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 0619425319be..1f3e733809cd 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -258,7 +258,7 @@ void ScImportExport::EndPaste(bool bAutoRowHeight) ScDocumentUniquePtr pRedoDoc(new ScDocument( SCDOCMODE_UNDO )); pRedoDoc->InitUndo( pDoc, aRange.aStart.Tab(), aRange.aEnd.Tab() ); pDoc->CopyToDocument(aRange, InsertDeleteFlags::ALL | InsertDeleteFlags::NOCAPTIONS, false, *pRedoDoc); - ScMarkData aDestMark; + ScMarkData aDestMark(pRedoDoc->MaxRow(), pRedoDoc->MaxCol()); aDestMark.SetMarkArea(aRange); pDocSh->GetUndoManager()->AddUndoAction( std::make_unique<ScUndoPaste>(pDocSh, aRange, aDestMark, std::move(pUndoDoc), std::move(pRedoDoc), InsertDeleteFlags::ALL, nullptr)); @@ -1935,7 +1935,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) pDoc->CheckLinkFormulaNeedingCheck(*xCode); if ( ch == 'M' ) { - ScMarkData aMark; + ScMarkData aMark(pDoc->MaxRow(), pDoc->MaxCol()); aMark.SelectTable( aPos.Tab(), true ); pDoc->InsertMatrixFormula( nCol, nRow, nRefCol, nRefRow, aMark, EMPTY_OUSTRING, xCode.get() ); |