summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/attarray.hxx2
-rw-r--r--sc/inc/column.hxx2
-rw-r--r--sc/inc/compressedarray.hxx5
-rw-r--r--sc/source/core/data/attarray.cxx20
-rw-r--r--sc/source/core/data/column.cxx4
-rw-r--r--sc/source/core/data/compressedarray.cxx10
-rw-r--r--sc/source/filter/oox/formulaparser.cxx4
7 files changed, 18 insertions, 29 deletions
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 2be8e552ef25..04aab80355f1 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -173,7 +173,7 @@ public:
bool IsEmpty() const;
bool GetFirstVisibleAttr( SCROW& rFirstRow ) const;
- bool GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData, bool bFullFormattedArea = false ) const;
+ bool GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const;
bool HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
bool IsVisibleEqual( const ScAttrArray& rOther,
SCROW nStartRow, SCROW nEndRow ) const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index d7a6aadd4f28..62009ca46d4a 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -297,7 +297,7 @@ public:
void UndoToColumn(
sc::CopyToDocContext& rCxt, SCROW nRow1, SCROW nRow2, InsertDeleteFlags nFlags, bool bMarked,
- ScColumn& rColumn, const ScMarkData* pMarkData = nullptr) const;
+ ScColumn& rColumn) const;
void CopyScenarioFrom( const ScColumn& rSrcCol );
void CopyScenarioTo( ScColumn& rDestCol ) const;
diff --git a/sc/inc/compressedarray.hxx b/sc/inc/compressedarray.hxx
index 4be04c9a3964..1161ecf81c95 100644
--- a/sc/inc/compressedarray.hxx
+++ b/sc/inc/compressedarray.hxx
@@ -85,7 +85,7 @@ public:
/** Copy rArray.nStart+nSourceDy to this.nStart */
void CopyFrom( const ScCompressedArray& rArray,
- A nStart, A nEnd, long nSourceDy = 0 );
+ A nStart, A nEnd );
// methods public for the coupled array sum methods
/** Obtain index into entries for nPos */
@@ -168,8 +168,7 @@ public:
/** Copy values from rArray and bitwise AND them with rValueToAnd. */
void CopyFromAnded(
const ScBitMaskCompressedArray& rArray,
- A nStart, A nEnd, const D& rValueToAnd,
- long nSourceDy = 0 );
+ A nStart, A nEnd, const D& rValueToAnd );
/** Return the last row where an entry meets the condition:
((aValue & rBitMask) != 0), start searching at nStart. If no entry
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index d97b7e2ecb37..816069a5ed74 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1825,7 +1825,7 @@ bool ScAttrArray::GetFirstVisibleAttr( SCROW& rFirstRow ) const
const SCROW SC_VISATTR_STOP = 84;
-bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData, bool bFullFormattedArea ) const
+bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData ) const
{
OSL_ENSURE( nCount, "nCount == 0" );
@@ -1845,18 +1845,10 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData, bool bFu
SCROW nStartRow = (nPos ? pData[nPos-1].nRow + 1 : 0);
if (nStartRow <= nLastData + 1)
{
- if (bFullFormattedArea && pData[nPos].pPattern->IsVisible())
- {
- rLastRow = pData[nPos].nRow;
- return true;
- }
- else
- {
- // Ignore here a few rows if data happens to end within
- // SC_VISATTR_STOP rows before MAXROW.
- rLastRow = nLastData;
- return false;
- }
+ // Ignore here a few rows if data happens to end within
+ // SC_VISATTR_STOP rows before MAXROW.
+ rLastRow = nLastData;
+ return false;
}
// Find a run below last data row.
@@ -1873,7 +1865,7 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData, bool bFu
if ( nAttrStartRow <= nLastData )
nAttrStartRow = nLastData + 1;
SCROW nAttrSize = pData[nEndPos].nRow + 1 - nAttrStartRow;
- if ( nAttrSize >= SC_VISATTR_STOP && !bFullFormattedArea )
+ if ( nAttrSize >= SC_VISATTR_STOP )
break; // while, ignore this range and below
else if ( pData[nEndPos].pPattern->IsVisible() )
{
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 8b2e3a60750e..95d9c342a0f2 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1693,12 +1693,12 @@ void ScColumn::CopyToColumn(
void ScColumn::UndoToColumn(
sc::CopyToDocContext& rCxt, SCROW nRow1, SCROW nRow2, InsertDeleteFlags nFlags, bool bMarked,
- ScColumn& rColumn, const ScMarkData* pMarkData ) const
+ ScColumn& rColumn ) const
{
if (nRow1 > 0)
CopyToColumn(rCxt, 0, nRow1-1, InsertDeleteFlags::FORMULA, false, rColumn);
- CopyToColumn(rCxt, nRow1, nRow2, nFlags, bMarked, rColumn, pMarkData); //TODO: bMarked ????
+ CopyToColumn(rCxt, nRow1, nRow2, nFlags, bMarked, rColumn); //TODO: bMarked ????
if (nRow2 < MAXROW)
CopyToColumn(rCxt, nRow2+1, MAXROW, InsertDeleteFlags::FORMULA, false, rColumn);
diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx
index 6411fa838d31..d79643da9cb5 100644
--- a/sc/source/core/data/compressedarray.cxx
+++ b/sc/source/core/data/compressedarray.cxx
@@ -238,16 +238,15 @@ void ScCompressedArray<A,D>::SetValue( A nStart, A nEnd, const D& rValue )
template< typename A, typename D >
void ScCompressedArray<A,D>::CopyFrom( const ScCompressedArray<A,D>& rArray, A nStart,
- A nEnd, long nSourceDy )
+ A nEnd )
{
size_t nIndex = 0;
A nRegionEnd;
for (A j=nStart; j<=nEnd; ++j)
{
const D& rValue = (j==nStart ?
- rArray.GetValue( j+nSourceDy, nIndex, nRegionEnd) :
+ rArray.GetValue( j, nIndex, nRegionEnd) :
rArray.GetNextValue( nIndex, nRegionEnd));
- nRegionEnd -= nSourceDy;
if (nRegionEnd > nEnd)
nRegionEnd = nEnd;
this->SetValue( j, nRegionEnd, rValue);
@@ -370,16 +369,15 @@ void ScBitMaskCompressedArray<A,D>::OrValue( A nStart, A nEnd,
template< typename A, typename D >
void ScBitMaskCompressedArray<A,D>::CopyFromAnded(
const ScBitMaskCompressedArray<A,D>& rArray, A nStart, A nEnd,
- const D& rValueToAnd, long nSourceDy )
+ const D& rValueToAnd )
{
size_t nIndex = 0;
A nRegionEnd;
for (A j=nStart; j<=nEnd; ++j)
{
const D& rValue = (j==nStart ?
- rArray.GetValue( j+nSourceDy, nIndex, nRegionEnd) :
+ rArray.GetValue( j, nIndex, nRegionEnd) :
rArray.GetNextValue( nIndex, nRegionEnd));
- nRegionEnd -= nSourceDy;
if (nRegionEnd > nEnd)
nRegionEnd = nEnd;
this->SetValue( j, nRegionEnd, rValue & rValueToAnd);
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 975005ce761e..7b899f4fc256 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -478,8 +478,8 @@ protected:
template< typename Type >
bool pushValueOperandToken( const Type& rValue, sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr );
template< typename Type >
- inline bool pushValueOperandToken( const Type& rValue, const WhiteSpaceVec* pSpaces = nullptr )
- { return pushValueOperandToken( rValue, OPCODE_PUSH, pSpaces ); }
+ inline bool pushValueOperandToken( const Type& rValue )
+ { return pushValueOperandToken( rValue, OPCODE_PUSH, nullptr ); }
bool pushParenthesesOperandToken( const WhiteSpaceVec* pOpeningSpaces = nullptr, const WhiteSpaceVec* pClosingSpaces = nullptr );
bool pushUnaryPreOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr );
bool pushUnaryPostOperatorToken( sal_Int32 nOpCode, const WhiteSpaceVec* pSpaces = nullptr );
generated by cgit (git 2.34.1) at 2025-02-03 13:00:26 +0000