summaryrefslogtreecommitdiff
path: root/sc/source/ui/unoobj
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/unoobj')
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx38
-rw-r--r--sc/source/ui/unoobj/cursuno.cxx4
-rw-r--r--sc/source/ui/unoobj/docuno.cxx12
-rw-r--r--sc/source/ui/unoobj/funcuno.cxx4
4 files changed, 29 insertions, 29 deletions
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 0d53d2ad2bfa..34aba2fd2769 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1070,7 +1070,7 @@ void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& r
rDoc.CopyToDocument(rRange, InsertDeleteFlags::ATTRIB, false, *pUndoDoc);
}
- ScMarkData aMark;
+ ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol());
aMark.SetMarkArea( rRange );
aMark.SelectTable( nTab, true );
@@ -1211,7 +1211,7 @@ static bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
if ( pUndoDoc )
{
- ScMarkData aDestMark;
+ ScMarkData aDestMark(rDoc.MaxRow(), rDoc.MaxCol());
aDestMark.SelectOneTable( nTab );
rDocShell.GetUndoManager()->AddUndoAction(
std::make_unique<ScUndoPaste>(
@@ -1308,7 +1308,7 @@ static bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
if ( pUndoDoc )
{
- ScMarkData aDestMark;
+ ScMarkData aDestMark(rDoc.MaxRow(), rDoc.MaxCol());
aDestMark.SelectOneTable( nTab );
rDocShell.GetUndoManager()->AddUndoAction(
std::make_unique<ScUndoPaste>( &rDocShell,
@@ -1522,7 +1522,7 @@ const ScMarkData* ScCellRangesBase::GetMarkData()
{
if (!pMarkData)
{
- pMarkData.reset( new ScMarkData(aRanges) );
+ pMarkData.reset( new ScMarkData(GetDocument()->MaxRow(), GetDocument()->MaxCol(), aRanges) );
}
return pMarkData.get();
}
@@ -2450,7 +2450,7 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
SvxBoxInfoItem aInner(ATTR_BORDER_INNER);
ScDocument& rDoc = pDocShell->GetDocument();
- ScMarkData aMark;
+ ScMarkData aMark(rDoc.MaxRow(), rDoc.MaxCol());
aMark.SetMarkArea( rFirst );
aMark.SelectTable( rFirst.aStart.Tab(), true );
rDoc.GetSelectionFrame( aMark, aOuter, aInner );
@@ -3412,7 +3412,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC
{
ScDocument& rDoc = pDocShell->GetDocument();
- ScMarkData aMarkData;
+ ScMarkData aMarkData(rDoc.MaxRow(), rDoc.MaxCol());
// select matching cells
for ( size_t i = 0, nCount = aRanges.size(); i < nCount; ++i )
@@ -3501,7 +3501,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaC
{
ScDocument& rDoc = pDocShell->GetDocument();
- ScMarkData aMarkData;
+ ScMarkData aMarkData(rDoc.MaxRow(), rDoc.MaxCol());
// select matching cells
for ( size_t i = 0, nCount = aRanges.size(); i < nCount; ++i )
@@ -3555,7 +3555,7 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl(
size_t nRangeCount = aRanges.size();
size_t i;
ScDocument& rDoc = pDocShell->GetDocument();
- ScMarkData aMarkData;
+ ScMarkData aMarkData(rDoc.MaxRow(), rDoc.MaxCol());
SCCOLROW nCmpPos = bColumnDiff ? static_cast<SCCOLROW>(aCompare.Row) : static_cast<SCCOLROW>(aCompare.Column);
@@ -3685,7 +3685,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPreceden
bFound = false;
// aMarkData uses aNewRanges, not aRanges, so GetMarkData can't be used
- ScMarkData aMarkData;
+ ScMarkData aMarkData(rDoc.MaxRow(), rDoc.MaxCol());
aMarkData.MarkFromRangeList( aNewRanges, false );
aMarkData.MarkToMulti(); // needed for IsAllMarked
@@ -3734,7 +3734,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen
bFound = false;
// aMarkData uses aNewRanges, not aRanges, so GetMarkData can't be used
- ScMarkData aMarkData;
+ ScMarkData aMarkData(rDoc.MaxRow(), rDoc.MaxCol());
aMarkData.MarkFromRangeList( aNewRanges, false );
aMarkData.MarkToMulti(); // needed for IsAllMarked
@@ -4168,7 +4168,7 @@ void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress
aNotSheetRanges.push_back( rRanges[ i ] );
}
}
- ScMarkData aMarkData;
+ ScMarkData aMarkData(GetDocument()->MaxRow(), GetDocument()->MaxCol());
aMarkData.MarkFromRangeList( aSheetRanges, false );
ScRange aRange(static_cast<SCCOL>(rRange.StartColumn),
static_cast<SCROW>(rRange.StartRow),
@@ -4321,7 +4321,7 @@ static bool lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries,
if ( (nParse & ( ScRefFlags::VALID | ScRefFlags::TAB_3D ))
== ( ScRefFlags::VALID | ScRefFlags::TAB_3D ))
{
- ScMarkData aMarkData;
+ ScMarkData aMarkData(pDocSh->GetDocument().MaxRow(), pDocSh->GetDocument().MaxCol());
aMarkData.MarkFromRangeList( rRanges, false );
aMarkData.MarkToMulti(); // needed for IsAllMarked
if ( aMarkData.IsAllMarked( aCellRange ) )
@@ -4339,7 +4339,7 @@ static bool lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries,
// test if named entry is contained in rRanges
const ScRange& rComp = rNamedEntry.GetRange();
- ScMarkData aMarkData;
+ ScMarkData aMarkData(pDocSh->GetDocument().MaxRow(), pDocSh->GetDocument().MaxCol());
aMarkData.MarkFromRangeList( rRanges, false );
aMarkData.MarkToMulti(); // needed for IsAllMarked
if ( aMarkData.IsAllMarked( rComp ) )
@@ -4388,7 +4388,7 @@ void SAL_CALL ScCellRangesObj::removeByName( const OUString& aName )
}
if ( bValid )
{
- ScMarkData aMarkData;
+ ScMarkData aMarkData(GetDocument()->MaxRow(), GetDocument()->MaxCol());
aMarkData.MarkFromRangeList( rRanges, false );
for ( size_t i = 0, nDiffCount = aDiff.size(); i < nDiffCount; i++ )
@@ -4881,7 +4881,7 @@ void ScCellRangeObj::SetArrayFormula_Impl(const OUString& rFormula,
else
{
// empty string -> erase array formula
- ScMarkData aMark;
+ ScMarkData aMark(GetDocument()->MaxRow(), GetDocument()->MaxCol());
aMark.SetMarkArea( aRange );
aMark.SelectTable( aRange.aStart.Tab(), true );
pDocSh->GetDocFunc().DeleteContents( aMark, InsertDeleteFlags::CONTENTS, true, true );
@@ -4956,7 +4956,7 @@ void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::Formula
else
{
// empty sequence -> erase array formula
- ScMarkData aMark;
+ ScMarkData aMark(pDocSh->GetDocument().MaxRow(), pDocSh->GetDocument().MaxCol());
aMark.SetMarkArea( aRange );
aMark.SelectTable( aRange.aStart.Tab(), true );
pDocSh->GetDocFunc().DeleteContents( aMark, InsertDeleteFlags::CONTENTS, true, true );
@@ -7689,7 +7689,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd
if (rDoc.IsScenario(nTab))
{
- ScMarkData aMarkData;
+ ScMarkData aMarkData(rDoc.MaxRow(), rDoc.MaxCol());
aMarkData.SelectTable( nTab, true );
for (const table::CellRangeAddress& rRange : rScenRanges)
@@ -8732,7 +8732,7 @@ void ScCellsEnumeration::CheckPos_Impl()
{
if (!pMark)
{
- pMark.reset( new ScMarkData );
+ pMark.reset( new ScMarkData(rDoc.MaxRow(), rDoc.MaxCol()) );
pMark->MarkFromRangeList(aRanges, false);
pMark->MarkToMulti(); // needed for GetNextMarkedCell
}
@@ -8756,7 +8756,7 @@ void ScCellsEnumeration::Advance_Impl()
OSL_ENSURE(!bAtEnd,"too much Advance_Impl");
if (!pMark)
{
- pMark.reset( new ScMarkData );
+ pMark.reset( new ScMarkData(pDocShell->GetDocument().MaxRow(), pDocShell->GetDocument().MaxCol()) );
pMark->MarkFromRangeList( aRanges, false );
pMark->MarkToMulti(); // needed for GetNextMarkedCell
}
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index 82cbe769fb34..6f18ed237c76 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -338,7 +338,7 @@ void SAL_CALL ScCellCursorObj::gotoNext()
aOneRange.PutInOrder();
ScAddress aCursor(aOneRange.aStart); // always use start of block
- ScMarkData aMark; // not used with bMarked=FALSE
+ ScMarkData aMark(GetDocument()->MaxRow(), GetDocument()->MaxCol()); // not used with bMarked=FALSE
SCCOL nNewX = aCursor.Col();
SCROW nNewY = aCursor.Row();
SCTAB nTab = aCursor.Tab();
@@ -360,7 +360,7 @@ void SAL_CALL ScCellCursorObj::gotoPrevious()
aOneRange.PutInOrder();
ScAddress aCursor(aOneRange.aStart); // always use start of block
- ScMarkData aMark; // not used with bMarked=FALSE
+ ScMarkData aMark(GetDocument()->MaxRow(), GetDocument()->MaxCol()); // not used with bMarked=FALSE
SCCOL nNewX = aCursor.Col();
SCROW nNewY = aCursor.Row();
SCTAB nTab = aCursor.Tab();
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 9b0ae9763001..b55803ab5104 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1572,7 +1572,7 @@ sal_Int32 SAL_CALL ScModelObj::getRendererCount(const uno::Any& aSelection,
static_cast< sheet::XSpreadsheetDocument* >(this) );
}
- ScMarkData aMark;
+ ScMarkData aMark(GetDocument()->MaxRow(), GetDocument()->MaxCol());
ScPrintSelectionStatus aStatus;
OUString aPagesStr;
bool bRenderToGraphic = false;
@@ -1662,7 +1662,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32
static_cast< sheet::XSpreadsheetDocument* >(this) );
}
- ScMarkData aMark;
+ ScMarkData aMark(pDocShell->GetDocument().MaxRow(), pDocShell->GetDocument().MaxCol());
ScPrintSelectionStatus aStatus;
OUString aPagesStr;
// #i115266# if FillRenderMarkData fails, keep nTotalPages at 0, but still handle getRenderer(0) below
@@ -1910,7 +1910,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec
static_cast< sheet::XSpreadsheetDocument* >(this) );
}
- ScMarkData aMark;
+ ScMarkData aMark(pDocShell->GetDocument().MaxRow(), pDocShell->GetDocument().MaxCol());
ScPrintSelectionStatus aStatus;
OUString aPagesStr;
bool bRenderToGraphic = false;
@@ -3086,7 +3086,7 @@ void ScModelObj::NotifyChanges( const OUString& rOperation, const ScRangeList& r
//! separate method with ScMarkData? Then change HasChangesListeners back.
if ( rOperation == "cell-change" && pDocShell )
{
- ScMarkData aMarkData;
+ ScMarkData aMarkData(pDocShell->GetDocument().MaxRow(), pDocShell->GetDocument().MaxCol());
aMarkData.MarkFromRangeList( rRanges, false );
ScDocument& rDoc = pDocShell->GetDocument();
SCTAB nTabCount = rDoc.GetTableCount();
@@ -4454,7 +4454,7 @@ void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex )
ScAddress aPos;
if ( GetAddressByIndex_Impl( nIndex, aPos ) )
{
- ScMarkData aMarkData;
+ ScMarkData aMarkData(pDocShell->GetDocument().MaxRow(), pDocShell->GetDocument().MaxCol());
aMarkData.SelectTable( aPos.Tab(), true );
aMarkData.SetMultiMarkArea( ScRange(aPos) );
@@ -4585,7 +4585,7 @@ void SAL_CALL ScScenariosObj::addNewByName( const OUString& aName,
SolarMutexGuard aGuard;
if ( pDocShell )
{
- ScMarkData aMarkData;
+ ScMarkData aMarkData(pDocShell->GetDocument().MaxRow(), pDocShell->GetDocument().MaxCol());
aMarkData.SelectTable( nTab, true );
for (const table::CellRangeAddress& rRange : aRanges)
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 89680f3e7a28..128811bf1ae7 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -142,7 +142,7 @@ static bool lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
nDestTab ) );
ScDocumentUniquePtr pClipDoc(new ScDocument( SCDOCMODE_CLIP ));
- ScMarkData aSourceMark;
+ ScMarkData aSourceMark(pSrcDoc->MaxRow(), pSrcDoc->MaxCol());
aSourceMark.SelectOneTable( nSrcTab ); // for CopyToClip
aSourceMark.SetMarkArea( rSrcRange );
ScClipParam aClipParam(rSrcRange, false);
@@ -157,7 +157,7 @@ static bool lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
pClipDoc->ApplyPatternAreaTab( 0,0, pClipDoc->MaxCol(), pClipDoc->MaxRow(), nSrcTab, aPattern );
}
- ScMarkData aDestMark;
+ ScMarkData aDestMark(pDestDoc->MaxRow(), pDestDoc->MaxCol());
aDestMark.SelectOneTable( nDestTab );
aDestMark.SetMarkArea( aNewRange );
pDestDoc->CopyFromClip( aNewRange, aDestMark, InsertDeleteFlags::ALL & ~InsertDeleteFlags::FORMULA, nullptr, pClipDoc.get(), false );
generated by cgit (git 2.34.1) at 2025-05-09 07:38:54 +0000