[Libreoffice-commits] core.git: sc/inc sc/qa sc/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue May 23 09:21:07 UTC 2017
sc/inc/address.hxx | 16 +-
sc/inc/attarray.hxx | 8 -
sc/inc/attrib.hxx | 10 -
sc/inc/chgtrack.hxx | 30 ++--
sc/inc/column.hxx | 10 -
sc/inc/compiler.hxx | 2
sc/inc/dbdata.hxx | 4
sc/inc/detdata.hxx | 2
sc/inc/document.hxx | 12 -
sc/inc/dpobject.hxx | 6
sc/inc/drwlayer.hxx | 4
sc/inc/externalrefmgr.hxx | 4
sc/inc/hints.hxx | 14 +-
sc/inc/markarr.hxx | 2
sc/inc/markdata.hxx | 2
sc/inc/markmulti.hxx | 2
sc/inc/olinetab.hxx | 2
sc/inc/rangelst.hxx | 8 -
sc/inc/table.hxx | 10 -
sc/inc/tabprotection.hxx | 2
sc/inc/types.hxx | 6
sc/qa/unit/mark_test.cxx | 4
sc/qa/unit/ucalc.cxx | 2
sc/source/core/data/attarray.cxx | 18 +-
sc/source/core/data/attrib.cxx | 2
sc/source/core/data/bcaslot.cxx | 4
sc/source/core/data/column.cxx | 10 -
sc/source/core/data/documen2.cxx | 2
sc/source/core/data/documen3.cxx | 2
sc/source/core/data/documen5.cxx | 2
sc/source/core/data/documen7.cxx | 2
sc/source/core/data/documen8.cxx | 2
sc/source/core/data/document.cxx | 28 ++--
sc/source/core/data/dpobject.cxx | 18 +-
sc/source/core/data/drwlayer.cxx | 18 +-
sc/source/core/data/fillinfo.cxx | 58 ++++----
sc/source/core/data/formulacell.cxx | 10 -
sc/source/core/data/markarr.cxx | 4
sc/source/core/data/markdata.cxx | 2
sc/source/core/data/markmulti.cxx | 4
sc/source/core/data/olinetab.cxx | 6
sc/source/core/data/sortparam.cxx | 4
sc/source/core/data/table1.cxx | 30 ++--
sc/source/core/data/table2.cxx | 12 -
sc/source/core/data/table3.cxx | 6
sc/source/core/data/table6.cxx | 42 +++---
sc/source/core/data/tabprotection.cxx | 6
sc/source/core/inc/bcaslot.hxx | 4
sc/source/core/inc/refupdat.hxx | 4
sc/source/core/tool/address.cxx | 14 +-
sc/source/core/tool/chgtrack.cxx | 30 ++--
sc/source/core/tool/compiler.cxx | 2
sc/source/core/tool/dbdata.cxx | 12 -
sc/source/core/tool/detdata.cxx | 2
sc/source/core/tool/hints.cxx | 2
sc/source/core/tool/interpr1.cxx | 8 -
sc/source/core/tool/interpr4.cxx | 8 -
sc/source/core/tool/queryparam.cxx | 6
sc/source/core/tool/rangelst.cxx | 8 -
sc/source/core/tool/rangenam.cxx | 6
sc/source/core/tool/refupdat.cxx | 58 ++++----
sc/source/core/tool/token.cxx | 10 -
sc/source/filter/excel/excform.cxx | 6
sc/source/filter/excel/excform8.cxx | 2
sc/source/filter/excel/xechart.cxx | 6
sc/source/filter/excel/xeformula.cxx | 16 +-
sc/source/filter/excel/xetable.cxx | 8 -
sc/source/filter/excel/xiname.cxx | 2
sc/source/filter/excel/xipivot.cxx | 2
sc/source/filter/html/htmlimp.cxx | 8 -
sc/source/filter/html/htmlpars.cxx | 6
sc/source/filter/inc/excform.hxx | 4
sc/source/filter/inc/formel.hxx | 2
sc/source/filter/starcalc/scflt.cxx | 2
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 12 -
sc/source/ui/docshell/dbdocfun.cxx | 2
sc/source/ui/docshell/docfunc.cxx | 8 -
sc/source/ui/docshell/externalrefmgr.cxx | 6
sc/source/ui/drawfunc/fupoor.cxx | 4
sc/source/ui/drawfunc/fusel2.cxx | 16 +-
sc/source/ui/inc/gridwin.hxx | 12 -
sc/source/ui/inc/select.hxx | 2
sc/source/ui/inc/tabview.hxx | 30 ++--
sc/source/ui/inc/viewdata.hxx | 8 -
sc/source/ui/unoobj/cellsuno.cxx | 2
sc/source/ui/unoobj/viewuno.cxx | 12 -
sc/source/ui/view/auditsh.cxx | 4
sc/source/ui/view/cellsh3.cxx | 4
sc/source/ui/view/cellsh4.cxx | 50 +++----
sc/source/ui/view/gridwin.cxx | 126 +++++++++----------
sc/source/ui/view/gridwin2.cxx | 20 +--
sc/source/ui/view/gridwin4.cxx | 4
sc/source/ui/view/gridwin5.cxx | 10 -
sc/source/ui/view/select.cxx | 56 ++++----
sc/source/ui/view/tabview.cxx | 48 +++----
sc/source/ui/view/tabview2.cxx | 70 +++++-----
sc/source/ui/view/tabview3.cxx | 121 +++++++++---------
sc/source/ui/view/viewdata.cxx | 20 +--
sc/source/ui/view/viewfun2.cxx | 4
99 files changed, 668 insertions(+), 675 deletions(-)
New commits:
commit ed5abacda979d05fa4328953662ea98e6afa3c51
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon May 22 16:51:28 2017 +0200
drop the SCsROW/SCsCOL/SCsTAB typedefs
which are exactly the same as the regular SCROW/etc typedefs, and have
been this way since
commit 43a21999a92c99867bc3417291719996776b0647
Author: Oliver Bolte <obo at openoffice.org>
Date: Fri Jun 4 09:00:39 2004 +0000
INTEGRATION: CWS rowlimit (1.1.2); FILE ADDED
Change-Id: Ia7f75d71227ca3167b5fd56019bb9bdf0697d1b0
Reviewed-on: https://gerrit.libreoffice.org/37911
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 9203eec2928e..93ea9c1720be 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -283,15 +283,15 @@ public:
inline void PutInOrder( ScAddress& rAddress );
- void IncRow( SCsROW nDelta = 1 )
+ void IncRow( SCROW nDelta = 1 )
{
nRow = sal::static_int_cast<SCROW>(nRow + nDelta);
}
- void IncCol( SCsCOL nDelta = 1 )
+ void IncCol( SCCOL nDelta = 1 )
{
nCol = sal::static_int_cast<SCCOL>(nCol + nDelta);
}
- void IncTab( SCsTAB nDelta = 1 )
+ void IncTab( SCTAB nDelta = 1 )
{
nTab = sal::static_int_cast<SCTAB>(nTab + nDelta);
}
@@ -332,7 +332,7 @@ public:
@param pDocument
The document for the maximum defined sheet number.
*/
- SC_DLLPUBLIC SAL_WARN_UNUSED_RESULT bool Move( SCsCOL nDeltaX, SCsROW nDeltaY, SCsTAB nDeltaZ,
+ SC_DLLPUBLIC SAL_WARN_UNUSED_RESULT bool Move( SCCOL nDeltaX, SCROW nDeltaY, SCTAB nDeltaZ,
ScAddress& rErrorPos, ScDocument* pDocument = nullptr );
inline bool operator==( const ScAddress& rAddress ) const;
@@ -595,11 +595,11 @@ public:
@param pDocument
The document for the maximum defined sheet number.
*/
- SC_DLLPUBLIC SAL_WARN_UNUSED_RESULT bool Move( SCsCOL aDeltaX, SCsROW aDeltaY, SCsTAB aDeltaZ,
+ SC_DLLPUBLIC SAL_WARN_UNUSED_RESULT bool Move( SCCOL aDeltaX, SCROW aDeltaY, SCTAB aDeltaZ,
ScRange& rErrorRange, ScDocument* pDocument = nullptr );
/** Same as Move() but with sticky end col/row anchors. */
- SC_DLLPUBLIC SAL_WARN_UNUSED_RESULT bool MoveSticky( SCsCOL aDeltaX, SCsROW aDeltaY, SCsTAB aDeltaZ,
+ SC_DLLPUBLIC SAL_WARN_UNUSED_RESULT bool MoveSticky( SCCOL aDeltaX, SCROW aDeltaY, SCTAB aDeltaZ,
ScRange& rErrorRange );
SC_DLLPUBLIC void ExtendTo( const ScRange& rRange );
@@ -615,12 +615,12 @@ public:
/** Increment or decrement end column unless sticky or until it becomes
sticky. Checks if the range encompasses at least two columns so should
be called before adjusting the start column. */
- void IncEndColSticky( SCsCOL nDelta );
+ void IncEndColSticky( SCCOL nDelta );
/** Increment or decrement end row unless sticky or until it becomes
sticky. Checks if the range encompasses at least two rows so should
be called before adjusting the start row. */
- void IncEndRowSticky( SCsROW nDelta );
+ void IncEndRowSticky( SCROW nDelta );
inline bool operator==( const ScRange& rRange ) const;
inline bool operator!=( const ScRange& rRange ) const;
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index e43ff9268866..b7ac603f47ba 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -145,15 +145,15 @@ public:
void ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement );
/// Including current, may return -1
- SCsROW GetNextUnprotected( SCsROW nRow, bool bUp ) const;
+ SCROW GetNextUnprotected( SCROW nRow, bool bUp ) const;
/// May return -1 if not found
- SCsROW SearchStyle(
- SCsROW nRow, const ScStyleSheet* pSearchStyle, bool bUp,
+ SCROW SearchStyle(
+ SCROW nRow, const ScStyleSheet* pSearchStyle, bool bUp,
const ScMarkArray* pMarkArray = nullptr) const;
bool SearchStyleRange(
- SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp,
+ SCROW& rRow, SCROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp,
const ScMarkArray* pMarkArray = nullptr) const;
bool ApplyFlags( SCROW nStartRow, SCROW nEndRow, ScMF nFlags );
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index f7a5e4a0616d..b2f82d2046d2 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -54,11 +54,11 @@ bool SC_DLLPUBLIC ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::
class SC_DLLPUBLIC ScMergeAttr: public SfxPoolItem
{
- SCsCOL nColMerge;
- SCsROW nRowMerge;
+ SCCOL nColMerge;
+ SCROW nRowMerge;
public:
ScMergeAttr();
- ScMergeAttr( SCsCOL nCol, SCsROW nRow );
+ ScMergeAttr( SCCOL nCol, SCROW nRow );
ScMergeAttr( const ScMergeAttr& );
virtual ~ScMergeAttr() override;
@@ -66,8 +66,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const override;
- SCsCOL GetColMerge() const {return nColMerge; }
- SCsROW GetRowMerge() const {return nRowMerge; }
+ SCCOL GetColMerge() const {return nColMerge; }
+ SCROW GetRowMerge() const {return nRowMerge; }
bool IsMerged() const { return nColMerge>1 || nRowMerge>1; }
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index c2eb57f3ff52..9484db26e94d 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -298,7 +298,7 @@ protected:
void Accept();
virtual bool Reject(ScDocument* pDoc) = 0;
- void RejectRestoreContents( ScChangeTrack*, SCsCOL nDx, SCsROW nDy );
+ void RejectRestoreContents( ScChangeTrack*, SCCOL nDx, SCROW nDy );
// used in Reject() instead of IsRejectable()
bool IsInternalRejectable() const;
@@ -464,10 +464,10 @@ class ScChangeActionDel : public ScChangeAction
ScChangeActionIns* pCutOff; // cut insert
short nCutOff; // +: start -: end
ScChangeActionDelMoveEntry* pLinkMove;
- SCsCOL nDx;
- SCsROW nDy;
+ SCCOL nDx;
+ SCROW nDy;
- ScChangeActionDel( const ScRange& rRange, SCsCOL nDx, SCsROW nDy, ScChangeTrack* );
+ ScChangeActionDel( const ScRange& rRange, SCCOL nDx, SCROW nDy, ScChangeTrack* );
virtual ~ScChangeActionDel() override;
virtual void AddContent( ScChangeActionContent* ) override;
@@ -490,7 +490,7 @@ public:
const sal_uLong nRejectingNumber, const ScBigRange& aBigRange,
const OUString& aUser, const DateTime& aDateTime,
const OUString &sComment, const ScChangeActionType eType,
- const SCsCOLROW nD, ScChangeTrack* pTrack); // only to use in the XML import
+ const SCCOLROW nD, ScChangeTrack* pTrack); // only to use in the XML import
// which of nDx and nDy is set is dependent on the type
// is the last in a row (or single)
@@ -505,8 +505,8 @@ public:
// is col, belonging to a TabDelete
bool IsTabDeleteCol() const;
- SCsCOL GetDx() const { return nDx; }
- SCsROW GetDy() const { return nDy; }
+ SCCOL GetDx() const { return nDx; }
+ SCROW GetDy() const { return nDy; }
ScBigRange GetOverAllRange() const; // BigRange + (nDx, nDy)
const ScChangeActionDelMoveEntry* GetFirstMoveEntry() const
@@ -706,7 +706,7 @@ class ScChangeActionContent : public ScChangeAction
bool bOldest, ::std::stack<ScChangeActionContent*>* pRejectActions );
void PutValueToDoc(
- const ScCellValue& rCell, const OUString& rValue, ScDocument* pDoc, SCsCOL nDx, SCsROW nDy ) const;
+ const ScCellValue& rCell, const OUString& rValue, ScDocument* pDoc, SCCOL nDx, SCROW nDy ) const;
protected:
using ScChangeAction::GetRefString;
@@ -740,9 +740,9 @@ public:
virtual ScChangeActionLinkEntry** GetDeletedInAddress() override;
void PutOldValueToDoc( ScDocument*,
- SCsCOL nDx, SCsROW nDy ) const;
+ SCCOL nDx, SCROW nDy ) const;
void PutNewValueToDoc( ScDocument*,
- SCsCOL nDx, SCsROW nDy ) const;
+ SCCOL nDx, SCROW nDy ) const;
void SetOldValue( const ScCellValue& rCell, const ScDocument* pFromDoc, ScDocument* pToDoc, sal_uLong nFormat );
@@ -852,7 +852,7 @@ enum ScChangeTrackMergeState
class ScChangeTrack : public utl::ConfigurationListener
{
- friend void ScChangeAction::RejectRestoreContents( ScChangeTrack*, SCsCOL, SCsROW );
+ friend void ScChangeAction::RejectRestoreContents( ScChangeTrack*, SCCOL, SCROW );
friend bool ScChangeActionDel::Reject( ScDocument* pDoc );
friend void ScChangeActionDel::DeleteCellEntries();
friend void ScChangeActionMove::DeleteCellEntries();
@@ -941,15 +941,15 @@ class ScChangeTrack : public utl::ConfigurationListener
void UpdateReference( ScChangeAction** ppFirstAction, ScChangeAction* pAct, bool bUndo );
void Append( ScChangeAction* pAppend, sal_uLong nAction );
SC_DLLPUBLIC void AppendDeleteRange( const ScRange&,
- ScDocument* pRefDoc, SCsTAB nDz,
+ ScDocument* pRefDoc, SCTAB nDz,
sal_uLong nRejectingInsert );
void AppendOneDeleteRange( const ScRange& rOrgRange,
ScDocument* pRefDoc,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
+ SCCOL nDx, SCROW nDy, SCTAB nDz,
sal_uLong nRejectingInsert );
void LookUpContents( const ScRange& rOrgRange,
ScDocument* pRefDoc,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ SCCOL nDx, SCROW nDy, SCTAB nDz );
void Remove( ScChangeAction* );
void MasterLinks( ScChangeAction* );
@@ -1037,7 +1037,7 @@ public:
SC_DLLPUBLIC void AppendDeleteRange( const ScRange&,
ScDocument* pRefDoc,
sal_uLong& nStartAction, sal_uLong& nEndAction,
- SCsTAB nDz = 0 );
+ SCTAB nDz = 0 );
// nDz: multi TabDel, LookUpContent must be searched
// with an offset of -nDz
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 0c195eb316d0..d406a21ac784 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -482,12 +482,12 @@ public:
bool IsStyleSheetUsed( const ScStyleSheet& rStyle ) const;
/// May return -1 if not found
- SCsROW SearchStyle(
- SCsROW nRow, const ScStyleSheet* pSearchStyle, bool bUp, bool bInSelection,
+ SCROW SearchStyle(
+ SCROW nRow, const ScStyleSheet* pSearchStyle, bool bUp, bool bInSelection,
const ScMarkData& rMark) const;
bool SearchStyleRange(
- SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp,
+ SCROW& rRow, SCROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp,
bool bInSelection, const ScMarkData& rMark) const;
bool ApplyFlags( SCROW nStartRow, SCROW nEndRow, ScMF nFlags );
@@ -496,7 +496,7 @@ public:
void RemoveProtected( SCROW nStartRow, SCROW nEndRow );
- SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray );
+ SCROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray );
void DeleteSelection( InsertDeleteFlags nDelFlag, const ScMarkData& rMark, bool bBroadcast );
void ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark );
@@ -516,7 +516,7 @@ public:
sc::RowHeightContext& rCxt, SCROW nStartRow, SCROW nEndRow, sal_uInt16 nMinHeight, SCROW nMinStart );
/// Including current, may return -1
- SCsROW GetNextUnprotected( SCROW nRow, bool bUp ) const;
+ SCROW GetNextUnprotected( SCROW nRow, bool bUp ) const;
void GetFilterEntries(
sc::ColumnBlockConstPosition& rBlockPos, SCROW nStartRow, SCROW nEndRow,
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 9e73783f1f28..9c35ff4b1b82 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -281,7 +281,7 @@ private:
const CharClass* pCharClass; // which character classification is used for parseAnyToken
sal_uInt16 mnPredetectedReference; // reference when reading ODF, 0 (none), 1 (single) or 2 (double)
- SCsTAB nMaxTab; // last sheet in document
+ SCTAB nMaxTab; // last sheet in document
sal_Int32 mnRangeOpPosInSymbol; // if and where a range operator is in symbol
const Convention *pConv;
ExtendedErrorDetection meExtendedErrorDetection;
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index a5b761e15d5d..9412f23b7c65 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -211,7 +211,7 @@ public:
void UpdateReference(ScDocument* pDoc, UpdateRefMode eUpdateRefMode,
SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz);
+ SCCOL nDx, SCROW nDy, SCTAB nDz);
void ExtendDataArea(ScDocument* pDoc);
void CalcSaveFilteredCount(SCSIZE nNonFilteredRowCount);
@@ -324,7 +324,7 @@ public:
void UpdateReference(UpdateRefMode eUpdateRefMode,
SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz);
+ SCCOL nDx, SCROW nDy, SCTAB nDz);
void UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos );
void SetRefreshHandler( const Link<Timer *, void>& rLink )
diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx
index 61b29801a156..eb6eb4ea159d 100644
--- a/sc/inc/detdata.hxx
+++ b/sc/inc/detdata.hxx
@@ -68,7 +68,7 @@ public:
void DeleteOnTab( SCTAB nTab );
void UpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMode,
- const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ const ScRange& rRange, SCCOL nDx, SCROW nDy, SCTAB nDz );
bool operator==( const ScDetOpList& r ) const; // for ref-undo
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 87c89958acf2..da3f6feb2d66 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -945,7 +945,7 @@ public:
void UpdateChartRef( UpdateRefMode eUpdateRefMode,
SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ SCCOL nDx, SCROW nDy, SCTAB nDz );
//! only assigns the new RangeList, no ChartListener or the like
void SetChartRangeList( const OUString& rChartName,
const ScRangeListRef& rNewRangeListRef );
@@ -1328,7 +1328,7 @@ public:
ScDirection eDir );
void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, ScMoveDirection eDirection ) const;
- SC_DLLPUBLIC void GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY,
+ SC_DLLPUBLIC void GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCCOL nMovX, SCROW nMovY,
bool bMarked, bool bUnprotected, const ScMarkData& rMark ) const;
bool GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, SCTAB nTab,
@@ -1442,10 +1442,10 @@ public:
SCCOL nCol2, SCROW nRow2 );
void CopyBlockFromClip( sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark,
- SCsCOL nDx, SCsROW nDy );
+ SCCOL nDx, SCROW nDy );
void CopyNonFilteredFromClip( sc::CopyFromClipContext& rCxt, SCCOL nCol1,
SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- const ScMarkData& rMark, SCsCOL nDx, SCROW & rClipStartRow );
+ const ScMarkData& rMark, SCCOL nDx, SCROW & rClipStartRow );
void StartListeningFromClip( SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2,
@@ -2058,7 +2058,7 @@ public:
void DelBroadcastAreasInRange( const ScRange& rRange );
void UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode,
const ScRange& rRange,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ SCCOL nDx, SCROW nDy, SCTAB nDz );
void StartListeningCell( const ScAddress& rAddress,
SvtListener* pListener );
@@ -2337,7 +2337,7 @@ private:
void DeleteAreaLinksOnTab( SCTAB nTab );
void UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode,
- const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ const ScRange& r, SCCOL nDx, SCROW nDy, SCTAB nDz );
void CopyRangeNamesToClip(ScDocument* pClipDoc, const ScRange& rClipRange, const ScMarkData* pMarks);
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 9e02cfd8f0df..aaed76a7e141 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -209,7 +209,7 @@ public:
bool GetMembers( sal_Int32 nDim, sal_Int32 nHier, ::std::vector<ScDPLabelData::Member>& rMembers );
void UpdateReference( UpdateRefMode eUpdateRefMode,
- const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ const ScRange& r, SCCOL nDx, SCROW nDy, SCTAB nDz );
bool RefsEqual( const ScDPObject& r ) const;
void WriteRefsTo( ScDPObject& r ) const;
@@ -279,7 +279,7 @@ public:
SC_DLLPUBLIC size_t size() const;
void updateReference(
- UpdateRefMode eMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz);
+ UpdateRefMode eMode, const ScRange& r, SCCOL nDx, SCROW nDy, SCTAB nDz);
SC_DLLPUBLIC ScDPCache* getExistingCache(const ScRange& rRange);
SC_DLLPUBLIC const ScDPCache* getExistingCache(const ScRange& rRange) const;
@@ -375,7 +375,7 @@ public:
void DeleteOnTab( SCTAB nTab );
void UpdateReference( UpdateRefMode eUpdateRefMode,
- const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ const ScRange& r, SCCOL nDx, SCROW nDy, SCTAB nDz );
void CopyToTab( SCTAB nOld, SCTAB nNew );
bool RefsEqual( const ScDPCollection& r ) const;
void WriteRefsTo( ScDPCollection& r ) const;
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 46b117256957..aab7d34424e9 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -102,7 +102,7 @@ private:
private:
void MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
- SCsCOL nDx,SCsROW nDy, bool bUpdateNoteCaptionPos );
+ SCCOL nDx,SCROW nDy, bool bUpdateNoteCaptionPos );
void RecalcPos( SdrObject* pObj, ScDrawObjData& rData, bool bNegativePage, bool bUpdateNoteCaptionPos );
void ResizeLastRectFromAnchor( SdrObject* pObj, ScDrawObjData& rData, bool bUseLogicRect, bool bNegativePage, bool bCanResize, bool bHiddenAsZero = true );
@@ -140,7 +140,7 @@ public:
void AddCalcUndo( SdrUndoAction* pUndo );
void MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
- SCsCOL nDx,SCsROW nDy, bool bInsDel, bool bUpdateNoteCaptionPos );
+ SCCOL nDx,SCROW nDy, bool bInsDel, bool bUpdateNoteCaptionPos );
bool HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow );
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 417ef65c3bc1..27002763d88e 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -242,7 +242,7 @@ public:
void initializeDoc(sal_uInt16 nFileId, const ::std::vector<OUString>& rTabNames, const OUString& rBaseName);
OUString getTableName(sal_uInt16 nFileId, size_t nCacheId) const;
void getAllTableNames(sal_uInt16 nFileId, ::std::vector<OUString>& rTabNames) const;
- SCsTAB getTabSpan( sal_uInt16 nFileId, const OUString& rStartTabName, const OUString& rEndTabName ) const;
+ SCTAB getTabSpan( sal_uInt16 nFileId, const OUString& rStartTabName, const OUString& rEndTabName ) const;
void getAllNumberFormats(::std::vector<sal_uInt32>& rNumFmts) const;
/**
@@ -504,7 +504,7 @@ public:
* -1 if nFileId or rStartTabName not found
* 0 if rEndTabName not found
*/
- SCsTAB getCachedTabSpan(
+ SCTAB getCachedTabSpan(
sal_uInt16 nFileId, const OUString& rStartTabName, const OUString& rEndTabName) const;
/**
diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index 2ad9f1e4707e..2ffb689bb67b 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -50,20 +50,20 @@ class ScUpdateRefHint : public SfxHint
{
UpdateRefMode eUpdateRefMode;
ScRange aRange;
- SCsCOL nDx;
- SCsROW nDy;
- SCsTAB nDz;
+ SCCOL nDx;
+ SCROW nDy;
+ SCTAB nDz;
public:
ScUpdateRefHint( UpdateRefMode eMode, const ScRange& rR,
- SCsCOL nX, SCsROW nY, SCsTAB nZ );
+ SCCOL nX, SCROW nY, SCTAB nZ );
virtual ~ScUpdateRefHint() override;
UpdateRefMode GetMode() const { return eUpdateRefMode; }
const ScRange& GetRange() const { return aRange; }
- SCsCOL GetDx() const { return nDx; }
- SCsROW GetDy() const { return nDy; }
- SCsTAB GetDz() const { return nDz; }
+ SCCOL GetDx() const { return nDx; }
+ SCROW GetDy() const { return nDy; }
+ SCTAB GetDz() const { return nDz; }
};
//! move ScLinkRefreshedHint to a different file?
diff --git a/sc/inc/markarr.hxx b/sc/inc/markarr.hxx
index a88dd7683e1b..33a7b9031128 100644
--- a/sc/inc/markarr.hxx
+++ b/sc/inc/markarr.hxx
@@ -58,7 +58,7 @@ public:
bool Search( SCROW nRow, SCSIZE& nIndex ) const;
/// Including current row, may return -1 if bUp and not found
- SCsROW GetNextMarked( SCsROW nRow, bool bUp ) const;
+ SCROW GetNextMarked( SCROW nRow, bool bUp ) const;
SCROW GetMarkEnd( SCROW nRow, bool bUp ) const;
};
diff --git a/sc/inc/markdata.hxx b/sc/inc/markdata.hxx
index 2f182eeb9426..51f63a477d67 100644
--- a/sc/inc/markdata.hxx
+++ b/sc/inc/markdata.hxx
@@ -134,7 +134,7 @@ public:
bool IsAllMarked( const ScRange& rRange ) const; // Multi
/// May return -1
- SCsROW GetNextMarked( SCCOL nCol, SCsROW nRow, bool bUp ) const;
+ SCROW GetNextMarked( SCCOL nCol, SCROW nRow, bool bUp ) const;
bool HasMultiMarks( SCCOL nCol ) const;
bool HasAnyMultiMarks() const;
diff --git a/sc/inc/markmulti.hxx b/sc/inc/markmulti.hxx
index 22f0ee5d1dad..4999df5c5708 100644
--- a/sc/inc/markmulti.hxx
+++ b/sc/inc/markmulti.hxx
@@ -54,7 +54,7 @@ public:
bool GetMark( SCCOL nCol, SCROW nRow ) const;
bool IsAllMarked( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const;
bool HasEqualRowsMarked( SCCOL nCol1, SCCOL nCol2 ) const;
- SCsROW GetNextMarked( SCCOL nCol, SCsROW nRow, bool bUp ) const;
+ SCROW GetNextMarked( SCCOL nCol, SCROW nRow, bool bUp ) const;
void SetMarkArea( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow, bool bMark );
bool IsRowMarked( SCROW nRow ) const;
bool IsRowRangeMarked( SCROW nStartRow, SCROW nEndRow ) const;
diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx
index e78b651c7613..8f4d73d98c61 100644
--- a/sc/inc/olinetab.hxx
+++ b/sc/inc/olinetab.hxx
@@ -54,7 +54,7 @@ public:
*/
SC_DLLPUBLIC bool IsVisible() const { return bVisible;}
- void Move( SCsCOLROW nDelta );
+ void Move( SCCOLROW nDelta );
void SetSize( SCSIZE nNewSize );
void SetPosSize( SCCOLROW nNewPos, SCSIZE nNewSize );
void SetHidden( bool bNewHidden );
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 3fe510c1d361..5443f373a4af 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -50,9 +50,9 @@ public:
bool UpdateReference( UpdateRefMode, ScDocument*,
const ScRange& rWhere,
- SCsCOL nDx,
- SCsROW nDy,
- SCsTAB nDz
+ SCCOL nDx,
+ SCROW nDy,
+ SCTAB nDz
);
void InsertRow( SCTAB nTab, SCCOL nColStart, SCCOL nColEnd, SCROW nRowPos, SCSIZE nSize );
@@ -116,7 +116,7 @@ public:
void Join( const ScRangePair&, bool bIsInList = false );
void UpdateReference( UpdateRefMode, ScDocument*,
const ScRange& rWhere,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ SCCOL nDx, SCROW nDy, SCTAB nDz );
void DeleteOnTab( SCTAB nTab );
ScRangePair* Find( const ScAddress& ) const;
ScRangePair* Find( const ScRange& ) const;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index c5941b0a085f..ef94249026b4 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -473,7 +473,7 @@ public:
void CopyFromClip(
sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- SCsCOL nDx, SCsROW nDy, ScTable* pTable );
+ SCCOL nDx, SCROW nDy, ScTable* pTable );
void StartListeningFormulaCells(
sc::StartListeningContext& rStartCxt, sc::EndListeningContext& rEndCxt,
@@ -495,7 +495,7 @@ public:
InsertDeleteFlags nFlags, bool bMarked, ScTable* pDestTab );
void CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- SCsCOL nDx, SCsROW nDy, ScTable* pTable);
+ SCCOL nDx, SCROW nDy, ScTable* pTable);
void TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
ScTable* pTransClip, InsertDeleteFlags nFlags, bool bAsLink );
@@ -550,7 +550,7 @@ public:
SCCOL nEndCol, SCROW nEndRow, ScDirection eDir ) const;
void FindAreaPos( SCCOL& rCol, SCROW& rRow, ScMoveDirection eDirection ) const;
- void GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
+ void GetNextPos( SCCOL& rCol, SCROW& rRow, SCCOL nMovX, SCROW nMovY,
bool bMarked, bool bUnprotected, const ScMarkData& rMark ) const;
void LimitChartArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ) const;
@@ -598,7 +598,7 @@ public:
void UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bUpdateNoteCaptionPos = true );
+ SCCOL nDx, SCROW nDy, SCTAB nDz, bool bUpdateNoteCaptionPos = true );
void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest,
ScDocument* pUndoDoc );
@@ -1098,7 +1098,7 @@ private:
ScSortInfoArray* CreateSortInfoArray(
const ScSortParam& rSortParam, SCCOLROW nInd1, SCCOLROW nInd2,
bool bKeepQuery, bool bUpdateRefs );
- void QuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi);
+ void QuickSort( ScSortInfoArray*, SCCOLROW nLo, SCCOLROW nHi);
void SortReorderByColumn( ScSortInfoArray* pArray, SCROW nRow1, SCROW nRow2, bool bPattern, ScProgress* pProgress );
void SortReorderByRow( ScSortInfoArray* pArray, SCCOL nCol1, SCCOL nCol2, ScProgress* pProgress );
diff --git a/sc/inc/tabprotection.hxx b/sc/inc/tabprotection.hxx
index f8226c302ae9..2c999749c5bd 100644
--- a/sc/inc/tabprotection.hxx
+++ b/sc/inc/tabprotection.hxx
@@ -188,7 +188,7 @@ public:
void setEnhancedProtection( const ::std::vector< ScEnhancedProtection > & rProt );
const ::std::vector< ScEnhancedProtection > & getEnhancedProtection() const;
- bool updateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ bool updateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCCOL nDx, SCROW nDy, SCTAB nDz );
bool isBlockEditable( const ScRange& rRange ) const;
bool isSelectionEditable( const ScRangeList& rRangeList ) const;
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index 53bb2616b040..4cfa434c21cb 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -23,12 +23,6 @@ typedef sal_Int16 SCCOL;
typedef sal_Int16 SCTAB;
typedef sal_Int32 SCCOLROW; ///< a type capable of holding either SCCOL or SCROW
-// temporarily signed typedefs
-typedef sal_Int32 SCsROW;
-typedef sal_Int16 SCsCOL;
-typedef sal_Int16 SCsTAB;
-typedef sal_Int32 SCsCOLROW;
-
typedef ::boost::intrusive_ptr<ScMatrix> ScMatrixRef;
typedef ::boost::intrusive_ptr<const ScMatrix> ScConstMatrixRef;
diff --git a/sc/qa/unit/mark_test.cxx b/sc/qa/unit/mark_test.cxx
index 6c983291fd58..abf3a9c56d3b 100644
--- a/sc/qa/unit/mark_test.cxx
+++ b/sc/qa/unit/mark_test.cxx
@@ -299,9 +299,9 @@ void Test::testMultiMark( const MultiMarkTestData& rMarksData )
for ( const auto& rRange : rAreaTestData.aNextMarked )
{
- SCsROW nNextRow1 = aMark.GetNextMarked( rRange.aStart.Col(), rRange.aStart.Row(), !static_cast<bool>(rRange.aEnd.Col()) );
+ SCROW nNextRow1 = aMark.GetNextMarked( rRange.aStart.Col(), rRange.aStart.Row(), !static_cast<bool>(rRange.aEnd.Col()) );
CPPUNIT_ASSERT_EQUAL( rRange.aEnd.Row(), nNextRow1 );
- SCsROW nNextRow2 = aMultiSel.GetNextMarked( rRange.aStart.Col(), rRange.aStart.Row(), !static_cast<bool>(rRange.aEnd.Col()) );
+ SCROW nNextRow2 = aMultiSel.GetNextMarked( rRange.aStart.Col(), rRange.aStart.Row(), !static_cast<bool>(rRange.aEnd.Col()) );
CPPUNIT_ASSERT_EQUAL( rRange.aEnd.Row(), nNextRow2 );
}
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 3f6a38820abc..fe8d35aeeb09 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1136,7 +1136,7 @@ formula::FormulaToken* getSingleRefToken(ScDocument& rDoc, const ScAddress& rPos
return pToken;
}
-bool checkRelativeRefToken(ScDocument& rDoc, const ScAddress& rPos, SCsCOL nRelCol, SCsROW nRelRow)
+bool checkRelativeRefToken(ScDocument& rDoc, const ScAddress& rPos, SCCOL nRelCol, SCROW nRelRow)
{
formula::FormulaToken* pToken = getSingleRefToken(rDoc, rPos);
if (!pToken)
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index f27d24905071..94c2fce5d620 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1482,8 +1482,8 @@ bool ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
{
pPattern = pData[i].pPattern;
pItem = static_cast<const ScMergeAttr*>( &pPattern->GetItem( ATTR_MERGE ) );
- SCsCOL nCountX = pItem->GetColMerge();
- SCsROW nCountY = pItem->GetRowMerge();
+ SCCOL nCountX = pItem->GetColMerge();
+ SCROW nCountY = pItem->GetRowMerge();
if (nCountX>1 || nCountY>1)
{
SCROW nThisRow = (i>0) ? pData[i-1].nRow+1 : 0;
@@ -1538,8 +1538,8 @@ void ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow)
pPattern = pData[nIndex].pPattern;
pItem = static_cast<const ScMergeAttr*>( &pPattern->GetItem( ATTR_MERGE ) );
- SCsCOL nCountX = pItem->GetColMerge();
- SCsROW nCountY = pItem->GetRowMerge();
+ SCCOL nCountX = pItem->GetColMerge();
+ SCROW nCountY = pItem->GetRowMerge();
if (nCountX>1 || nCountY>1)
{
const ScMergeAttr* pAttr = static_cast<const ScMergeAttr*>(
@@ -1797,7 +1797,7 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement
}
}
-SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, bool bUp ) const
+SCROW ScAttrArray::GetNextUnprotected( SCROW nRow, bool bUp ) const
{
long nRet = nRow;
if (ValidRow(nRow))
@@ -2554,8 +2554,8 @@ void ScAttrArray::CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttr
}
}
-SCsROW ScAttrArray::SearchStyle(
- SCsROW nRow, const ScStyleSheet* pSearchStyle, bool bUp,
+SCROW ScAttrArray::SearchStyle(
+ SCROW nRow, const ScStyleSheet* pSearchStyle, bool bUp,
const ScMarkArray* pMarkArray) const
{
bool bFound = false;
@@ -2627,10 +2627,10 @@ SCsROW ScAttrArray::SearchStyle(
}
bool ScAttrArray::SearchStyleRange(
- SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp,
+ SCROW& rRow, SCROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp,
const ScMarkArray* pMarkArray) const
{
- SCsROW nStartRow = SearchStyle( rRow, pSearchStyle, bUp, pMarkArray );
+ SCROW nStartRow = SearchStyle( rRow, pSearchStyle, bUp, pMarkArray );
if (ValidRow(nStartRow))
{
if ( !pData )
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index dbd9c2706ed2..5cde3aba4b4d 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -98,7 +98,7 @@ ScMergeAttr::ScMergeAttr():
nRowMerge(0)
{}
-ScMergeAttr::ScMergeAttr( SCsCOL nCol, SCsROW nRow):
+ScMergeAttr::ScMergeAttr( SCCOL nCol, SCROW nRow):
SfxPoolItem(ATTR_MERGE),
nColMerge(nCol),
nRowMerge(nRow)
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index e4cf53641c40..389d26217963 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -412,7 +412,7 @@ void ScBroadcastAreaSlot::DelBroadcastAreasInRange( const ScRange& rRange )
}
void ScBroadcastAreaSlot::UpdateRemove( UpdateRefMode eUpdateRefMode,
- const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ const ScRange& rRange, SCCOL nDx, SCROW nDy, SCTAB nDz )
{
if (aBroadcastAreaTbl.empty())
return;
@@ -917,7 +917,7 @@ void ScBroadcastAreaSlotMachine::DelBroadcastAreasInRange(
// for all affected: remove, chain, update range, insert, and maybe delete
void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas(
UpdateRefMode eUpdateRefMode,
- const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ const ScRange& rRange, SCCOL nDx, SCROW nDy, SCTAB nDz )
{
// remove affected and put in chain
SCTAB nEndTab = rRange.aEnd.Tab();
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 6895b49aff23..45f211cbedd1 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -114,7 +114,7 @@ void ScColumn::Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc, bool bEmptyA
pAttrArray = new ScAttrArray( nCol, nTab, pDocument, &pDocument->maTabs[nTab]->aDefaultColAttrArray );
}
-SCsROW ScColumn::GetNextUnprotected( SCROW nRow, bool bUp ) const
+SCROW ScColumn::GetNextUnprotected( SCROW nRow, bool bUp ) const
{
return pAttrArray->GetNextUnprotected(nRow, bUp);
}
@@ -424,7 +424,7 @@ sal_uInt32 ScColumn::GetNumberFormat( SCROW nRow ) const
return pAttrArray->GetPattern( nRow )->GetNumberFormat( pDocument->GetFormatTable() );
}
-SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray )
+SCROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray )
{
SCROW nTop = 0;
SCROW nBottom = 0;
@@ -3488,8 +3488,8 @@ bool ScColumn::HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst)
return true;
}
-SCsROW ScColumn::SearchStyle(
- SCsROW nRow, const ScStyleSheet* pSearchStyle, bool bUp, bool bInSelection,
+SCROW ScColumn::SearchStyle(
+ SCROW nRow, const ScStyleSheet* pSearchStyle, bool bUp, bool bInSelection,
const ScMarkData& rMark) const
{
if (bInSelection)
@@ -3507,7 +3507,7 @@ SCsROW ScColumn::SearchStyle(
}
bool ScColumn::SearchStyleRange(
- SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp,
+ SCROW& rRow, SCROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp,
bool bInSelection, const ScMarkData& rMark) const
{
if (bInSelection)
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 5cd5bdbb6aa7..7d089f2a3d79 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -771,7 +771,7 @@ bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos, ScProgress* pProgress )
sc::RefUpdateMoveTabContext aCxt( *this, nOldPos, nNewPos);
- SCsTAB nDz = ((SCsTAB)nNewPos) - (SCsTAB)nOldPos;
+ SCTAB nDz = nNewPos - nOldPos;
ScRange aSourceRange( 0,0,nOldPos, MAXCOL,MAXROW,nOldPos );
if (pRangeName)
pRangeName->UpdateMoveTab(aCxt);
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 49da87c08706..14dc9c1ab0fa 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1295,7 +1295,7 @@ bool ScDocument::SearchAndReplace(
nRow = rRow;
if (rSearchItem.GetBackward())
{
- for (nTab = rTab; ((SCsTAB)nTab >= 0) && !bFound; nTab--)
+ for (nTab = rTab; (nTab >= 0) && !bFound; nTab--)
if (maTabs[nTab])
{
if (rMark.GetTableSelect(nTab))
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index 3c72a050ab66..c15f9fc2de9b 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -479,7 +479,7 @@ void ScDocument::RestoreChartListener( const OUString& rName )
void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode,
SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ SCCOL nDx, SCROW nDy, SCTAB nDz )
{
if (!pDrawLayer)
return;
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 282e1a53514f..1dc49fd5b2e7 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -614,7 +614,7 @@ void ScDocument::StartAllListeners()
}
void ScDocument::UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode,
- const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz
+ const ScRange& rRange, SCCOL nDx, SCROW nDy, SCTAB nDz
)
{
bool bExpandRefsOld = IsExpandRefs();
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 9ad00a487c7a..16e4909ab5ff 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -1081,7 +1081,7 @@ void ScDocument::DeleteAreaLinksOnTab( SCTAB nTab )
}
void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode,
- const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ const ScRange& rRange, SCCOL nDx, SCROW nDy, SCTAB nDz )
{
sfx2::LinkManager* pMgr = GetDocLinkManager().getLinkManager(false);
if (!pMgr)
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 79ee0a96fb63..9d68bb5a5564 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1305,7 +1305,7 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab,
// of the bottommost group.
EndListeningIntersectedGroups(aEndListenCxt, aShiftedRange, &aGroupPos);
- UpdateBroadcastAreas(URM_INSDEL, aShiftedRange, 0, static_cast<SCsROW>(nSize), 0);
+ UpdateBroadcastAreas(URM_INSDEL, aShiftedRange, 0, static_cast<SCROW>(nSize), 0);
}
while ( lcl_GetNextTabRange( nTabRangeStart, nTabRangeEnd, pTabMark, static_cast<SCTAB>(maTabs.size()) ) );
@@ -1338,7 +1338,7 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab,
if (maTabs[i] && (!pTabMark || pTabMark->GetTableSelect(i)))
maTabs[i]->UpdateDrawRef( URM_INSDEL,
nStartCol, nStartRow, nStartTab, nEndCol, MAXROW, nEndTab,
- 0, static_cast<SCsROW>(nSize), 0 );
+ 0, static_cast<SCROW>(nSize), 0 );
if ( pChangeTrack && pChangeTrack->IsInDeleteUndo() )
{ // A new Listening is needed when references to deleted ranges are restored,
@@ -1405,7 +1405,7 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab,
ScAddress( nEndCol, nStartRow+nSize-1, nTabRangeEnd ) ) );
UpdateBroadcastAreas( URM_INSDEL, ScRange(
ScAddress( nStartCol, nStartRow+nSize, nTabRangeStart ),
- ScAddress( nEndCol, MAXROW, nTabRangeEnd )), 0, -(static_cast<SCsROW>(nSize)), 0 );
+ ScAddress( nEndCol, MAXROW, nTabRangeEnd )), 0, -(static_cast<SCROW>(nSize)), 0 );
}
else
DelBroadcastAreasInRange( ScRange(
@@ -1524,7 +1524,7 @@ bool ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab,
{
UpdateBroadcastAreas( URM_INSDEL, ScRange(
ScAddress( nStartCol, nStartRow, nTabRangeStart ),
- ScAddress( MAXCOL, nEndRow, nTabRangeEnd )), static_cast<SCsCOL>(nSize), 0, 0 );
+ ScAddress( MAXCOL, nEndRow, nTabRangeEnd )), static_cast<SCCOL>(nSize), 0, 0 );
}
while ( lcl_GetNextTabRange( nTabRangeStart, nTabRangeEnd, pTabMark, static_cast<SCTAB>(maTabs.size()) ) );
@@ -1605,7 +1605,7 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA
ScAddress( sal::static_int_cast<SCCOL>(nStartCol+nSize-1), nEndRow, nTabRangeEnd ) ) );
UpdateBroadcastAreas( URM_INSDEL, ScRange(
ScAddress( sal::static_int_cast<SCCOL>(nStartCol+nSize), nStartRow, nTabRangeStart ),
- ScAddress( MAXCOL, nEndRow, nTabRangeEnd )), -static_cast<SCsCOL>(nSize), 0, 0 );
+ ScAddress( MAXCOL, nEndRow, nTabRangeEnd )), -static_cast<SCCOL>(nSize), 0, 0 );
}
else
DelBroadcastAreasInRange( ScRange(
@@ -2571,7 +2571,7 @@ bool ScDocument::InitColumnBlockPosition( sc::ColumnBlockPosition& rBlockPos, SC
void ScDocument::CopyBlockFromClip(
sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- const ScMarkData& rMark, SCsCOL nDx, SCsROW nDy )
+ const ScMarkData& rMark, SCCOL nDx, SCROW nDy )
{
TableContainer& rClipTabs = rCxt.getClipDoc()->maTabs;
SCTAB nTabEnd = rCxt.getTabEnd();
@@ -2617,7 +2617,7 @@ void ScDocument::CopyBlockFromClip(
if (maTabs[i] && rMark.GetTableSelect(i) )
{
while (!rClipTabs[nClipTab]) nClipTab = (nClipTab+1) % (static_cast<SCTAB>(rClipTabs.size()));
- SCsTAB nDz = ((SCsTAB)i) - nClipTab;
+ SCTAB nDz = i - nClipTab;
// ranges of consecutive selected tables (in clipboard and dest. doc)
// must be handled in one UpdateReference call
@@ -2673,7 +2673,7 @@ void ScDocument::CopyBlockFromClip(
void ScDocument::CopyNonFilteredFromClip(
sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- const ScMarkData& rMark, SCsCOL nDx, SCROW & rClipStartRow )
+ const ScMarkData& rMark, SCCOL nDx, SCROW & rClipStartRow )
{
// call CopyBlockFromClip for ranges of consecutive non-filtered rows
// nCol1/nRow1 etc. is in target doc
@@ -2707,7 +2707,7 @@ void ScDocument::CopyNonFilteredFromClip(
if (nFollow > nRow2 - nDestRow)
nFollow = nRow2 - nDestRow;
- SCsROW nNewDy = ((SCsROW)nDestRow) - nSourceRow;
+ SCROW nNewDy = nDestRow - nSourceRow;
CopyBlockFromClip(
rCxt, nCol1, nDestRow, nCol2, nDestRow + nFollow, rMark, nDx, nNewDy);
@@ -2886,8 +2886,8 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
do
{
nClipStartRow = nSaveClipStartRow;
- SCsCOL nDx = ((SCsCOL)nC1) - nClipStartCol;
- SCsROW nDy = ((SCsROW)nR1) - nClipStartRow;
+ SCCOL nDx = nC1 - nClipStartCol;
+ SCROW nDy = nR1 - nClipStartRow;
if ( bIncludeFiltered )
{
CopyBlockFromClip(
@@ -3010,8 +3010,8 @@ void ScDocument::CopyMultiRangeFromClip(
ScRange* p = rClipParam.maRanges[i];
SCROW nRowCount = p->aEnd.Row() - p->aStart.Row() + 1;
- SCsCOL nDx = static_cast<SCsCOL>(nCol1 - p->aStart.Col());
- SCsROW nDy = static_cast<SCsROW>(nRow1 - p->aStart.Row());
+ SCCOL nDx = static_cast<SCCOL>(nCol1 - p->aStart.Col());
+ SCROW nDy = static_cast<SCROW>(nRow1 - p->aStart.Row());
SCCOL nCol2 = nCol1 + p->aEnd.Col() - p->aStart.Col();
SCROW nEndRow = nRow1 + nRowCount - 1;
@@ -5970,7 +5970,7 @@ void ScDocument::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, ScMoveDirect
maTabs[nTab]->FindAreaPos( rCol, rRow, eDirection );
}
-void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY,
+void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCCOL nMovX, SCROW nMovY,
bool bMarked, bool bUnprotected, const ScMarkData& rMark ) const
{
OSL_ENSURE( !nMovX || !nMovY, "GetNextPos: only X or Y" );
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index b6e62a8c04d4..28779f3238a3 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -1060,7 +1060,7 @@ bool ScDPObject::GetMembers( sal_Int32 nDim, sal_Int32 nHier, vector<ScDPLabelDa
}
void ScDPObject::UpdateReference( UpdateRefMode eUpdateRefMode,
- const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ const ScRange& rRange, SCCOL nDx, SCROW nDy, SCTAB nDz )
{
// Output area
@@ -1102,8 +1102,8 @@ void ScDPObject::UpdateReference( UpdateRefMode eUpdateRefMode,
nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
if ( eRes != UR_NOTHING )
{
- SCsCOL nDiffX = nCol1 - pSheetDesc->GetSourceRange().aStart.Col();
- SCsROW nDiffY = nRow1 - pSheetDesc->GetSourceRange().aStart.Row();
+ SCCOL nDiffX = nCol1 - pSheetDesc->GetSourceRange().aStart.Col();
+ SCROW nDiffY = nRow1 - pSheetDesc->GetSourceRange().aStart.Row();
ScQueryParam aParam = pSheetDesc->GetQueryParam();
aParam.nCol1 = sal::static_int_cast<SCCOL>( aParam.nCol1 + nDiffX );
@@ -2146,10 +2146,10 @@ namespace {
class FindByColumn : public std::unary_function<ScPivotField, bool>
{
- SCsCOL mnCol;
+ SCCOL mnCol;
PivotFunc mnMask;
public:
- FindByColumn(SCsCOL nCol, PivotFunc nMask) : mnCol(nCol), mnMask(nMask) {}
+ FindByColumn(SCCOL nCol, PivotFunc nMask) : mnCol(nCol), mnMask(nMask) {}
bool operator() (const ScPivotField& r) const
{
return r.nCol == mnCol && r.nFuncMask == mnMask;
@@ -2231,11 +2231,11 @@ void lcl_FillOldFields( ScPivotFieldVector& rFields,
{
// this dimension is cloned.
- SCsCOL nCompCol; // ID of the original dimension.
+ SCCOL nCompCol; // ID of the original dimension.
if ( bDataLayout )
nCompCol = PIVOT_DATA_FIELD;
else
- nCompCol = static_cast<SCsCOL>(nDupSource); //TODO: seek source column from name
+ nCompCol = static_cast<SCCOL>(nDupSource); //TODO: seek source column from name
ScPivotFieldVector::iterator it = std::find_if(aFields.begin(), aFields.end(), FindByColumn(nCompCol, nMask));
if (it != aFields.end())
@@ -3039,7 +3039,7 @@ size_t ScDPCollection::SheetCaches::size() const
}
void ScDPCollection::SheetCaches::updateReference(
- UpdateRefMode eMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz)
+ UpdateRefMode eMode, const ScRange& r, SCCOL nDx, SCROW nDy, SCTAB nDz)
{
if (maRanges.empty())
// No caches.
@@ -3627,7 +3627,7 @@ void ScDPCollection::DeleteOnTab( SCTAB nTab )
}
void ScDPCollection::UpdateReference( UpdateRefMode eUpdateRefMode,
- const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ const ScRange& r, SCCOL nDx, SCROW nDy, SCTAB nDz )
{
TablesType::iterator itr = maTables.begin(), itrEnd = maTables.end();
for (; itr != itrEnd; ++itr)
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 47d397c0d2b0..97604b507141 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -519,7 +519,7 @@ inline bool IsInBlock( const ScAddress& rPos, SCCOL nCol1,SCROW nRow1, SCCOL nCo
}
void ScDrawLayer::MoveCells( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
- SCsCOL nDx,SCsROW nDy, bool bUpdateNoteCaptionPos )
+ SCCOL nDx,SCROW nDy, bool bUpdateNoteCaptionPos )
{
SdrPage* pPage = GetPage(static_cast<sal_uInt16>(nTab));
OSL_ENSURE(pPage,"Page not found");
@@ -1138,7 +1138,7 @@ SdrUndoGroup* ScDrawLayer::GetCalcUndo()
}
void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
- SCsCOL nDx,SCsROW nDy, bool bInsDel, bool bUpdateNoteCaptionPos )
+ SCCOL nDx,SCROW nDy, bool bInsDel, bool bUpdateNoteCaptionPos )
{
OSL_ENSURE( pDoc, "ScDrawLayer::MoveArea without document" );
if ( !pDoc )
@@ -1156,11 +1156,11 @@ void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCR
Point aMove;
if (nDx > 0)
- for (SCsCOL s=0; s<nDx; s++)
- aMove.X() += pDoc->GetColWidth(s+(SCsCOL)nCol1,nTab);
+ for (SCCOL s=0; s<nDx; s++)
+ aMove.X() += pDoc->GetColWidth(s+nCol1,nTab);
else
- for (SCsCOL s=-1; s>=nDx; s--)
- aMove.X() -= pDoc->GetColWidth(s+(SCsCOL)nCol1,nTab);
+ for (SCCOL s=-1; s>=nDx; s--)
+ aMove.X() -= pDoc->GetColWidth(s+nCol1,nTab);
if (nDy > 0)
aMove.Y() += pDoc->GetRowHeight( nRow1, nRow1+nDy-1, nTab);
else
@@ -1442,9 +1442,9 @@ static bool lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const S
ScRange* pRange = rRanges[ i ];
if ( rSourceRange.In( *pRange ) )
{
- SCsCOL nDiffX = rDestPos.Col() - (SCsCOL)rSourceRange.aStart.Col();
- SCsROW nDiffY = rDestPos.Row() - (SCsROW)rSourceRange.aStart.Row();
- SCsTAB nDiffZ = rDestPos.Tab() - (SCsTAB)rSourceRange.aStart.Tab();
+ SCCOL nDiffX = rDestPos.Col() - rSourceRange.aStart.Col();
+ SCROW nDiffY = rDestPos.Row() - rSourceRange.aStart.Row();
+ SCTAB nDiffZ = rDestPos.Tab() - rSourceRange.aStart.Tab();
if (!pRange->Move( nDiffX, nDiffY, nDiffZ, aErrorRange))
{
assert(!"can't move range");
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index ad9e56b36113..e8c83e5d280d 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -48,10 +48,10 @@
// Similar as in output.cxx
-static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
+static void lcl_GetMergeRange( SCCOL nX, SCROW nY, SCSIZE nArrY,
ScDocument* pDoc, RowInfo* pRowInfo,
SCCOL nX1, SCROW nY1, SCCOL /* nX2 */, SCROW /* nY2 */, SCTAB nTab,
- SCsCOL& rStartX, SCsROW& rStartY, SCsCOL& rEndX, SCsROW& rEndY )
+ SCCOL& rStartX, SCROW& rStartY, SCCOL& rEndX, SCROW& rEndY )
{
CellInfo* pInfo = &pRowInfo[nArrY].pCellInfo[nX+1];
@@ -65,7 +65,7 @@ static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
while (bHOver) // nY constant
{
--rStartX;
- if (rStartX >= (SCsCOL) nX1 && !pDoc->ColHidden(rStartX, nTab, nullptr, &nLastCol))
+ if (rStartX >= nX1 && !pDoc->ColHidden(rStartX, nTab, nullptr, &nLastCol))
{
bHOver = pRowInfo[nArrY].pCellInfo[rStartX+1].bHOverlapped;
bVOver = pRowInfo[nArrY].pCellInfo[rStartX+1].bVOverlapped;
@@ -86,10 +86,10 @@ static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
if (nArrY>0)
--nArrY; // local copy !
- if (rStartX >= (SCsCOL) nX1 && rStartY >= (SCsROW) nY1 &&
+ if (rStartX >= nX1 && rStartY >= nY1 &&
!pDoc->ColHidden(rStartX, nTab, nullptr, &nLastCol) &&
!pDoc->RowHidden(rStartY, nTab, nullptr, &nLastRow) &&
- (SCsROW) pRowInfo[nArrY].nRowNo == rStartY)
+ pRowInfo[nArrY].nRowNo == rStartY)
{
bVOver = pRowInfo[nArrY].pCellInfo[rStartX+1].bVOverlapped;
}
@@ -102,10 +102,10 @@ static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY,
}
const ScMergeAttr* pMerge;
- if (rStartX >= (SCsCOL) nX1 && rStartY >= (SCsROW) nY1 &&
+ if (rStartX >= nX1 && rStartY >= nY1 &&
!pDoc->ColHidden(rStartX, nTab, nullptr, &nLastCol) &&
!pDoc->RowHidden(rStartY, nTab, nullptr, &nLastRow) &&
- (SCsROW) pRowInfo[nArrY].nRowNo == rStartY)
+ pRowInfo[nArrY].nRowNo == rStartY)
{
pMerge = static_cast<const ScMergeAttr*>( &pRowInfo[nArrY].pCellInfo[rStartX+1].pPatternAttr->
GetItem(ATTR_MERGE));
@@ -204,11 +204,11 @@ void initRowInfo(ScDocument* pDoc, RowInfo* pRowInfo, const SCSIZE nMaxRow,
{
sal_uInt16 nDocHeight = ScGlobal::nStdRowHeight;
SCROW nDocHeightEndRow = -1;
- for (SCsROW nSignedY=((SCsROW)nRow1)-1; nSignedY<=(SCsROW)rYExtra; nSignedY++)
+ for (SCROW nSignedY=nRow1-1; nSignedY<=rYExtra; nSignedY++)
{
SCROW nY;
if (nSignedY >= 0)
- nY = (SCROW) nSignedY;
+ nY = nSignedY;
else
nY = MAXROW+1; // invalid
@@ -247,7 +247,7 @@ void initRowInfo(ScDocument* pDoc, RowInfo* pRowInfo, const SCSIZE nMaxRow,
}
}
else
- if (nSignedY==(SCsROW) rYExtra) // hidden additional line?
+ if (nSignedY == rYExtra) // hidden additional line?
++rYExtra;
}
}
@@ -759,19 +759,19 @@ void ScDocument::FillInfo(
for (nArrRow=0; nArrRow<nArrCount; nArrRow++)
{
RowInfo* pThisRowInfo = &pRowInfo[nArrRow];
- SCsROW nSignedY = nArrRow ? pThisRowInfo->nRowNo : ((SCsROW)nRow1)-1;
+ SCROW nSignedY = nArrRow ? pThisRowInfo->nRowNo : nRow1-1;
for (SCCOL nArrCol=nCol1; nArrCol<=nCol2+2; nArrCol++) // 1 more left and right
{
- SCsCOL nSignedX = ((SCsCOL) nArrCol) - 1;
+ SCCOL nSignedX = nArrCol - 1;
CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrCol];
if (pInfo->bMerged || pInfo->bHOverlapped || pInfo->bVOverlapped)
{
- SCsCOL nStartX;
- SCsROW nStartY;
- SCsCOL nEndX;
- SCsROW nEndY;
+ SCCOL nStartX;
+ SCROW nStartY;
+ SCCOL nEndX;
+ SCROW nEndY;
lcl_GetMergeRange( nSignedX,nSignedY, nArrRow, this,pRowInfo, nCol1,nRow1,nCol2,nRow2,nTab,
nStartX,nStartY, nEndX,nEndY );
const ScPatternAttr* pStartPattern = GetPattern( nStartX,nStartY,nTab );
@@ -799,10 +799,10 @@ void ScDocument::FillInfo(
bool bCellMarked = false;
if (bPaintMarks)
- bCellMarked = ( nStartX >= (SCsCOL) nBlockStartX
- && nStartX <= (SCsCOL) nBlockEndX
- && nStartY >= (SCsROW) nBlockStartY
- && nStartY <= (SCsROW) nBlockEndY );
+ bCellMarked = ( nStartX >= nBlockStartX
+ && nStartX <= nBlockEndX
+ && nStartY >= nBlockStartY
+ && nStartY <= nBlockEndY );
if (pMarkData && pMarkData->IsMultiMarked() && !bCellMarked)
{
ScMarkArray aThisMarkArr(pMarkData->GetMarkArray( nStartX ));
@@ -836,8 +836,8 @@ void ScDocument::FillInfo(
{
// or test on != eLoc
- SCsCOL nDxPos = 1;
- SCsCOL nDxNeg = -1;
+ SCCOL nDxPos = 1;
+ SCCOL nDxNeg = -1;
while ( nArrCol+nDxPos < nCol2+2 && pRowInfo[0].pCellInfo[nArrCol+nDxPos].nWidth == 0 )
++nDxPos;
@@ -1009,17 +1009,17 @@ void ScDocument::FillInfo(
SCROW nCurrDocRow = static_cast< SCROW >( (nCellInfoY > 0) ? rThisRowInfo.nRowNo : (nRow1 - 1) );
// find entire merged range in document, returns signed document coordinates
- SCsCOL nFirstRealDocColS, nLastRealDocColS;
- SCsROW nFirstRealDocRowS, nLastRealDocRowS;
- lcl_GetMergeRange( static_cast< SCsCOL >( nCurrDocCol ), static_cast< SCsROW >( nCurrDocRow ),
+ SCCOL nFirstRealDocColS, nLastRealDocColS;
+ SCROW nFirstRealDocRowS, nLastRealDocRowS;
+ lcl_GetMergeRange( nCurrDocCol, nCurrDocRow,
nCellInfoY, this, pRowInfo, nCol1,nRow1,nCol2,nRow2,nTab,
nFirstRealDocColS, nFirstRealDocRowS, nLastRealDocColS, nLastRealDocRowS );
// *complete* merged range in document coordinates
- SCCOL nFirstRealDocCol = static_cast< SCCOL >( nFirstRealDocColS );
- SCROW nFirstRealDocRow = static_cast< SCROW >( nFirstRealDocRowS );
- SCCOL nLastRealDocCol = static_cast< SCCOL >( nLastRealDocColS );
- SCROW nLastRealDocRow = static_cast< SCROW >( nLastRealDocRowS );
+ SCCOL nFirstRealDocCol = nFirstRealDocColS;
+ SCROW nFirstRealDocRow = nFirstRealDocRowS;
+ SCCOL nLastRealDocCol = nLastRealDocColS;
+ SCROW nLastRealDocRow = nLastRealDocRowS;
// first visible column (nX1-1 is first processed document column)
SCCOL nFirstDocCol = (nCol1 > 0) ? ::std::max< SCCOL >( nFirstRealDocCol, nCol1 - 1 ) : nFirstRealDocCol;
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 89b8d4618f35..b23814f77047 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2733,8 +2733,8 @@ sc::MatrixEdge ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) const
}
}
// here we are, healthy and clean, somewhere in between
- SCsCOL dC = aPos.Col() - aOrg.Col();
- SCsROW dR = aPos.Row() - aOrg.Row();
+ SCCOL dC = aPos.Col() - aOrg.Col();
+ SCROW dR = aPos.Row() - aOrg.Row();
sc::MatrixEdge nEdges = sc::MatrixEdge::Nothing;
if ( dC >= 0 && dR >= 0 && dC < nC && dR < nR )
{
@@ -3615,9 +3615,9 @@ void ScFormulaCell::UpdateTranspose( const ScRange& rSource, const ScAddress& rD
if ( aDestRange.In( aOldPos ) )
{
// Count back Positions
- SCsCOL nRelPosX = aOldPos.Col();
- SCsROW nRelPosY = aOldPos.Row();
- SCsTAB nRelPosZ = aOldPos.Tab();
+ SCCOL nRelPosX = aOldPos.Col();
+ SCROW nRelPosY = aOldPos.Row();
+ SCTAB nRelPosZ = aOldPos.Tab();
ScRefUpdate::DoTranspose( nRelPosX, nRelPosY, nRelPosZ, pDocument, aDestRange, rSource.aStart );
aOldPos.Set( nRelPosX, nRelPosY, nRelPosZ );
bPosChanged = true;
diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx
index fb4cef0e9b7e..b95cf07c9e6d 100644
--- a/sc/source/core/data/markarr.cxx
+++ b/sc/source/core/data/markarr.cxx
@@ -312,12 +312,12 @@ void ScMarkArray::CopyMarksTo( ScMarkArray& rDestMarkArray ) const
rDestMarkArray.nCount = rDestMarkArray.nLimit = nCount;
}
-SCsROW ScMarkArray::GetNextMarked( SCsROW nRow, bool bUp ) const
+SCROW ScMarkArray::GetNextMarked( SCROW nRow, bool bUp ) const
{
if (!pData)
const_cast<ScMarkArray*>(this)->Reset(); // create pData for further processing
- SCsROW nRet = nRow;
+ SCROW nRet = nRow;
if (ValidRow(nRow))
{
SCSIZE nIndex;
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index a4db65159016..e2e89e829d09 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -504,7 +504,7 @@ bool ScMarkData::IsAllMarked( const ScRange& rRange ) const
return bOk;
}
-SCsROW ScMarkData::GetNextMarked( SCCOL nCol, SCsROW nRow, bool bUp ) const
+SCROW ScMarkData::GetNextMarked( SCCOL nCol, SCROW nRow, bool bUp ) const
{
if ( !bMultiMarked )
return nRow;
diff --git a/sc/source/core/data/markmulti.cxx b/sc/source/core/data/markmulti.cxx
index 04619862b689..217753b1d5b6 100644
--- a/sc/source/core/data/markmulti.cxx
+++ b/sc/source/core/data/markmulti.cxx
@@ -173,13 +173,13 @@ bool ScMultiSel::HasEqualRowsMarked( SCCOL nCol1, SCCOL nCol2 ) const
return true;
}
-SCsROW ScMultiSel::GetNextMarked( SCCOL nCol, SCsROW nRow, bool bUp ) const
+SCROW ScMultiSel::GetNextMarked( SCCOL nCol, SCROW nRow, bool bUp ) const
{
MapType::const_iterator aIter = aMultiSelContainer.find( nCol );
if ( aIter == aMultiSelContainer.end() )
return aRowSel.GetNextMarked( nRow, bUp );
- SCsROW nRow1, nRow2;
+ SCROW nRow1, nRow2;
nRow1 = aRowSel.GetNextMarked( nRow, bUp );
nRow2 = aIter->second.GetNextMarked( nRow, bUp );
if ( nRow1 == nRow2 )
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index 3a4cdc852a67..d7be0d322640 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -50,7 +50,7 @@ SCCOLROW ScOutlineEntry::GetEnd() const
return nStart+nSize-1;
}
-void ScOutlineEntry::Move( SCsCOLROW nDelta )
+void ScOutlineEntry::Move( SCCOLROW nDelta )
{
SCCOLROW nNewPos = nStart + nDelta;
if (nNewPos<0)
@@ -669,7 +669,7 @@ void ScOutlineArray::InsertSpace(SCCOLROW nStartPos, SCSIZE nSize)
while ((pEntry = aIter.GetNext()) != nullptr)
{
if ( pEntry->GetStart() >= nStartPos )
- pEntry->Move(static_cast<SCsCOLROW>(nSize));
+ pEntry->Move(static_cast<SCCOLROW>(nSize));
else
{
SCCOLROW nEnd = pEntry->GetEnd();
@@ -702,7 +702,7 @@ bool ScOutlineArray::DeleteSpace(SCCOLROW nStartPos, SCSIZE nSize)
if ( nEntryEnd >= nStartPos )
{
if ( nEntryStart > nEndPos ) // Right
- pEntry->Move(-(static_cast<SCsCOLROW>(nSize)));
+ pEntry->Move(-(static_cast<SCCOLROW>(nSize)));
else if ( nEntryStart < nStartPos && nEntryEnd >= nEndPos ) // Outside
pEntry->SetSize( nEntrySize-nSize );
else
diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
index 38439e5ef062..3eb29a305641 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -221,8 +221,8 @@ void ScSortParam::MoveToDest()
{
if (!bInplace)
{
- SCsCOL nDifX = ((SCsCOL) nDestCol) - ((SCsCOL) nCol1);
- SCsROW nDifY = ((SCsROW) nDestRow) - ((SCsROW) nRow1);
+ SCCOL nDifX = nDestCol - nCol1;
+ SCROW nDifY = nDestRow - nRow1;
nCol1 = sal::static_int_cast<SCCOL>( nCol1 + nDifX );
nRow1 = sal::static_int_cast<SCROW>( nRow1 + nDifY );
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 96737e18a512..e527bb82ec5e 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -1079,7 +1079,7 @@ SCSIZE ScTable::GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
else if (eDir == DIR_RIGHT)
{
nCol = nEndCol;
- while (((SCsCOL)nCol >= (SCsCOL)nStartCol) &&
+ while ((nCol >= nStartCol) &&
aCol[nCol].IsEmptyBlock(nStartRow, nEndRow))
{
nCount++;
@@ -1298,18 +1298,18 @@ bool ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
return true;
}
-void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
+void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCCOL nMovX, SCROW nMovY,
bool bMarked, bool bUnprotected, const ScMarkData& rMark ) const
{
if (bUnprotected && !IsProtected()) // Is sheet really protected?
bUnprotected = false;
sal_uInt16 nWrap = 0;
- SCsCOL nCol = rCol;
- SCsROW nRow = rRow;
+ SCCOL nCol = rCol;
+ SCROW nRow = rRow;
- nCol = sal::static_int_cast<SCsCOL>( nCol + nMovX );
- nRow = sal::static_int_cast<SCsROW>( nRow + nMovY );
+ nCol = sal::static_int_cast<SCCOL>( nCol + nMovX );
+ nRow = sal::static_int_cast<SCROW>( nRow + nMovY );
OSL_ENSURE( !nMovY || !bUnprotected,
"GetNextPos with bUnprotected horizontal not implemented" );
@@ -1328,9 +1328,9 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
while ( nRow < 0 || nRow > MAXROW )
{
- nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) );
+ nCol = sal::static_int_cast<SCCOL>( nCol + static_cast<SCCOL>(nMovY) );
while ( ValidCol(nCol) && ColHidden(nCol) )
- nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) ); // skip hidden rows (see above)
+ nCol = sal::static_int_cast<SCCOL>( nCol + static_cast<SCCOL>(nMovY) ); // skip hidden rows (see above)
if (nCol < 0)
{
nCol = MAXCOL;
@@ -1378,7 +1378,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
if ( !ValidNextPos(nCol, nRow, rMark, bMarked, bUnprotected) )
{
- std::unique_ptr<SCsROW[]> pNextRows(new SCsROW[MAXCOL+1]);
+ std::unique_ptr<SCROW[]> pNextRows(new SCROW[MAXCOL+1]);
SCCOL i;
if ( nMovX > 0 ) // forward
@@ -1387,14 +1387,14 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
pNextRows[i] = (i<nCol) ? (nRow+1) : nRow;
do
{
- SCsROW nNextRow = pNextRows[nCol] + 1;
+ SCROW nNextRow = pNextRows[nCol] + 1;
if ( bMarked )
nNextRow = rMark.GetNextMarked( nCol, nNextRow, false );
if ( bUnprotected )
nNextRow = aCol[nCol].GetNextUnprotected( nNextRow, false );
pNextRows[nCol] = nNextRow;
- SCsROW nMinRow = MAXROW+1;
+ SCROW nMinRow = MAXROW+1;
for (i=0; i<=MAXCOL; i++)
if (pNextRows[i] < nMinRow) // when two equal on the left
{
@@ -1420,14 +1420,14 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
pNextRows[i] = (i>nCol) ? (nRow-1) : nRow;
do
{
- SCsROW nNextRow = pNextRows[nCol] - 1;
+ SCROW nNextRow = pNextRows[nCol] - 1;
if ( bMarked )
nNextRow = rMark.GetNextMarked( nCol, nNextRow, true );
if ( bUnprotected )
nNextRow = aCol[nCol].GetNextUnprotected( nNextRow, true );
pNextRows[nCol] = nNextRow;
- SCsROW nMaxRow = -1;
+ SCROW nMaxRow = -1;
for (i=0; i<=MAXCOL; i++)
if (pNextRows[i] >= nMaxRow) // when two equal on the right
{
@@ -1469,7 +1469,7 @@ bool ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMa
ScMarkArray aArray( rMark.GetMarkArray( rCol ) );
while ( rRow <= MAXROW )
{
- SCROW nStart = (SCROW) aArray.GetNextMarked( (SCsROW) rRow, false );
+ SCROW nStart = aArray.GetNextMarked( rRow, false );
if ( nStart <= MAXROW )
{
SCROW nEnd = aArray.GetMarkEnd( nStart, false );
@@ -1512,7 +1512,7 @@ bool ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMa
void ScTable::UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bUpdateNoteCaptionPos )
+ SCCOL nDx, SCROW nDy, SCTAB nDz, bool bUpdateNoteCaptionPos )
{
if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // only within the table
{
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 6c770797f44c..963e150ade9a 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -575,7 +575,7 @@ void ScTable::CopyCellToDocument(SCCOL nSrcCol, SCROW nSrcRow, SCCOL nDestCol, S
}
void ScTable::CopyConditionalFormat( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- SCsCOL nDx, SCsROW nDy, ScTable* pTable)
+ SCCOL nDx, SCROW nDy, ScTable* pTable)
{
ScRange aOldRange( nCol1 - nDx, nRow1 - nDy, pTable->nTab, nCol2 - nDx, nRow2 - nDy, pTable->nTab);
ScRange aNewRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab );
@@ -647,7 +647,7 @@ bool ScTable::InitColumnBlockPosition( sc::ColumnBlockPosition& rBlockPos, SCCOL
void ScTable::CopyFromClip(
sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- SCsCOL nDx, SCsROW nDy, ScTable* pTable )
+ SCCOL nDx, SCROW nDy, ScTable* pTable )
{
if (nCol2 > aCol.size() - 1)
nCol2 = aCol.size() - 1;
@@ -901,11 +901,11 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
const ScMergeAttr& rOldMerge = static_cast<const ScMergeAttr&>(rSet.Get(ATTR_MERGE));
if (rOldMerge.IsMerged())
rNewSet.Put( ScMergeAttr( std::min(
- static_cast<SCsCOL>(rOldMerge.GetRowMerge()),
- static_cast<SCsCOL>(MAXCOL+1 - (nAttrRow2-nRow1))),
+ static_cast<SCCOL>(rOldMerge.GetRowMerge()),
+ static_cast<SCCOL>(MAXCOL+1 - (nAttrRow2-nRow1))),
std::min(
- static_cast<SCsROW>(rOldMerge.GetColMerge()),
- static_cast<SCsROW>(MAXROW+1 - (nCol-nCol1)))));
+ static_cast<SCROW>(rOldMerge.GetColMerge()),
+ static_cast<SCROW>(MAXROW+1 - (nCol-nCol1)))));
const ScMergeFlagAttr& rOldFlag = static_cast<const ScMergeFlagAttr&>(rSet.Get(ATTR_MERGE_FLAG));
if (rOldFlag.IsOverlapped())
{
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 2044a33b7708..9f63f8f2ff10 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1637,7 +1637,7 @@ short ScTable::Compare( ScSortInfoArray* pArray, SCCOLROW nIndex1, SCCOLROW nInd
return nRes;
}
-void ScTable::QuickSort( ScSortInfoArray* pArray, SCsCOLROW nLo, SCsCOLROW nHi )
+void ScTable::QuickSort( ScSortInfoArray* pArray, SCCOLROW nLo, SCCOLROW nHi )
{
if ((nHi - nLo) == 1)
{
@@ -1646,8 +1646,8 @@ void ScTable::QuickSort( ScSortInfoArray* pArray, SCsCOLROW nLo, SCsCOLROW nHi )
}
else
{
- SCsCOLROW ni = nLo;
- SCsCOLROW nj = nHi;
+ SCCOLROW ni = nLo;
+ SCCOLROW nj = nHi;
do
{
while ((ni <= nHi) && (Compare(pArray, ni, nLo)) < 0)
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index b442d5025b43..da5ba5f8e4e2 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -334,12 +334,12 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
if (rSearchItem.GetRowDirection())
{
nCol--;
- while (!bFound && ((SCsROW)nRow >= 0))
+ while (!bFound && (nRow >= 0))
{
if (bSkipFiltered)
SkipFilteredRows(nRow, nLastNonFilteredRow, false);
- while (!bFound && ((SCsCOL)nCol >= 0))
+ while (!bFound && (nCol >= 0))
{
bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
if (!bFound)
@@ -348,7 +348,7 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
do
{
nCol--;
- if ((SCsCOL)nCol >= 0)
+ if (nCol >= 0)
{
if (bSearchNotes)
bIsEmpty = !aCol[nCol].HasCellNotes();
@@ -358,7 +358,7 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
else
bIsEmpty = true;
}
- while (((SCsCOL)nCol >= 0) && bIsEmpty);
+ while ((nCol >= 0) && bIsEmpty);
}
}
if (!bFound)
@@ -371,9 +371,9 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
else
{
nRow--;
- while (!bFound && ((SCsCOL)nCol >= 0))
+ while (!bFound && (nCol >= 0))
{
- while (!bFound && ((SCsROW)nRow >= 0))
+ while (!bFound && (nRow >= 0))
{
if (bSkipFiltered)
SkipFilteredRows(nRow, nLastNonFilteredRow, false);
@@ -402,7 +402,7 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
do
{
nCol--;
- if ((SCsCOL)nCol >= 0)
+ if (nCol >= 0)
{
if (bSearchNotes)
bIsEmpty = !aCol[nCol].HasCellNotes();
@@ -412,7 +412,7 @@ bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
else
bIsEmpty = true;
}
- while (((SCsCOL)nCol >= 0) && bIsEmpty);
+ while ((nCol >= 0) && bIsEmpty);
}
}
}
@@ -596,8 +596,8 @@ bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
pDocument->GetStyleSheetPool()->Find(
rSearchItem.GetSearchString(), SfxStyleFamily::Para ));
- SCsCOL nCol = rCol;
- SCsROW nRow = rRow;
+ SCCOL nCol = rCol;
+ SCROW nRow = rRow;
bool bFound = false;
bool bSelect = rSearchItem.GetSelection();
@@ -615,11 +615,11 @@ bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
nRow += nAdd;
do
{
- SCsROW nNextRow = aCol[nCol].SearchStyle( nRow, pSearchStyle, bBack, bSelect, rMark );
+ SCROW nNextRow = aCol[nCol].SearchStyle( nRow, pSearchStyle, bBack, bSelect, rMark );
if (!ValidRow(nNextRow))
{
nRow = bBack ? MAXROW : 0;
- nCol = sal::static_int_cast<SCsCOL>( nCol + nAdd );
+ nCol = sal::static_int_cast<SCCOL>( nCol + nAdd );
}
else
{
@@ -631,12 +631,12 @@ bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
}
else // by column
{
- SCsCOL aColSize = aCol.size();
- std::vector< SCsROW > nNextRows ( aColSize );
- SCsCOL i;
+ SCCOL aColSize = aCol.size();
+ std::vector< SCROW > nNextRows ( aColSize );
+ SCCOL i;
for (i=0; i < aColSize; ++i)
{
- SCsROW nSRow = nRow;
+ SCROW nSRow = nRow;
if (bBack)
{
if (i>=nCol) --nSRow;
@@ -673,8 +673,8 @@ bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
if (bFound)
{
- rCol = (SCCOL) nCol;
- rRow = (SCROW) nRow;
+ rCol = nCol;
+ rRow = nRow;
}
return bFound;
}
@@ -719,8 +719,8 @@ bool ScTable::SearchAllStyle(
for (SCCOL i=0; i < aCol.size(); ++i)
{
bool bFound = true;
- SCsROW nRow = 0;
- SCsROW nEndRow;
+ SCROW nRow = 0;
+ SCROW nEndRow;
while (bFound && nRow <= MAXROW)
{
bFound = aCol[i].SearchStyleRange( nRow, nEndRow, pSearchStyle, bBack, bSelect, rMark );
@@ -728,7 +728,7 @@ bool ScTable::SearchAllStyle(
{
if (nEndRow<nRow)
{
- SCsROW nTemp = nRow;
+ SCROW nTemp = nRow;
nRow = nEndRow;
nEndRow = nTemp;
}
diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx
index c55024be774a..a6f100b4421b 100644
--- a/sc/source/core/data/tabprotection.cxx
+++ b/sc/source/core/data/tabprotection.cxx
@@ -114,7 +114,7 @@ public:
void setEnhancedProtection( const ::std::vector< ScEnhancedProtection > & rProt );
const ::std::vector< ScEnhancedProtection > & getEnhancedProtection() const { return maEnhancedProtection;}
- bool updateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ bool updateReference( UpdateRefMode, ScDocument*, const ScRange& rWhere, SCCOL nDx, SCROW nDy, SCTAB nDz );
bool isBlockEditable( const ScRange& rRange ) const;
bool isSelectionEditable( const ScRangeList& rRangeList ) const;
@@ -351,7 +351,7 @@ void ScTableProtectionImpl::setEnhancedProtection( const ::std::vector< ScEnhanc
}
bool ScTableProtectionImpl::updateReference( UpdateRefMode eMode, ScDocument* pDoc,
- const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ const ScRange& rWhere, SCCOL nDx, SCROW nDy, SCTAB nDz )
{
bool bChanged = false;
for (::std::vector<ScEnhancedProtection>::iterator it(maEnhancedProtection.begin());
@@ -615,7 +615,7 @@ const ::std::vector< ScEnhancedProtection > & ScTableProtection::getEnhancedProt
}
bool ScTableProtection::updateReference( UpdateRefMode eMode, ScDocument* pDoc, const ScRange& rWhere,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ SCCOL nDx, SCROW nDy, SCTAB nDz )
{
return mpImpl->updateReference( eMode, pDoc, rWhere, nDx, nDy, nDz);
}
diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx
index b55c478656e7..abffcb51a042 100644
--- a/sc/source/core/inc/bcaslot.hxx
+++ b/sc/source/core/inc/bcaslot.hxx
@@ -216,7 +216,7 @@ public:
void DelBroadcastAreasInRange( const ScRange& rRange );
void UpdateRemove( UpdateRefMode eUpdateRefMode,
const ScRange& rRange,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ SCCOL nDx, SCROW nDy, SCTAB nDz );
void UpdateRemoveArea( ScBroadcastArea* pArea );
void UpdateInsert( ScBroadcastArea* pArea );
@@ -316,7 +316,7 @@ public:
void DelBroadcastAreasInRange( const ScRange& rRange );
void UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode,
const ScRange& rRange,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+ SCCOL nDx, SCROW nDy, SCTAB nDz );
void EnterBulkBroadcast();
void LeaveBulkBroadcast( SfxHintId nHintId );
bool InsertBulkArea( const ScBroadcastArea* p );
diff --git a/sc/source/core/inc/refupdat.hxx b/sc/source/core/inc/refupdat.hxx
index 8bc1ab6d7253..f58bef7b0ae3 100644
--- a/sc/source/core/inc/refupdat.hxx
+++ b/sc/source/core/inc/refupdat.hxx
@@ -47,7 +47,7 @@ public:
( ScDocument* pDoc, UpdateRefMode eUpdateRefMode,
SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
+ SCCOL nDx, SCROW nDy, SCTAB nDz,
SCCOL& theCol1, SCROW& theRow1, SCTAB& theTab1,
SCCOL& theCol2, SCROW& theRow2, SCTAB& theTab2 );
@@ -62,7 +62,7 @@ public:
static ScRefUpdateRes UpdateTranspose(
ScDocument* pDoc, const ScRange& rSource, const ScAddress& rDest, ScRange& rRef );
- static void DoTranspose( SCsCOL& rCol, SCsROW& rRow, SCsTAB& rTab, ScDocument* pDoc,
+ static void DoTranspose( SCCOL& rCol, SCROW& rRow, SCTAB& rTab, ScDocument* pDoc,
const ScRange& rSource, const ScAddress& rDest );
static ScRefUpdateRes UpdateGrow(
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 72b1862f221d..c8e617dede94 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -263,7 +263,7 @@ static bool lcl_ScRange_External_TabSpan(
return true;
}
- SCsTAB nSpan = pRefMgr->getCachedTabSpan( nFileId, rStartTabName, rEndTabName);
+ SCTAB nSpan = pRefMgr->getCachedTabSpan( nFileId, rStartTabName, rEndTabName);
if (nSpan == -1)
rFlags &= ~ScRefFlags(ScRefFlags::TAB_VALID | ScRefFlags::TAB2_VALID);
else if (nSpan == 0)
@@ -2299,9 +2299,9 @@ OUString ScRange::Format( ScRefFlags nFlags, const ScDocument* pDoc,
return r.makeStringAndClear();
}
-bool ScAddress::Move( SCsCOL dx, SCsROW dy, SCsTAB dz, ScAddress& rErrorPos, ScDocument* pDoc )
+bool ScAddress::Move( SCCOL dx, SCROW dy, SCTAB dz, ScAddress& rErrorPos, ScDocument* pDoc )
{
- SCsTAB nMaxTab = pDoc ? pDoc->GetTableCount() : MAXTAB;
+ SCTAB nMaxTab = pDoc ? pDoc->GetTableCount() : MAXTAB;
dx = Col() + dx;
dy = Row() + dy;
dz = Tab() + dz;
@@ -2345,7 +2345,7 @@ bool ScAddress::Move( SCsCOL dx, SCsROW dy, SCsTAB dz, ScAddress& rErrorPos, ScD
return bValid;
}
-bool ScRange::Move( SCsCOL dx, SCsROW dy, SCsTAB dz, ScRange& rErrorRange, ScDocument* pDoc )
+bool ScRange::Move( SCCOL dx, SCROW dy, SCTAB dz, ScRange& rErrorRange, ScDocument* pDoc )
{
if (dy && aStart.Row() == 0 && aEnd.Row() == MAXROW)
dy = 0; // Entire column not to be moved.
@@ -2356,7 +2356,7 @@ bool ScRange::Move( SCsCOL dx, SCsROW dy, SCsTAB dz, ScRange& rErrorRange, ScDoc
return b;
}
-bool ScRange::MoveSticky( SCsCOL dx, SCsROW dy, SCsTAB dz, ScRange& rErrorRange )
+bool ScRange::MoveSticky( SCCOL dx, SCROW dy, SCTAB dz, ScRange& rErrorRange )
{
bool bColRange = (aStart.Col() < aEnd.Col());
bool bRowRange = (aStart.Row() < aEnd.Row());
@@ -2385,7 +2385,7 @@ bool ScRange::MoveSticky( SCsCOL dx, SCsROW dy, SCsTAB dz, ScRange& rErrorRange
return b1 && b2;
}
-void ScRange::IncEndColSticky( SCsCOL nDelta )
+void ScRange::IncEndColSticky( SCCOL nDelta )
{
SCCOL nCol = aEnd.Col();
if (aStart.Col() >= nCol)
@@ -2405,7 +2405,7 @@ void ScRange::IncEndColSticky( SCsCOL nDelta )
aEnd.IncCol( nDelta); // was greater than MAXCOL, caller should know..
}
-void ScRange::IncEndRowSticky( SCsROW nDelta )
+void ScRange::IncEndRowSticky( SCROW nDelta )
{
SCROW nRow = aEnd.Row();
if (aStart.Row() >= nRow)
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 28557677c2a5..0b620024dddd 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -589,7 +589,7 @@ void ScChangeAction::SetRejected()
}
void ScChangeAction::RejectRestoreContents( ScChangeTrack* pTrack,
- SCsCOL nDx, SCsROW nDy )
+ SCCOL nDx, SCROW nDy )
{
// Construct list of Contents
ScChangeActionCellListEntry* pListContents = nullptr;
@@ -768,7 +768,7 @@ bool ScChangeActionIns::Reject( ScDocument* pDoc )
// ScChangeActionDel
ScChangeActionDel::ScChangeActionDel( const ScRange& rRange,
- SCsCOL nDxP, SCsROW nDyP, ScChangeTrack* pTrackP )
+ SCCOL nDxP, SCROW nDyP, ScChangeTrack* pTrackP )
:
ScChangeAction( SC_CAT_NONE, rRange ),
pTrack( pTrackP ),
@@ -808,7 +808,7 @@ ScChangeActionDel::ScChangeActionDel(
const sal_uLong nActionNumber, const ScChangeActionState eStateP,
const sal_uLong nRejectingNumber, const ScBigRange& aBigRangeP,
const OUString& aUserP, const DateTime& aDateTimeP, const OUString &sComment,
- const ScChangeActionType eTypeP, const SCsCOLROW nD, ScChangeTrack* pTrackP) : // which of nDx and nDy is set depends on the type
+ const ScChangeActionType eTypeP, const SCCOLROW nD, ScChangeTrack* pTrackP) : // which of nDx and nDy is set depends on the type
ScChangeAction(eTypeP, aBigRangeP, nActionNumber, nRejectingNumber, eStateP, aDateTimeP, aUserP, sComment),
pTrack( pTrackP ),
pFirstCell( nullptr ),
@@ -819,9 +819,9 @@ ScChangeActionDel::ScChangeActionDel(
nDy( 0 )
{
if (eType == SC_CAT_DELETE_COLS)
- nDx = static_cast<SCsCOL>(nD);
+ nDx = static_cast<SCCOL>(nD);
else if (eType == SC_CAT_DELETE_ROWS)
- nDy = static_cast<SCsROW>(nD);
+ nDy = static_cast<SCROW>(nD);
}
ScChangeActionDel::~ScChangeActionDel()
@@ -1802,20 +1802,20 @@ void ScChangeActionContent::GetFormulaString(
}
void ScChangeActionContent::PutOldValueToDoc( ScDocument* pDoc,
- SCsCOL nDx, SCsROW nDy ) const
+ SCCOL nDx, SCROW nDy ) const
{
PutValueToDoc(maOldCell, maOldValue, pDoc, nDx, nDy);
}
void ScChangeActionContent::PutNewValueToDoc( ScDocument* pDoc,
- SCsCOL nDx, SCsROW nDy ) const
+ SCCOL nDx, SCROW nDy ) const
{
PutValueToDoc(maNewCell, maNewValue, pDoc, nDx, nDy);
}
void ScChangeActionContent::PutValueToDoc(
const ScCellValue& rCell, const OUString& rValue, ScDocument* pDoc,
- SCsCOL nDx, SCsROW nDy ) const
+ SCCOL nDx, SCROW nDy ) const
{
ScAddress aPos( aBigRange.aStart.MakeAddress() );
if ( nDx )
@@ -2468,7 +2468,7 @@ void ScChangeTrack::Append( ScChangeAction* pAppend )
}
void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
- ScDocument* pRefDoc, sal_uLong& nStartAction, sal_uLong& nEndAction, SCsTAB nDz )
+ ScDocument* pRefDoc, sal_uLong& nStartAction, sal_uLong& nEndAction, SCTAB nDz )
{
nStartAction = GetActionMax() + 1;
AppendDeleteRange( rRange, pRefDoc, nDz, 0 );
@@ -2476,7 +2476,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
}
void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
- ScDocument* pRefDoc, SCsTAB nDz, sal_uLong nRejectingInsert )
+ ScDocument* pRefDoc, SCTAB nDz, sal_uLong nRejectingInsert )
{
SetInDeleteRange( rRange );
StartBlockModify( SC_CTM_APPEND, GetActionMax() + 1 );
@@ -2548,7 +2548,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange,
}
void ScChangeTrack::AppendOneDeleteRange( const ScRange& rOrgRange,
- ScDocument* pRefDoc, SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
+ ScDocument* pRefDoc, SCCOL nDx, SCROW nDy, SCTAB nDz,
sal_uLong nRejectingInsert )
{
ScRange aTrackRange( rOrgRange );
@@ -2582,7 +2582,7 @@ void ScChangeTrack::AppendOneDeleteRange( const ScRange& rOrgRange,
}
void ScChangeTrack::LookUpContents( const ScRange& rOrgRange,
- ScDocument* pRefDoc, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ ScDocument* pRefDoc, SCCOL nDx, SCROW nDy, SCTAB nDz )
{
if (!pRefDoc)
return;
@@ -4496,15 +4496,15 @@ ScChangeTrack* ScChangeTrack::Clone( ScDocument* pDocument ) const
{
const ScChangeActionDel& rDelete = dynamic_cast<const ScChangeActionDel&>(*pAction);
- SCsCOLROW nD = 0;
+ SCCOLROW nD = 0;
ScChangeActionType eType = pAction->GetType();
if ( eType == SC_CAT_DELETE_COLS )
{
- nD = static_cast< SCsCOLROW >( rDelete.GetDx() );
+ nD = static_cast< SCCOLROW >( rDelete.GetDx() );
}
else if ( eType == SC_CAT_DELETE_ROWS )
{
- nD = static_cast< SCsCOLROW >( rDelete.GetDy() );
+ nD = static_cast< SCCOLROW >( rDelete.GetDy() );
}
pClonedAction = new ScChangeActionDel(
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index e8af73691b29..78d4f37afa35 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -668,7 +668,7 @@ static OUString lcl_makeExternalNameStr(const OUString& rFile, const OUString& r
static bool lcl_getLastTabName( OUString& rTabName2, const OUString& rTabName1,
const vector<OUString>& rTabNames, const ScRange& rRef )
{
- SCsTAB nTabSpan = rRef.aEnd.Tab() - rRef.aStart.Tab();
+ SCTAB nTabSpan = rRef.aEnd.Tab() - rRef.aStart.Tab();
if (nTabSpan > 0)
{
size_t nCount = rTabNames.size();
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 29dfd5472803..1f2e7703f271 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -571,7 +571,7 @@ void ScDBData::UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos)
void ScDBData::UpdateReference(ScDocument* pDoc, UpdateRefMode eUpdateRefMode,
SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz)
+ SCCOL nDx, SCROW nDy, SCTAB nDz)
{
SCCOL theCol1;
SCROW theRow1;
@@ -957,15 +957,15 @@ class UpdateRefFunc : public unary_function<std::unique_ptr<ScDBData>, void>
SCCOL mnCol2;
SCROW mnRow2;
SCTAB mnTab2;
- SCsCOL mnDx;
- SCsROW mnDy;
- SCsTAB mnDz;
+ SCCOL mnDx;
+ SCROW mnDy;
+ SCTAB mnDz;
public:
UpdateRefFunc(ScDocument* pDoc, UpdateRefMode eMode,
SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz) :
+ SCCOL nDx, SCROW nDy, SCTAB nDz) :
mpDoc(pDoc), meMode(eMode),
mnCol1(nCol1), mnRow1(nRow1), mnTab1(nTab1),
mnCol2(nCol2), mnRow2(nRow2), mnTab2(nTab2),
@@ -1430,7 +1430,7 @@ void ScDBCollection::DeleteOnTab( SCTAB nTab )
void ScDBCollection::UpdateReference(UpdateRefMode eUpdateRefMode,
SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ SCCOL nDx, SCROW nDy, SCTAB nDz )
{
ScDBData* pData = pDoc->GetAnonymousDBData(nTab1);
if (pData)
diff --git a/sc/source/core/tool/detdata.cxx b/sc/source/core/tool/detdata.cxx
index 3b8bad0a59bd..1927539878c9 100644
--- a/sc/source/core/tool/detdata.cxx
+++ b/sc/source/core/tool/detdata.cxx
@@ -44,7 +44,7 @@ void ScDetOpList::DeleteOnTab( SCTAB nTab )
}
void ScDetOpList::UpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMode,
- const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ const ScRange& rRange, SCCOL nDx, SCROW nDy, SCTAB nDz )
{
for (ScDetOpDataVector::iterator it = aDetOpDataVector.begin(); it != aDetOpDataVector.end(); ++it )
{
diff --git a/sc/source/core/tool/hints.cxx b/sc/source/core/tool/hints.cxx
index b69fd76ffc07..581a68771a02 100644
--- a/sc/source/core/tool/hints.cxx
+++ b/sc/source/core/tool/hints.cxx
@@ -35,7 +35,7 @@ ScPaintHint::~ScPaintHint()
// ScUpdateRefHint - update references
ScUpdateRefHint::ScUpdateRefHint( UpdateRefMode eMode, const ScRange& rR,
- SCsCOL nX, SCsROW nY, SCsTAB nZ ) :
+ SCCOL nX, SCROW nY, SCTAB nZ ) :
eUpdateRefMode( eMode ),
aRange( rR ),
nDx( nX ),
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index e5ba5ede6b0c..9cc318b26a26 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -5253,8 +5253,8 @@ void ScInterpreter::IterateParametersIf( ScIterFuncIf eFunc )
rParam.nCol1 = nCol1;
rParam.nCol2 = nCol2;
rEntry.nField = nCol1;
- SCsCOL nColDiff = nCol3 - nCol1;
- SCsROW nRowDiff = nRow3 - nRow1;
+ SCCOL nColDiff = nCol3 - nCol1;
+ SCROW nRowDiff = nRow3 - nRow1;
if (pQueryMatrix)
{
// Never case-sensitive.
@@ -5810,8 +5810,8 @@ void ScInterpreter::IterateParametersIfs( sc::ParamIfsResult& rRes )
rParam.nCol1 = nCol1;
rParam.nCol2 = nCol2;
rEntry.nField = nCol1;
- SCsCOL nColDiff = -nCol1;
- SCsROW nRowDiff = -nRow1;
+ SCCOL nColDiff = -nCol1;
+ SCROW nRowDiff = -nRow1;
if (pQueryMatrix)
{
// Never case-sensitive.
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 322a69e515a4..13ff13bf29f1 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3636,12 +3636,12 @@ void ScInterpreter::ScColRowNameAuto()
return;
}
- SCsCOL nStartCol;
- SCsROW nStartRow;
+ SCCOL nStartCol;
+ SCROW nStartRow;
// maybe remember limit by using defined ColRowNameRange
- SCsCOL nCol2 = aAbs.aEnd.Col();
- SCsROW nRow2 = aAbs.aEnd.Row();
+ SCCOL nCol2 = aAbs.aEnd.Col();
+ SCROW nRow2 = aAbs.aEnd.Row();
// DataArea of the first cell
nStartCol = aAbs.aStart.Col();
nStartRow = aAbs.aStart.Row();
diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx
index fe6aa1bea950..43276e3e6a27 100644
--- a/sc/source/core/tool/queryparam.cxx
+++ b/sc/source/core/tool/queryparam.cxx
@@ -392,9 +392,9 @@ void ScQueryParam::MoveToDest()
{
if (!bInplace)
{
- SCsCOL nDifX = ((SCsCOL) nDestCol) - ((SCsCOL) nCol1);
- SCsROW nDifY = ((SCsROW) nDestRow) - ((SCsROW) nRow1);
- SCsTAB nDifZ = ((SCsTAB) nDestTab) - ((SCsTAB) nTab);
+ SCCOL nDifX = nDestCol - nCol1;
+ SCROW nDifY = nDestRow - nRow1;
+ SCTAB nDifZ = nDestTab - nTab;
nCol1 = sal::static_int_cast<SCCOL>( nCol1 + nDifX );
nRow1 = sal::static_int_cast<SCROW>( nRow1 + nDifY );
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index df273054390d..5ae74f9c0f3d 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -371,9 +371,9 @@ bool ScRangeList::UpdateReference(
UpdateRefMode eUpdateRefMode,
ScDocument* pDoc,
const ScRange& rWhere,
- SCsCOL nDx,
- SCsROW nDy,
- SCsTAB nDz
+ SCCOL nDx,
+ SCROW nDy,
+ SCTAB nDz
)
{
if (maRanges.empty())
@@ -1269,7 +1269,7 @@ size_t ScRangePairList::size() const
void ScRangePairList::UpdateReference( UpdateRefMode eUpdateRefMode,
ScDocument* pDoc, const ScRange& rWhere,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
+ SCCOL nDx, SCROW nDy, SCTAB nDz )
{
if ( !maPairs.empty() )
{
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index 7b6e4ad96075..f2aff8454dce 100644
--- a/sc/source/core/tool/rangenam.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list