Hi
I have removed dependencies on tools/solar.h in some files in sc
(according to http://wiki.documentfoundation.org/Easy_Hacks#write_tools.2F_pieces_out
) please review and commit.
Regards
Sören Möller
(LGPLv3+ / MPL)
From abe6dd6574bddeb7661b360d7da9c36930205c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20M=C3=B6ller?= <soerenmoeller2001@gmail.com>
Date: Mon, 3 Jan 2011 21:30:29 +0100
Subject: [PATCH] Removed dependencies on tools/solar.h
Replaced all uses of (deprecated) data types from tools/solar.h by the corresponding data types in
sal/types.h
---
sc/inc/column.hxx | 208 +++++++++++++-------------
sc/source/core/data/column.cxx | 246 +++++++++++++++---------------
sc/source/core/data/column2.cxx | 322 +++++++++++++++++++-------------------
3 files changed, 388 insertions(+), 388 deletions(-)
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index cf193de..ee60d18 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -33,7 +33,7 @@
#include "global.hxx"
#include "address.hxx"
#include "rangenam.hxx"
-#include <tools/solar.h>
+#include <sal/types.h>
#include <set>
@@ -77,18 +77,18 @@ struct ScColWidthParam;
struct ScNeededSizeOptions
{
const ScPatternAttr* pPattern;
- BOOL bFormula;
- BOOL bSkipMerged;
- BOOL bGetFont;
- BOOL bTotalSize;
+ sal_Bool bFormula;
+ sal_Bool bSkipMerged;
+ sal_Bool bGetFont;
+ sal_Bool bTotalSize;
ScNeededSizeOptions()
{
pPattern = NULL;
- bFormula = FALSE;
- bSkipMerged = TRUE;
- bGetFont = TRUE;
- bTotalSize = FALSE;
+ bFormula = sal_False;
+ bSkipMerged = sal_True;
+ bGetFont = sal_True;
+ bTotalSize = sal_False;
}
};
@@ -140,10 +140,10 @@ public:
void Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc);
- BOOL Search( SCROW nRow, SCSIZE& nIndex ) const;
+ sal_Bool Search( SCROW nRow, SCSIZE& nIndex ) const;
ScBaseCell* GetCell( SCROW nRow ) const;
void Insert( SCROW nRow, ScBaseCell* pCell );
- void Insert( SCROW nRow, ULONG nFormatIndex, ScBaseCell* pCell );
+ void Insert( SCROW nRow, sal_uIntPtr nFormatIndex, ScBaseCell* pCell );
void Append( SCROW nRow, ScBaseCell* pCell );
void Delete( SCROW nRow );
void DeleteAtIndex( SCSIZE nIndex );
@@ -152,65 +152,65 @@ public:
void SwapRow( SCROW nRow1, SCROW nRow2 );
void SwapCell( SCROW nRow, ScColumn& rCol);
- bool HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const;
- BOOL HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const;
- BOOL ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
+ bool HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const;
+ sal_Bool HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const;
+ sal_Bool ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
SCCOL& rPaintCol, SCROW& rPaintRow,
- BOOL bRefresh, BOOL bAttrs );
+ sal_Bool bRefresh, sal_Bool bAttrs );
- BOOL IsEmptyVisData(BOOL bNotes) const; // ohne Broadcaster
- BOOL IsEmptyData() const;
- BOOL IsEmptyAttr() const;
- BOOL IsEmpty() const;
+ sal_Bool IsEmptyVisData(sal_Bool bNotes) const; // ohne Broadcaster
+ sal_Bool IsEmptyData() const;
+ sal_Bool IsEmptyAttr() const;
+ sal_Bool IsEmpty() const;
// nur Daten:
- BOOL IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false)
const;
+ sal_Bool IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes = false) const;
SCSIZE GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const;
- BOOL HasDataAt(SCROW nRow) const;
- BOOL HasVisibleDataAt(SCROW nRow) const;
+ sal_Bool HasDataAt(SCROW nRow) const;
+ sal_Bool HasVisibleDataAt(SCROW nRow) const;
SCROW GetFirstDataPos() const;
SCROW GetLastDataPos() const;
- SCROW GetLastVisDataPos(BOOL bNotes) const; // ohne
Broadcaster
- SCROW GetFirstVisDataPos(BOOL bNotes) const;
- BOOL GetPrevDataPos(SCROW& rRow) const;
- BOOL GetNextDataPos(SCROW& rRow) const;
+ SCROW GetLastVisDataPos(sal_Bool bNotes) const; //
ohne Broadcaster
+ SCROW GetFirstVisDataPos(sal_Bool bNotes) const;
+ sal_Bool GetPrevDataPos(SCROW& rRow) const;
+ sal_Bool GetNextDataPos(SCROW& rRow) const;
void FindDataAreaPos(SCROW& rRow, long nMovY) const; // (ohne Broadcaster)
- void FindUsed( SCROW nStartRow, SCROW nEndRow, BOOL* pUsed ) const;
+ void FindUsed( SCROW nStartRow, SCROW nEndRow, sal_Bool* pUsed ) const;
SCSIZE VisibleCount( SCROW nStartRow, SCROW nEndRow ) const;
- USHORT GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) const;
- BOOL HasSelectionMatrixFragment(const ScMarkData& rMark) const;
+ sal_uInt16 GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const;
+ sal_Bool HasSelectionMatrixFragment(const ScMarkData& rMark) const;
- BOOL GetFirstVisibleAttr( SCROW& rFirstRow ) const;
- BOOL GetLastVisibleAttr( SCROW& rLastRow ) const;
- BOOL HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
- BOOL IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0,
+ sal_Bool GetFirstVisibleAttr( SCROW& rFirstRow ) const;
+ sal_Bool GetLastVisibleAttr( SCROW& rLastRow ) const;
+ sal_Bool HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
+ sal_Bool IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow = 0,
SCROW nEndRow = MAXROW ) const;
- BOOL IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow )
const;
+ sal_Bool IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const;
- BOOL TestInsertCol( SCROW nStartRow, SCROW nEndRow) const;
- BOOL TestInsertRow( SCSIZE nSize ) const;
+ sal_Bool TestInsertCol( SCROW nStartRow, SCROW nEndRow) const;
+ sal_Bool TestInsertRow( SCSIZE nSize ) const;
void InsertRow( SCROW nStartRow, SCSIZE nSize );
void DeleteRow( SCROW nStartRow, SCSIZE nSize );
- void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, USHORT nDelFlag );
- void DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag );
- void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, BOOL bKeepScenarioFlags,
BOOL bCloneNoteCaptions);
+ void DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16 nDelFlag );
+ void DeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag );
+ void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, sal_Bool
bKeepScenarioFlags, sal_Bool bCloneNoteCaptions);
void CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
- USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, ScColumn&
rColumn);
+ sal_uInt16 nInsFlag, sal_Bool bAsLink, sal_Bool bSkipAttrForEmpty,
ScColumn& rColumn);
void StartListeningInArea( SCROW nRow1, SCROW nRow2 );
void BroadcastInArea( SCROW nRow1, SCROW nRow2 );
void RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow );
// Markierung von diesem Dokument
- void MixMarked( const ScMarkData& rMark, USHORT nFunction,
- BOOL bSkipEmpty, ScColumn& rSrcCol );
- void MixData( SCROW nRow1, SCROW nRow2, USHORT nFunction, BOOL bSkipEmpty,
+ void MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction,
+ sal_Bool bSkipEmpty, ScColumn& rSrcCol );
+ void MixData( SCROW nRow1, SCROW nRow2, sal_uInt16 nFunction, sal_Bool
bSkipEmpty,
ScColumn& rSrcCol );
ScFormulaCell* CreateRefCell( ScDocument* pDestDoc, const ScAddress& rDestPos,
- SCSIZE nIndex, USHORT nFlags ) const;
+ SCSIZE nIndex, sal_uInt16 nFlags ) const;
ScAttrIterator* CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const;
@@ -220,20 +220,20 @@ public:
void UpdateSelectionFunction( const ScMarkData& rMark,
ScFunctionData& rData,
ScFlatBoolRowSegments& rHiddenRows,
- BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow );
+ sal_Bool bDoExclude, SCROW nExStartRow, SCROW nExEndRow );
void UpdateAreaFunction( ScFunctionData& rData,
ScFlatBoolRowSegments& rHiddenRows,
SCROW nStartRow, SCROW nEndRow );
- void CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked,
+ void CopyToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, sal_Bool bMarked,
ScColumn& rColumn, const ScMarkData* pMarkData = NULL,
- BOOL bAsLink = FALSE );
- void UndoToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked,
+ sal_Bool bAsLink = sal_False );
+ void UndoToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, sal_Bool bMarked,
ScColumn& rColumn, const ScMarkData* pMarkData = NULL );
void CopyScenarioFrom( const ScColumn& rSrcCol );
void CopyScenarioTo( ScColumn& rDestCol ) const;
- BOOL TestCopyScenarioTo( const ScColumn& rDestCol ) const;
+ sal_Bool TestCopyScenarioTo( const ScColumn& rDestCol ) const;
void MarkScenarioIn( ScMarkData& rDestMark ) const;
void CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const;
@@ -241,29 +241,29 @@ public:
void SwapCol(ScColumn& rCol);
void MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol);
- BOOL HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const;
+ sal_Bool HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const;
- // TRUE = Zahlformat gesetzt
- BOOL SetString( SCROW nRow, SCTAB nTab, const String& rString,
+ // sal_True = Zahlformat gesetzt
+ sal_Bool SetString( SCROW nRow, SCTAB nTab, const String& rString,
formula::FormulaGrammar::AddressConvention conv =
formula::FormulaGrammar::CONV_OOO,
ScSetStringParam* pParam = NULL );
void SetValue( SCROW nRow, const double& rVal);
- void SetError( SCROW nRow, const USHORT nError);
+ void SetError( SCROW nRow, const sal_uInt16 nError);
void GetString( SCROW nRow, String& rString ) const;
void GetInputString( SCROW nRow, String& rString ) const;
double GetValue( SCROW nRow ) const;
void GetFormula( SCROW nRow, String& rFormula,
- BOOL bAsciiExport = FALSE ) const;
+ sal_Bool bAsciiExport = sal_False ) const;
CellType GetCellType( SCROW nRow ) const;
SCSIZE GetCellCount() const { return nCount; }
- ULONG GetWeightedCount() const;
- ULONG GetCodeCount() const; // RPN-Code in Formeln
- USHORT GetErrCode( SCROW nRow ) const;
+ sal_uIntPtr GetWeightedCount() const;
+ sal_uIntPtr GetCodeCount() const; // RPN-Code in Formeln
+ sal_uInt16 GetErrCode( SCROW nRow ) const;
- BOOL HasStringData( SCROW nRow ) const;
- BOOL HasValueData( SCROW nRow ) const;
- BOOL HasStringCells( SCROW nStartRow, SCROW nEndRow ) const;
+ sal_Bool HasStringData( SCROW nRow ) const;
+ sal_Bool HasValueData( SCROW nRow ) const;
+ sal_Bool HasStringCells( SCROW nStartRow, SCROW nEndRow ) const;
/** Returns the pointer to a cell note object at the passed row. */
ScPostIt* GetNote( SCROW nRow );
@@ -292,41 +292,41 @@ public:
ScDocument* pUndoDoc = NULL );
void UpdateInsertTab( SCTAB nTable);
void UpdateInsertTabOnlyCells( SCTAB nTable);
- void UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo = NULL );
+ void UpdateDeleteTab( SCTAB nTable, sal_Bool bIsMove, ScColumn* pRefUndo = NULL
);
void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo);
- void UpdateCompile( BOOL bForceIfNameInUse = FALSE );
+ void UpdateCompile( sal_Bool bForceIfNameInUse = sal_False );
void UpdateTranspose( const ScRange& rSource, const ScAddress& rDest,
ScDocument* pUndoDoc );
void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY );
void SetTabNo(SCTAB nNewTab);
- BOOL IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const;
- void FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<USHORT>& rIndexes) const;
+ sal_Bool IsRangeNameInUse(SCROW nRow1, SCROW nRow2, sal_uInt16 nIndex) const;
+ void FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<sal_uInt16>& rIndexes)
const;
void ReplaceRangeNamesInUse( SCROW nRow1, SCROW nRow2, const
ScRangeData::IndexMap& rMap );
- const SfxPoolItem* GetAttr( SCROW nRow, USHORT nWhich ) const;
+ const SfxPoolItem* GetAttr( SCROW nRow, sal_uInt16 nWhich ) const;
const ScPatternAttr* GetPattern( SCROW nRow ) const;
const ScPatternAttr* GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow ) const;
- ULONG GetNumberFormat( SCROW nRow ) const;
+ sal_uIntPtr GetNumberFormat( SCROW nRow ) const;
sal_uInt32 GetNumberFormat( SCROW nStartRow, SCROW nEndRow ) const;
- void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData&
rMark, BOOL bDeep ) const;
- void MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2,
BOOL bDeep ) const;
+ void MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData&
rMark, sal_Bool bDeep ) const;
+ void MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2,
sal_Bool bDeep ) const;
void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
ScLineFlags& rFlags,
- SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const;
+ SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight )
const;
void ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem*
pLineInner,
- SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight );
+ SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight );
void ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr );
void ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr );
void ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr&
rPatAttr,
ScEditDataArray* pDataArray = NULL );
bool SetAttrEntries(ScAttrEntry* pData, SCSIZE nSize);
- void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool =
FALSE );
+ void SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, sal_Bool bPutToPool
= sal_False );
void SetPatternArea( SCROW nStartRow, SCROW nEndRow,
- const ScPatternAttr& rPatAttr, BOOL bPutToPool = FALSE );
+ const ScPatternAttr& rPatAttr, sal_Bool bPutToPool = sal_False );
void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
const ScPatternAttr& rPattern, short nNewType );
@@ -334,61 +334,61 @@ public:
void ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const ScStyleSheet& rStyle
);
void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark);
void ApplySelectionLineStyle( const ScMarkData& rMark,
- const SvxBorderLine* pLine, BOOL bColorOnly );
+ const SvxBorderLine* pLine, sal_Bool bColorOnly );
const ScStyleSheet* GetStyle( SCROW nRow ) const;
- const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const;
- const ScStyleSheet* GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const;
+ const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, sal_Bool& rFound )
const;
+ const ScStyleSheet* GetAreaStyle( sal_Bool& rFound, SCROW nRow1, SCROW nRow2 ) const;
void FindStyleSheet( const SfxStyleSheetBase* pStyleSheet,
ScFlatBoolRowSegments& rUsedRows, bool bReset );
- BOOL IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const;
+ sal_Bool IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const;
/// May return -1 if not found
SCsROW SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
- BOOL bUp, BOOL bInSelection, const ScMarkData& rMark );
- BOOL SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet*
pSearchStyle,
- BOOL bUp, BOOL bInSelection, const ScMarkData& rMark );
+ sal_Bool bUp, sal_Bool bInSelection, const ScMarkData& rMark );
+ sal_Bool SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle,
+ sal_Bool bUp, sal_Bool bInSelection, const ScMarkData& rMark );
- BOOL ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags );
- BOOL RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags );
- void ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich );
+ sal_Bool ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags );
+ sal_Bool RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags );
+ void ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich );
void RemoveProtected( SCROW nStartRow, SCROW nEndRow );
SCsROW ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark,
ScEditDataArray* pDataArray = NULL );
- void DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark );
+ void DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark );
- void ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark );
- void ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark );
+ void ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark );
+ void ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark );
long GetNeededSize( SCROW nRow, OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- BOOL bWidth, const ScNeededSizeOptions& rOptions );
- USHORT GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY,
+ sal_Bool bWidth, const ScNeededSizeOptions& rOptions );
+ sal_uInt16 GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- BOOL bFormula, USHORT nOldWidth,
+ sal_Bool bFormula, sal_uInt16 nOldWidth,
const ScMarkData* pMarkData,
const ScColWidthParam* pParam );
- void GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight,
+ void GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16* pHeight,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- BOOL bShrink, USHORT nMinHeight, SCROW nMinStart );
+ sal_Bool bShrink, sal_uInt16 nMinHeight, SCROW nMinStart );
private:
long GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev,
- BOOL bWidth );
+ sal_Bool bWidth );
public:
/// Including current, may return -1
- SCsROW GetNextUnprotected( SCROW nRow, BOOL bUp ) const;
+ SCsROW GetNextUnprotected( SCROW nRow, sal_Bool bUp ) const;
void GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollection&
rStrings, bool& rHasDates);
- BOOL GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, BOOL bLimit);
+ sal_Bool GetDataEntries(SCROW nRow, TypedScStrCollection& rStrings, sal_Bool bLimit);
void UpdateInsertTabAbs(SCTAB nNewPos);
- BOOL TestTabRefAbs(SCTAB nTable);
- BOOL GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& rData)
const;
+ sal_Bool TestTabRefAbs(SCTAB nTable);
+ sal_Bool GetNextSpellingCell(SCROW& nRow, sal_Bool bInSel, const ScMarkData& rData) const;
void RemoveAutoSpellObj();
@@ -396,12 +396,12 @@ public:
void EndListening( SvtListener& rLst, SCROW nRow );
void MoveListeners( SvtBroadcaster& rSource, SCROW nDestRow );
void StartAllListeners();
- void StartNeededListeners(); // only for cells where NeedsListening()==TRUE
+ void StartNeededListeners(); // only for cells where NeedsListening()==sal_True
void SetRelNameDirty();
void CompileDBFormula();
- void CompileDBFormula( BOOL bCreateFormulaString );
- void CompileNameFormula( BOOL bCreateFormulaString );
+ void CompileDBFormula( sal_Bool bCreateFormulaString );
+ void CompileNameFormula( sal_Bool bCreateFormulaString );
void CompileColRowNameFormula();
sal_Int32 GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCharSet ) const;
@@ -409,7 +409,7 @@ public:
SCROW nRowStart, SCROW nRowEnd ) const;
private:
- ScBaseCell* CloneCell(SCSIZE nIndex, USHORT nFlags, ScDocument& rDestDoc, const ScAddress&
rDestPos);
+ ScBaseCell* CloneCell(SCSIZE nIndex, sal_uInt16 nFlags, ScDocument& rDestDoc, const ScAddress&
rDestPos);
};
@@ -423,7 +423,7 @@ public:
ScColumnIterator( const ScColumn* pCol, SCROW nStart=0, SCROW nEnd=MAXROW );
~ScColumnIterator();
- BOOL Next( SCROW& rRow, ScBaseCell*& rpCell );
+ sal_Bool Next( SCROW& rRow, ScBaseCell*& rpCell );
SCSIZE GetIndex() const;
};
@@ -435,15 +435,15 @@ class ScMarkedDataIter // Daten in
selektierten Bereichen durchgehen
ScMarkArrayIter* pMarkIter;
SCROW nTop;
SCROW nBottom;
- BOOL bNext;
- BOOL bAll;
+ sal_Bool bNext;
+ sal_Bool bAll;
public:
ScMarkedDataIter( const ScColumn* pCol, const ScMarkData* pMarkData,
- BOOL bAllIfNone = FALSE );
+ sal_Bool bAllIfNone = sal_False );
~ScMarkedDataIter();
- BOOL Next( SCSIZE& rIndex );
+ sal_Bool Next( SCSIZE& rIndex );
};
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 0ae30f5..69997c4 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -59,7 +59,7 @@
// STATIC DATA -----------------------------------------------------------
using namespace formula;
-inline BOOL IsAmbiguousScriptNonZero( BYTE nScript )
+inline sal_Bool IsAmbiguousScriptNonZero( sal_uInt8 nScript )
{
//! move to a header file
return ( nScript != SCRIPTTYPE_LATIN &&
@@ -110,13 +110,13 @@ void ScColumn::Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc)
}
-SCsROW ScColumn::GetNextUnprotected( SCROW nRow, BOOL bUp ) const
+SCsROW ScColumn::GetNextUnprotected( SCROW nRow, sal_Bool bUp ) const
{
return pAttrArray->GetNextUnprotected(nRow, bUp);
}
-USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) const
+sal_uInt16 ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
{
// nix:0, mitte:1, unten:2, links:4, oben:8, rechts:16, offen:32
if ( !pItems )
@@ -139,8 +139,8 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c
else
{
ScAddress aOrg( ScAddress::INITIALIZE_INVALID );
- BOOL bOpen = FALSE;
- USHORT nEdges = 0;
+ sal_Bool bOpen = sal_False;
+ sal_uInt16 nEdges = 0;
SCSIZE nIndex;
Search( nRow1, nIndex );
while ( nIndex < nCount && pItems[nIndex].nRow <= nRow2 )
@@ -153,7 +153,7 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c
if ( nEdges )
{
if ( nEdges & 8 )
- bOpen = TRUE; // obere Kante oeffnet, weitersehen
+ bOpen = sal_True; // obere Kante oeffnet, weitersehen
else if ( !bOpen )
return nEdges | 32; // es gibt was, was nicht geoeffnet wurde
else if ( nEdges & 1 )
@@ -164,7 +164,7 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c
|| ((nMask & 4) && (nEdges & 16) && !(nEdges & 4)) )
return nEdges; // nur linke/rechte Kante
if ( nEdges & 2 )
- bOpen = FALSE; // untere Kante schliesst
+ bOpen = sal_False; // untere Kante schliesst
}
}
nIndex++;
@@ -176,11 +176,11 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask
) c
}
-BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
+sal_Bool ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
{
if ( rMark.IsMultiMarked() )
{
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
ScAddress aOrg( ScAddress::INITIALIZE_INVALID );
ScAddress aCurOrg( ScAddress::INITIALIZE_INVALID );
@@ -188,8 +188,8 @@ BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
ScMarkArrayIter aMarkIter( rMark.GetArray()+nCol );
while ( !bFound && aMarkIter.Next( nTop, nBottom ) )
{
- BOOL bOpen = FALSE;
- USHORT nEdges;
+ sal_Bool bOpen = sal_False;
+ sal_uInt16 nEdges;
SCSIZE nIndex;
Search( nTop, nIndex );
while ( !bFound && nIndex < nCount && pItems[nIndex].nRow <= nBottom )
@@ -202,16 +202,16 @@ BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
if ( nEdges )
{
if ( nEdges & 8 )
- bOpen = TRUE; // obere Kante oeffnet, weitersehen
+ bOpen = sal_True; // obere Kante oeffnet, weitersehen
else if ( !bOpen )
- return TRUE; // es gibt was, was nicht geoeffnet wurde
+ return sal_True; // es gibt was, was nicht geoeffnet wurde
else if ( nEdges & 1 )
- bFound = TRUE; // mittendrin, alles selektiert?
+ bFound = sal_True; // mittendrin, alles selektiert?
// (4 und nicht 16) oder (16 und nicht 4)
if ( (((nEdges & 4) | 16) ^ ((nEdges & 16) | 4)) )
- bFound = TRUE; // nur linke/rechte Kante, alles selektiert?
+ bFound = sal_True; // nur linke/rechte Kante, alles selektiert?
if ( nEdges & 2 )
- bOpen = FALSE; // untere Kante schliesst
+ bOpen = sal_False; // untere Kante schliesst
if ( bFound )
{ // alles selektiert?
@@ -231,34 +231,34 @@ BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const
aOrg.Col() + nC - 1, aOrg.Row() + nR - 1,
aOrg.Tab() ) );
if ( rMark.IsAllMarked( aRange ) )
- bFound = FALSE;
+ bFound = sal_False;
}
else
- bFound = FALSE; // war schon
+ bFound = sal_False; // war schon
}
}
}
nIndex++;
}
if ( bOpen )
- return TRUE;
+ return sal_True;
}
return bFound;
}
else
- return FALSE;
+ return sal_False;
}
-bool ScColumn::HasAttrib( SCROW nRow1, SCROW nRow2, USHORT nMask ) const
+bool ScColumn::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const
{
return pAttrArray->HasAttrib( nRow1, nRow2, nMask );
}
-BOOL ScColumn::HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const
+sal_Bool ScColumn::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const
{
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
SCROW nTop;
SCROW nBottom;
@@ -269,7 +269,7 @@ BOOL ScColumn::HasAttribSelection( const ScMarkData& rMark, USHORT nMask ) const
while (aMarkIter.Next( nTop, nBottom ) && !bFound)
{
if (pAttrArray->HasAttrib( nTop, nBottom, nMask ))
- bFound = TRUE;
+ bFound = sal_True;
}
}
@@ -277,15 +277,15 @@ BOOL ScColumn::HasAttribSelection( const ScMarkData& rMark, USHORT nMask )
const
}
-BOOL ScColumn::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
+sal_Bool ScColumn::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow,
SCCOL& rPaintCol, SCROW& rPaintRow,
- BOOL bRefresh, BOOL bAttrs )
+ sal_Bool bRefresh, sal_Bool bAttrs )
{
return pAttrArray->ExtendMerge( nThisCol, nStartRow, nEndRow, rPaintCol, rPaintRow, bRefresh,
bAttrs );
}
-void ScColumn::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, BOOL
bDeep ) const
+void ScColumn::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark,
sal_Bool bDeep ) const
{
SCROW nTop;
SCROW nBottom;
@@ -303,7 +303,7 @@ void ScColumn::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkD
}
-void ScColumn::MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, BOOL bDeep
) const
+void ScColumn::MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, sal_Bool
bDeep ) const
{
pAttrArray->MergePatternArea( nRow1, nRow2, rState, bDeep );
}
@@ -311,14 +311,14 @@ void ScColumn::MergePatternArea( ScMergePatternState& rState, SCROW nRow1,
SCROW
void ScColumn::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
ScLineFlags& rFlags,
- SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight ) const
+ SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight )
const
{
pAttrArray->MergeBlockFrame( pLineOuter, pLineInner, rFlags, nStartRow, nEndRow, bLeft,
nDistRight );
}
void ScColumn::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner,
- SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight )
+ SCROW nStartRow, SCROW nEndRow, sal_Bool bLeft, SCCOL nDistRight )
{
pAttrArray->ApplyBlockFrame( pLineOuter, pLineInner, nStartRow, nEndRow, bLeft, nDistRight );
}
@@ -330,7 +330,7 @@ const ScPatternAttr* ScColumn::GetPattern( SCROW nRow ) const
}
-const SfxPoolItem* ScColumn::GetAttr( SCROW nRow, USHORT nWhich ) const
+const SfxPoolItem* ScColumn::GetAttr( SCROW nRow, sal_uInt16 nWhich ) const
{
return &pAttrArray->GetPattern( nRow )->GetItemSet().Get(nWhich);
}
@@ -377,7 +377,7 @@ sal_uInt32 ScColumn::GetNumberFormat( SCROW nStartRow, SCROW nEndRow ) const
}
-ULONG ScColumn::GetNumberFormat( SCROW nRow ) const
+sal_uIntPtr ScColumn::GetNumberFormat( SCROW nRow ) const
{
return pAttrArray->GetPattern( nRow )->GetNumberFormat( pDocument->GetFormatTable() );
}
@@ -387,7 +387,7 @@ SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData
{
SCROW nTop = 0;
SCROW nBottom = 0;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
if ( rMark.IsMultiMarked() )
{
@@ -395,7 +395,7 @@ SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData
while (aMarkIter.Next( nTop, nBottom ))
{
pAttrArray->ApplyCacheArea( nTop, nBottom, pCache, pDataArray );
- bFound = TRUE;
+ bFound = sal_True;
}
}
@@ -408,7 +408,7 @@ SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData
}
-void ScColumn::ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark )
+void ScColumn::ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark )
{
SCROW nTop;
SCROW nBottom;
@@ -422,7 +422,7 @@ void ScColumn::ChangeSelectionIndent( BOOL bIncrement, const ScMarkData& rMark )
}
-void ScColumn::ClearSelectionItems( const USHORT* pWhich,const ScMarkData& rMark )
+void ScColumn::ClearSelectionItems( const sal_uInt16* pWhich,const ScMarkData& rMark )
{
SCROW nTop;
SCROW nBottom;
@@ -436,7 +436,7 @@ void ScColumn::ClearSelectionItems( const USHORT* pWhich,const ScMarkData& rMark
}
-void ScColumn::DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark )
+void ScColumn::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark )
{
SCROW nTop;
SCROW nBottom;
@@ -457,9 +457,9 @@ void ScColumn::ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr )
const ScPatternAttr* pPattern = pAttrArray->GetPattern( nRow );
- // TRUE = alten Eintrag behalten
+ // sal_True = alten Eintrag behalten
- ScPatternAttr* pNewPattern = (ScPatternAttr*) &aCache.ApplyTo( *pPattern, TRUE );
+ ScPatternAttr* pNewPattern = (ScPatternAttr*) &aCache.ApplyTo( *pPattern, sal_True );
ScDocumentPool::CheckRef( *pPattern );
ScDocumentPool::CheckRef( *pNewPattern );
@@ -493,7 +493,7 @@ void ScColumn::ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
SCROW nRow1, nRow2;
const ScPatternAttr* pPattern = pAttrArray->GetPatternRange(
nRow1, nRow2, nRow );
- ULONG nFormat = pPattern->GetNumberFormat( pFormatter );
+ sal_uIntPtr nFormat = pPattern->GetNumberFormat( pFormatter );
short nOldType = pFormatter->GetType( nFormat );
if ( nOldType == nNewType || pFormatter->IsCompatible( nOldType, nNewType ) )
nRow = nRow2;
@@ -515,7 +515,7 @@ void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle )
if (pNewPattern)
{
pNewPattern->SetStyleSheet((ScStyleSheet*)&rStyle);
- pAttrArray->SetPattern(nRow, pNewPattern, TRUE);
+ pAttrArray->SetPattern(nRow, pNewPattern, sal_True);
delete pNewPattern;
}
}
@@ -542,7 +542,7 @@ void ScColumn::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData&
void ScColumn::ApplySelectionLineStyle( const ScMarkData& rMark,
- const SvxBorderLine* pLine, BOOL bColorOnly )
+ const SvxBorderLine* pLine, sal_Bool bColorOnly )
{
if ( bColorOnly && !pLine )
return;
@@ -565,16 +565,16 @@ const ScStyleSheet* ScColumn::GetStyle( SCROW nRow ) const
}
-const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, BOOL& rFound ) const
+const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, sal_Bool& rFound ) const
{
- rFound = FALSE;
+ rFound = sal_False;
if (!rMark.IsMultiMarked())
{
DBG_ERROR("ScColumn::GetSelectionStyle ohne Selektion");
return NULL;
}
- BOOL bEqual = TRUE;
+ sal_Bool bEqual = sal_True;
const ScStyleSheet* pStyle = NULL;
const ScStyleSheet* pNewStyle;
@@ -591,9 +591,9 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, BOOL&
while (bEqual && ( pPattern = aAttrIter.Next( nRow, nDummy ) ) != NULL)
{
pNewStyle = pPattern->GetStyleSheet();
- rFound = TRUE;
+ rFound = sal_True;
if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
- bEqual = FALSE;
// unterschiedliche
+ bEqual = sal_False;
// unterschiedliche
pStyle = pNewStyle;
}
}
@@ -602,11 +602,11 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark,
BOOL&
}
-const ScStyleSheet* ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const
+const ScStyleSheet* ScColumn::GetAreaStyle( sal_Bool& rFound, SCROW nRow1, SCROW nRow2 ) const
{
- rFound = FALSE;
+ rFound = sal_False;
- BOOL bEqual = TRUE;
+ sal_Bool bEqual = sal_True;
const ScStyleSheet* pStyle = NULL;
const ScStyleSheet* pNewStyle;
@@ -618,9 +618,9 @@ const ScStyleSheet* ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRo
while (bEqual && ( pPattern = aAttrIter.Next( nRow, nDummy ) ) != NULL)
{
pNewStyle = pPattern->GetStyleSheet();
- rFound = TRUE;
+ rFound = sal_True;
if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) )
- bEqual = FALSE;
// unterschiedliche
+ bEqual = sal_False;
// unterschiedliche
pStyle = pNewStyle;
}
@@ -632,38 +632,38 @@ void ScColumn::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet,
ScFlatBoolR
pAttrArray->FindStyleSheet( pStyleSheet, rUsedRows, bReset );
}
-BOOL ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const
+sal_Bool ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const
{
return pAttrArray->IsStyleSheetUsed( rStyle, bGatherAllStyles );
}
-BOOL ScColumn::ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags )
+sal_Bool ScColumn::ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags )
{
return pAttrArray->ApplyFlags( nStartRow, nEndRow, nFlags );
}
-BOOL ScColumn::RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags )
+sal_Bool ScColumn::RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags )
{
return pAttrArray->RemoveFlags( nStartRow, nEndRow, nFlags );
}
-void ScColumn::ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhich )
+void ScColumn::ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich )
{
pAttrArray->ClearItems( nStartRow, nEndRow, pWhich );
}
-void ScColumn::SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, BOOL bPutToPool )
+void ScColumn::SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, sal_Bool bPutToPool )
{
pAttrArray->SetPattern( nRow, &rPatAttr, bPutToPool );
}
void ScColumn::SetPatternArea( SCROW nStartRow, SCROW nEndRow,
- const ScPatternAttr& rPatAttr, BOOL bPutToPool )
+ const ScPatternAttr& rPatAttr, sal_Bool bPutToPool )
{
pAttrArray->SetPatternArea( nStartRow, nEndRow, &rPatAttr, bPutToPool );
}
@@ -696,12 +696,12 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr )
#endif
-BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
+sal_Bool ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
{
if ( !pItems || !nCount )
{
nIndex = 0;
- return FALSE;
+ return sal_False;
}
SCROW nMinRow = pItems[0].nRow;
if ( nRow <= nMinRow )
@@ -715,12 +715,12 @@ BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
if ( nRow == nMaxRow )
{
nIndex = nCount - 1;
- return TRUE;
+ return sal_True;
}
else
{
nIndex = nCount;
- return FALSE;
+ return sal_False;
}
}
@@ -728,9 +728,9 @@ BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
long nLo = nOldLo = 0;
long nHi = nOldHi = Min(static_cast<long>(nCount)-1, static_cast<long>(nRow) );
long i = 0;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
// quite continuous distribution? => interpolating search
- BOOL bInterpol = (static_cast<SCSIZE>(nMaxRow - nMinRow) < nCount * 2);
+ sal_Bool bInterpol = (static_cast<SCSIZE>(nMaxRow - nMinRow) < nCount * 2);
SCROW nR;
while ( !bFound && nLo <= nHi )
@@ -745,7 +745,7 @@ BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
if ( i < 0 || static_cast<SCSIZE>(i) >= nCount )
{ // oops ...
i = (nLo+nHi) / 2;
- bInterpol = FALSE;
+ bInterpol = sal_False;
}
}
nR = pItems[i].nRow;
@@ -755,7 +755,7 @@ BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
if ( bInterpol )
{
if ( nLo <= nOldLo )
- bInterpol = FALSE;
+ bInterpol = sal_False;
else
nOldLo = nLo;
}
@@ -768,13 +768,13 @@ BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const
if ( bInterpol )
{
if ( nHi >= nOldHi )
- bInterpol = FALSE;
+ bInterpol = sal_False;
else
nOldHi = nHi;
}
}
else
- bFound = TRUE;
+ bFound = sal_True;
}
}
if (bFound)
@@ -944,16 +944,16 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
if (pCode1->GetLen() == pCode2->GetLen()) // nicht-UPN
{
- BOOL bEqual = TRUE;
- USHORT nLen = pCode1->GetLen();
+ sal_Bool bEqual = sal_True;
+ sal_uInt16 nLen = pCode1->GetLen();
FormulaToken** ppToken1 = pCode1->GetArray();
FormulaToken** ppToken2 = pCode2->GetArray();
- for (USHORT i=0; i<nLen; i++)
+ for (sal_uInt16 i=0; i<nLen; i++)
{
if ( !ppToken1[i]->TextEqual(*(ppToken2[i])) ||
ppToken1[i]->Is3DRef() || ppToken2[i]->Is3DRef() )
{
- bEqual = FALSE;
+ bEqual = sal_False;
break;
}
}
@@ -1076,11 +1076,11 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn& rCol)
}
-BOOL ScColumn::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const
+sal_Bool ScColumn::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const
{
if (!IsEmpty())
{
- BOOL bTest = TRUE;
+ sal_Bool bTest = sal_True;
if (pItems)
for (SCSIZE i=0; (i<nCount) && bTest; i++)
bTest = (pItems[i].nRow < nStartRow) || (pItems[i].nRow > nEndRow)
@@ -1096,11 +1096,11 @@ BOOL ScColumn::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const
return bTest;
}
else
- return TRUE;
+ return sal_True;
}
-BOOL ScColumn::TestInsertRow( SCSIZE nSize ) const
+sal_Bool ScColumn::TestInsertRow( SCSIZE nSize ) const
{
// AttrArray only looks for merged cells
@@ -1126,16 +1126,16 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize )
if ( i >= nCount )
return ;
- BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+ pDocument->SetAutoCalc( sal_False ); // Mehrfachberechnungen vermeiden
SCSIZE nNewCount = nCount;
- BOOL bCountChanged = FALSE;
+ sal_Bool bCountChanged = sal_False;
ScAddress aAdr( nCol, 0, nTab );
ScHint aHint( SC_HINT_DATACHANGED, aAdr, NULL ); // only areas (ScBaseCell* == NULL)
ScAddress& rAddress = aHint.GetAddress();
// for sparse occupation use single broadcasts, not ranges
- BOOL bSingleBroadcasts = (((pItems[nCount-1].nRow - pItems[i].nRow) /
+ sal_Bool bSingleBroadcasts = (((pItems[nCount-1].nRow - pItems[i].nRow) /
(nCount - i)) > 1);
if ( bSingleBroadcasts )
{
@@ -1160,7 +1160,7 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize )
if ( nNewRow > MAXROW && !bCountChanged )
{
nNewCount = i;
- bCountChanged = TRUE;
+ bCountChanged = sal_True;
}
}
}
@@ -1177,7 +1177,7 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize )
if ( nNewRow > MAXROW && !bCountChanged )
{
nNewCount = i;
- bCountChanged = TRUE;
+ bCountChanged = sal_True;
aRange.aEnd.SetRow( MAXROW );
}
}
@@ -1219,7 +1219,7 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize )
}
-void ScColumn::CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, BOOL bKeepScenarioFlags,
BOOL bCloneNoteCaptions)
+void ScColumn::CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, sal_Bool
bKeepScenarioFlags, sal_Bool bCloneNoteCaptions)
{
pAttrArray->CopyArea( nRow1, nRow2, 0, *rColumn.pAttrArray,
bKeepScenarioFlags ? (SC_MF_ALL & ~SC_MF_SCENARIO) : SC_MF_ALL );
@@ -1263,8 +1263,8 @@ void ScColumn::CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, BOOL
bKee
}
-void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked,
- ScColumn& rColumn, const ScMarkData* pMarkData, BOOL bAsLink )
+void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, sal_Bool bMarked,
+ ScColumn& rColumn, const ScMarkData* pMarkData, sal_Bool bAsLink )
{
if (bMarked)
{
@@ -1277,7 +1277,7 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL
bMarke
{
if ( nEnd >= nRow1 )
CopyToColumn( Max(nRow1,nStart), Min(nRow2,nEnd),
- nFlags, FALSE, rColumn, pMarkData, bAsLink );
+ nFlags, sal_False, rColumn, pMarkData, bAsLink );
}
}
else
@@ -1299,7 +1299,7 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL
bMarke
const ScPatternAttr* pPattern = pAttrArray->GetPattern( nRow );
ScPatternAttr* pNewPattern = new ScPatternAttr( *pPattern );
pNewPattern->SetStyleSheet( (ScStyleSheet*)pStyle );
- rColumn.pAttrArray->SetPattern( nRow, pNewPattern, TRUE );
+ rColumn.pAttrArray->SetPattern( nRow, pNewPattern, sal_True );
delete pNewPattern;
}
}
@@ -1358,16 +1358,16 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL
bMarke
}
-void ScColumn::UndoToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarked,
+void ScColumn::UndoToColumn(SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, sal_Bool bMarked,
ScColumn& rColumn, const ScMarkData* pMarkData )
{
if (nRow1 > 0)
- CopyToColumn( 0, nRow1-1, IDF_FORMULA, FALSE, rColumn );
+ CopyToColumn( 0, nRow1-1, IDF_FORMULA, sal_False, rColumn );
CopyToColumn( nRow1, nRow2, nFlags, bMarked, rColumn, pMarkData ); //! bMarked ????
if (nRow2 < MAXROW)
- CopyToColumn( nRow2+1, MAXROW, IDF_FORMULA, FALSE, rColumn );
+ CopyToColumn( nRow2+1, MAXROW, IDF_FORMULA, sal_False, rColumn );
}
@@ -1391,7 +1391,7 @@ void ScColumn::CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol )
const
}
// Dummy:
- // CopyToColumn( 0,MAXROW, IDF_FORMULA, FALSE, rDestCol, NULL, FALSE );
+ // CopyToColumn( 0,MAXROW, IDF_FORMULA, sal_False, rDestCol, NULL, sal_False );
}
@@ -1408,7 +1408,7 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol )
{
DeleteArea( nStart, nEnd, IDF_CONTENTS );
((ScColumn&)rSrcCol).
- CopyToColumn( nStart, nEnd, IDF_CONTENTS, FALSE, *this );
+ CopyToColumn( nStart, nEnd, IDF_CONTENTS, sal_False, *this );
// UpdateUsed nicht noetig, schon in TestCopyScenario passiert
@@ -1439,7 +1439,7 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const
{
rDestCol.DeleteArea( nStart, nEnd, IDF_CONTENTS );
((ScColumn*)this)->
- CopyToColumn( nStart, nEnd, IDF_CONTENTS, FALSE, rDestCol );
+ CopyToColumn( nStart, nEnd, IDF_CONTENTS, sal_False, rDestCol );
// UpdateUsed nicht noetig, schon in TestCopyScenario passiert
@@ -1457,9 +1457,9 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const
}
-BOOL ScColumn::TestCopyScenarioTo( const ScColumn& rDestCol ) const
+sal_Bool ScColumn::TestCopyScenarioTo( const ScColumn& rDestCol ) const
{
- BOOL bOk = TRUE;
+ sal_Bool bOk = sal_True;
ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW );
SCROW nStart = 0, nEnd = 0;
const ScPatternAttr* pPattern = aAttrIter.Next( nStart, nEnd );
@@ -1467,7 +1467,7 @@ BOOL ScColumn::TestCopyScenarioTo( const ScColumn& rDestCol ) const
{
if ( ((ScMergeFlagAttr&)pPattern->GetItem( ATTR_MERGE_FLAG )).IsScenario() )
if ( rDestCol.pAttrArray->HasAttrib( nStart, nEnd, HASATTR_PROTECTED ) )
- bOk = FALSE;
+ bOk = sal_False;
pPattern = aAttrIter.Next( nStart, nEnd );
}
@@ -1488,7 +1488,7 @@ void ScColumn::MarkScenarioIn( ScMarkData& rDestMark ) const
{
aRange.aStart.SetRow( nStart );
aRange.aEnd.SetRow( nEnd );
- rDestMark.SetMultiMarkArea( aRange, TRUE );
+ rDestMark.SetMultiMarkArea( aRange, sal_True );
}
pPattern = aAttrIter.Next( nStart, nEnd );
@@ -1765,7 +1765,7 @@ void ScColumn::UpdateInsertTabAbs(SCTAB nTable)
}
-void ScColumn::UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo )
+void ScColumn::UpdateDeleteTab( SCTAB nTable, sal_Bool bIsMove, ScColumn* pRefUndo )
{
if (nTab > nTable)
pAttrArray->SetTab(--nTab);
@@ -1781,7 +1781,7 @@ void ScColumn::UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn*
pRefUndo )
back the formula cell while keeping the original note. */
ScBaseCell* pSave = pRefUndo ? pOld->CloneWithoutNote( *pDocument ) : 0;
- BOOL bChanged = pOld->UpdateDeleteTab(nTable, bIsMove);
+ sal_Bool bChanged = pOld->UpdateDeleteTab(nTable, bIsMove);
if ( nRow != pItems[i].nRow )
Search( nRow, i ); // Listener geloescht/eingefuegt?
@@ -1815,7 +1815,7 @@ void ScColumn::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo )
}
-void ScColumn::UpdateCompile( BOOL bForceIfNameInUse )
+void ScColumn::UpdateCompile( sal_Bool bForceIfNameInUse )
{
if (pItems)
for (SCSIZE i = 0; i < nCount; i++)
@@ -1846,9 +1846,9 @@ void ScColumn::SetTabNo(SCTAB nNewTab)
}
-BOOL ScColumn::IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const
+sal_Bool ScColumn::IsRangeNameInUse(SCROW nRow1, SCROW nRow2, sal_uInt16 nIndex) const
{
- BOOL bInUse = FALSE;
+ sal_Bool bInUse = sal_False;
if (pItems)
for (SCSIZE i = 0; !bInUse && (i < nCount); i++)
if ((pItems[i].nRow >= nRow1) &&
@@ -1858,7 +1858,7 @@ BOOL ScColumn::IsRangeNameInUse(SCROW nRow1, SCROW nRow2, USHORT nIndex) const
return bInUse;
}
-void ScColumn::FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<USHORT>& rIndexes) const
+void ScColumn::FindRangeNamesInUse(SCROW nRow1, SCROW nRow2, std::set<sal_uInt16>& rIndexes) const
{
if (pItems)
for (SCSIZE i = 0; i < nCount; i++)
@@ -1900,8 +1900,8 @@ void ScColumn::SetDirtyVar()
void ScColumn::SetDirty()
{
// wird nur dokumentweit verwendet, kein FormulaTrack
- BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+ pDocument->SetAutoCalc( sal_False ); // Mehrfachberechnungen vermeiden
for (SCSIZE i=0; i<nCount; i++)
{
ScFormulaCell* p = (ScFormulaCell*) pItems[i].pCell;
@@ -1920,8 +1920,8 @@ void ScColumn::SetDirty( const ScRange& rRange )
{ // broadcastet alles innerhalb eines Range, mit FormulaTrack
if ( !pItems || !nCount )
return ;
- BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+ pDocument->SetAutoCalc( sal_False ); // Mehrfachberechnungen vermeiden
SCROW nRow2 = rRange.aEnd.Row();
ScAddress aPos( nCol, 0, nTab );
ScHint aHint( SC_HINT_DATACHANGED, aPos, NULL );
@@ -1949,8 +1949,8 @@ void ScColumn::SetTableOpDirty( const ScRange& rRange )
{
if ( !pItems || !nCount )
return ;
- BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // no multiple recalculation
+ sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+ pDocument->SetAutoCalc( sal_False ); // no multiple recalculation
SCROW nRow2 = rRange.aEnd.Row();
ScAddress aPos( nCol, 0, nTab );
ScHint aHint( SC_HINT_TABLEOPDIRTY, aPos, NULL );
@@ -1976,8 +1976,8 @@ void ScColumn::SetTableOpDirty( const ScRange& rRange )
void ScColumn::SetDirtyAfterLoad()
{
- BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+ pDocument->SetAutoCalc( sal_False ); // Mehrfachberechnungen vermeiden
for (SCSIZE i=0; i<nCount; i++)
{
ScFormulaCell* p = (ScFormulaCell*) pItems[i].pCell;
@@ -2009,8 +2009,8 @@ void ScColumn::SetDirtyAfterLoad()
void ScColumn::SetRelNameDirty()
{
- BOOL bOldAutoCalc = pDocument->GetAutoCalc();
- pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden
+ sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+ pDocument->SetAutoCalc( sal_False ); // Mehrfachberechnungen vermeiden
for (SCSIZE i=0; i<nCount; i++)
{
ScFormulaCell* p = (ScFormulaCell*) pItems[i].pCell;
@@ -2058,9 +2058,9 @@ void ScColumn::CompileAll()
{
SCROW nRow = pItems[i].nRow;
// fuer unbedingtes kompilieren
- // bCompile=TRUE und pCode->nError=0
+ // bCompile=sal_True und pCode->nError=0
((ScFormulaCell*)pCell)->GetCode()->SetCodeError( 0 );
- ((ScFormulaCell*)pCell)->SetCompile( TRUE );
+ ((ScFormulaCell*)pCell)->SetCompile( sal_True );
((ScFormulaCell*)pCell)->CompileTokenArray();
if ( nRow != pItems[i].nRow )
Search( nRow, i ); // Listener geloescht/eingefuegt?
@@ -2115,14 +2115,14 @@ void ScColumn::ResetChanged( SCROW nStartRow, SCROW nEndRow )
}
-BOOL ScColumn::HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const
+sal_Bool ScColumn::HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const
{
// used in GetOptimalHeight - ambiguous script type counts as edit cell
SCROW nRow = 0;
SCSIZE nIndex;
Search(nStartRow,nIndex);
- while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : FALSE )
+ while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : sal_False )
{
ScBaseCell* pCell = pItems[nIndex].pCell;
CellType eCellType = pCell->GetCellType();
@@ -2131,17 +2131,17 @@ BOOL ScColumn::HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst)
const
((eCellType == CELLTYPE_FORMULA) && ((ScFormulaCell*)pCell)->IsMultilineResult()) )
{
rFirst = nRow;
- return TRUE;
+ return sal_True;
}
++nIndex;
}
- return FALSE;
+ return sal_False;
}
SCsROW ScColumn::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
- BOOL bUp, BOOL bInSelection, const ScMarkData& rMark )
+ sal_Bool bUp, sal_Bool bInSelection, const ScMarkData& rMark )
{
if (bInSelection)
{
@@ -2156,8 +2156,8 @@ SCsROW ScColumn::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle,
}
-BOOL ScColumn::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle,
- BOOL bUp, BOOL bInSelection, const ScMarkData& rMark )
+sal_Bool ScColumn::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet*
pSearchStyle,
+ sal_Bool bUp, sal_Bool bInSelection, const ScMarkData& rMark )
{
if (bInSelection)
{
@@ -2165,7 +2165,7 @@ BOOL ScColumn::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const
ScStyleShe
return pAttrArray->SearchStyleRange( rRow, rEndRow, pSearchStyle, bUp,
(ScMarkArray*) rMark.GetArray()+nCol ); //! const
else
- return FALSE;
+ return sal_False;
}
else
return pAttrArray->SearchStyleRange( rRow, rEndRow, pSearchStyle, bUp, NULL );
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 00e8b11..6327523 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -80,7 +80,7 @@
// -----------------------------------------------------------------------
-inline BOOL IsAmbiguousScript( BYTE nScript )
+inline sal_Bool IsAmbiguousScript( sal_uInt8 nScript )
{
//! move to a header file
return ( nScript != SCRIPTTYPE_LATIN &&
@@ -100,7 +100,7 @@ inline BOOL IsAmbiguousScript( BYTE nScript )
long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- BOOL bWidth, const ScNeededSizeOptions& rOptions )
+ sal_Bool bWidth, const ScNeededSizeOptions& rOptions )
{
long nValue=0;
SCSIZE nIndex;
@@ -143,7 +143,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
const SfxPoolItem* pCondItem;
SvxCellHorJustify eHorJust;
if (pCondSet &&
- pCondSet->GetItemState(ATTR_HOR_JUSTIFY, TRUE, &pCondItem) == SFX_ITEM_SET)
+ pCondSet->GetItemState(ATTR_HOR_JUSTIFY, sal_True, &pCondItem) == SFX_ITEM_SET)
eHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem*)pCondItem)->GetValue();
else
eHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)
@@ -152,7 +152,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
if ( eHorJust == SVX_HOR_JUSTIFY_BLOCK )
bBreak = true;
else if ( pCondSet &&
- pCondSet->GetItemState(ATTR_LINEBREAK, TRUE, &pCondItem) == SFX_ITEM_SET)
+ pCondSet->GetItemState(ATTR_LINEBREAK, sal_True, &pCondItem) == SFX_ITEM_SET)
bBreak = ((const SfxBoolItem*)pCondItem)->GetValue();
else
bBreak = ((const SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue();
@@ -164,7 +164,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
// get other attributes from pattern and conditional formatting
SvxCellOrientation eOrient = pPattern->GetCellOrientation( pCondSet );
- BOOL bAsianVertical = ( eOrient == SVX_ORIENTATION_STACKED &&
+ sal_Bool bAsianVertical = ( eOrient == SVX_ORIENTATION_STACKED &&
((const SfxBoolItem&)pPattern->GetItem( ATTR_VERTICAL_ASIAN, pCondSet
)).GetValue() );
if ( bAsianVertical )
bBreak = false;
@@ -177,14 +177,14 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
if ( eOrient == SVX_ORIENTATION_STANDARD )
{
if (pCondSet &&
- pCondSet->GetItemState(ATTR_ROTATE_VALUE, TRUE, &pCondItem) == SFX_ITEM_SET)
+ pCondSet->GetItemState(ATTR_ROTATE_VALUE, sal_True, &pCondItem) ==
SFX_ITEM_SET)
nRotate = ((const SfxInt32Item*)pCondItem)->GetValue();
else
nRotate = ((const SfxInt32Item&)pPattern->GetItem(ATTR_ROTATE_VALUE)).GetValue();
if ( nRotate )
{
if (pCondSet &&
- pCondSet->GetItemState(ATTR_ROTATE_MODE, TRUE, &pCondItem) == SFX_ITEM_SET)
+ pCondSet->GetItemState(ATTR_ROTATE_MODE, sal_True, &pCondItem) ==
SFX_ITEM_SET)
eRotMode = (SvxRotateMode)((const SvxRotateModeItem*)pCondItem)->GetValue();
else
eRotMode = (SvxRotateMode)((const SvxRotateModeItem&)
@@ -200,26 +200,26 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
// ignore orientation/rotation if "repeat" is active
eOrient = SVX_ORIENTATION_STANDARD;
nRotate = 0;
- bAsianVertical = FALSE;
+ bAsianVertical = sal_False;
}
const SvxMarginItem* pMargin;
if (pCondSet &&
- pCondSet->GetItemState(ATTR_MARGIN, TRUE, &pCondItem) == SFX_ITEM_SET)
+ pCondSet->GetItemState(ATTR_MARGIN, sal_True, &pCondItem) == SFX_ITEM_SET)
pMargin = (const SvxMarginItem*) pCondItem;
else
pMargin = (const SvxMarginItem*) &pPattern->GetItem(ATTR_MARGIN);
- USHORT nIndent = 0;
+ sal_uInt16 nIndent = 0;
if ( eHorJust == SVX_HOR_JUSTIFY_LEFT )
{
if (pCondSet &&
- pCondSet->GetItemState(ATTR_INDENT, TRUE, &pCondItem) == SFX_ITEM_SET)
+ pCondSet->GetItemState(ATTR_INDENT, sal_True, &pCondItem) == SFX_ITEM_SET)
nIndent = ((const SfxUInt16Item*)pCondItem)->GetValue();
else
nIndent = ((const SfxUInt16Item&)pPattern->GetItem(ATTR_INDENT)).GetValue();
}
- BYTE nScript = pDocument->GetScriptType( nCol, nRow, nTab, pCell );
+ sal_uInt8 nScript = pDocument->GetScriptType( nCol, nRow, nTab, pCell );
if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType();
// also call SetFont for edit cells, because bGetFont may be set only once
@@ -233,10 +233,10 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
pDev->SetFont(aFont);
}
- BOOL bAddMargin = TRUE;
+ sal_Bool bAddMargin = sal_True;
CellType eCellType = pCell->GetCellType();
- BOOL bEditEngine = ( eCellType == CELLTYPE_EDIT ||
+ sal_Bool bEditEngine = ( eCellType == CELLTYPE_EDIT ||
eOrient == SVX_ORIENTATION_STACKED ||
IsAmbiguousScript( nScript ) ||
((eCellType == CELLTYPE_FORMULA) &&
((ScFormulaCell*)pCell)->IsMultilineResult()) );
@@ -246,10 +246,10 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
String aValStr;
Color* pColor;
SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
- ULONG nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
+ sal_uIntPtr nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
ScCellFormat::GetString( pCell, nFormat, aValStr, &pColor,
*pFormatter,
- TRUE, rOptions.bFormula, ftCheck );
+ sal_True, rOptions.bFormula, ftCheck );
if (aValStr.Len())
{
// SetFont ist nach oben verschoben
@@ -275,7 +275,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
else if ( rOptions.bTotalSize )
{
nWidth = (long) ( pDocument->GetColWidth( nCol,nTab ) * nPPT );
- bAddMargin = FALSE;
+ bAddMargin = sal_False;
// nur nach rechts:
//! unterscheiden nach Ausrichtung oben/unten (nur Text/ganze Hoehe)
if ( pPattern->GetRotateDir( pCondSet ) == SC_ROTDIR_RIGHT )
@@ -324,7 +324,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
* nPPT );
nDocPixel = (nDocPixel * 9) / 10; // zur Sicherheit
if ( aSize.Width() > nDocPixel )
- bEditEngine = TRUE;
+ bEditEngine = sal_True;
}
}
}
@@ -339,7 +339,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
// am Dokument speichern ?
ScFieldEditEngine* pEngine = pDocument->CreateFieldEditEngine();
- pEngine->SetUpdateMode( FALSE );
+ pEngine->SetUpdateMode( sal_False );
MapMode aOld = pDev->GetMapMode();
pDev->SetMapMode( aHMMMode );
pEngine->SetRefDevice( pDev );
@@ -364,7 +364,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
else if (bBreak)
{
double fWidthFactor = nPPTX;
- BOOL bTextWysiwyg = ( pDev->GetOutDevType() == OUTDEV_PRINTER );
+ sal_Bool bTextWysiwyg = ( pDev->GetOutDevType() == OUTDEV_PRINTER );
if ( bTextWysiwyg )
{
// #95593# if text is formatted for printer, don't use PixelToLogic,
@@ -407,22 +407,22 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
{
Color* pColor;
SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
- ULONG nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
+ sal_uIntPtr nFormat = pPattern->GetNumberFormat( pFormatter, pCondSet );
String aString;
ScCellFormat::GetString( pCell, nFormat, aString, &pColor,
*pFormatter,
- TRUE, rOptions.bFormula, ftCheck );
+ sal_True, rOptions.bFormula, ftCheck );
if (aString.Len())
pEngine->SetTextNewDefaults(aString, pSet);
else
pEngine->SetDefaults(pSet);
}
- BOOL bEngineVertical = pEngine->IsVertical();
+ sal_Bool bEngineVertical = pEngine->IsVertical();
pEngine->SetVertical( bAsianVertical );
- pEngine->SetUpdateMode( TRUE );
+ pEngine->SetUpdateMode( sal_True );
- BOOL bEdWidth = bWidth;
+ sal_Bool bEdWidth = bWidth;
if ( eOrient != SVX_ORIENTATION_STANDARD && eOrient != SVX_ORIENTATION_STACKED )
bEdWidth = !bEdWidth;
if ( nRotate )
@@ -440,7 +440,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
else if ( rOptions.bTotalSize )
{
nWidth = (long) ( pDocument->GetColWidth( nCol,nTab ) * nPPT );
- bAddMargin = FALSE;
+ bAddMargin = sal_False;
if ( pPattern->GetRotateDir( pCondSet ) == SC_ROTDIR_RIGHT )
nWidth += (long)( pDocument->GetRowHeight( nRow,nTab ) *
nPPT * nCosAbs / nSinAbs );
@@ -516,7 +516,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
// 20 * nZoom/100
// bedingte Formatierung hier nicht interessant
- INT16 nFlags = ((const ScMergeFlagAttr&)pPattern->GetItem(ATTR_MERGE_FLAG)).GetValue();
+ sal_Int16 nFlags = ((const
ScMergeFlagAttr&)pPattern->GetItem(ATTR_MERGE_FLAG)).GetValue();
if (nFlags & SC_MF_AUTO)
nValue += (rZoomX.GetNumerator()*20)/rZoomX.GetDenominator();
}
@@ -525,7 +525,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev,
}
long ScColumn::GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev,
- BOOL bWidth )
+ sal_Bool bWidth )
{
long nValue=0;
if ( nIndex < nCount )
@@ -536,9 +536,9 @@ long ScColumn::GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev,
String aValStr;
Color* pColor;
SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
- ULONG nFormat = pPattern->GetNumberFormat( pFormatter );
+ sal_uIntPtr nFormat = pPattern->GetNumberFormat( pFormatter );
ScCellFormat::GetString( pCell, nFormat, aValStr, &pColor,
- *pFormatter, TRUE, FALSE, ftCheck );
+ *pFormatter, sal_True, sal_False, ftCheck );
if ( aValStr.Len() )
{
if ( bWidth )
@@ -550,20 +550,20 @@ long ScColumn::GetSimpleTextNeededSize( SCSIZE nIndex, OutputDevice* pDev,
return nValue;
}
-USHORT ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY,
+sal_uInt16 ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- BOOL bFormula, USHORT nOldWidth,
+ sal_Bool bFormula, sal_uInt16 nOldWidth,
const ScMarkData* pMarkData,
const ScColWidthParam* pParam )
{
if (nCount == 0)
return nOldWidth;
- USHORT nWidth = (USHORT) (nOldWidth * nPPTX);
- BOOL bFound = FALSE;
+ sal_uInt16 nWidth = (sal_uInt16) (nOldWidth * nPPTX);
+ sal_Bool bFound = sal_False;
SCSIZE nIndex;
- ScMarkedDataIter aDataIter(this, pMarkData, TRUE);
+ ScMarkedDataIter aDataIter(this, pMarkData, sal_True);
if ( pParam && pParam->mbSimpleText )
{ // alles eins bis auf NumberFormate
const ScPatternAttr* pPattern = GetPattern( 0 );
@@ -577,14 +577,14 @@ USHORT ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double
nP
// Try to find the row that has the longest string, and measure the width of that string.
SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
- ULONG nFormat = pPattern->GetNumberFormat( pFormatter );
+ sal_uIntPtr nFormat = pPattern->GetNumberFormat( pFormatter );
String aLongStr;
Color* pColor;
if (pParam->mnMaxTextRow >= 0)
{
ScBaseCell* pCell = GetCell(pParam->mnMaxTextRow);
ScCellFormat::GetString(
- pCell, nFormat, aLongStr, &pColor, *pFormatter, TRUE, FALSE, ftCheck );
+ pCell, nFormat, aLongStr, &pColor, *pFormatter, sal_True, sal_False, ftCheck );
}
else
{
@@ -598,7 +598,7 @@ USHORT ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nP
ScBaseCell* pCell = pItems[nIndex].pCell;
String aValStr;
ScCellFormat::GetString(
- pCell, nFormat, aValStr, &pColor, *pFormatter, TRUE, FALSE, ftCheck );
+ pCell, nFormat, aValStr, &pColor, *pFormatter, sal_True, sal_False, ftCheck );
if (aValStr.Len() > nLongLen)
{
@@ -610,7 +610,7 @@ USHORT ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nP
if (aLongStr.Len())
{
- nWidth = pDev->GetTextWidth(aLongStr) + static_cast<USHORT>(nMargin);
+ nWidth = pDev->GetTextWidth(aLongStr) + static_cast<sal_uInt16>(nMargin);
bFound = true;
}
}
@@ -619,27 +619,27 @@ USHORT ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double
nP
ScNeededSizeOptions aOptions;
aOptions.bFormula = bFormula;
const ScPatternAttr* pOldPattern = NULL;
- BYTE nOldScript = 0;
+ sal_uInt8 nOldScript = 0;
while (aDataIter.Next( nIndex ))
{
SCROW nRow = pItems[nIndex].nRow;
- BYTE nScript = pDocument->GetScriptType( nCol, nRow, nTab, pItems[nIndex].pCell );
+ sal_uInt8 nScript = pDocument->GetScriptType( nCol, nRow, nTab, pItems[nIndex].pCell );
if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType();
const ScPatternAttr* pPattern = GetPattern( nRow );
aOptions.pPattern = pPattern;
aOptions.bGetFont = (pPattern != pOldPattern || nScript != nOldScript);
- USHORT nThis = (USHORT) GetNeededSize( nRow, pDev, nPPTX, nPPTY,
- rZoomX, rZoomY, TRUE, aOptions );
+ sal_uInt16 nThis = (sal_uInt16) GetNeededSize( nRow, pDev, nPPTX, nPPTY,
+ rZoomX, rZoomY, sal_True, aOptions );
pOldPattern = pPattern;
if (nThis)
{
if (nThis>nWidth || !bFound)
{
nWidth = nThis;
- bFound = TRUE;
+ bFound = sal_True;
}
}
}
@@ -648,16 +648,16 @@ USHORT ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double
nP
if (bFound)
{
nWidth += 2;
- USHORT nTwips = (USHORT) (nWidth / nPPTX);
+ sal_uInt16 nTwips = (sal_uInt16) (nWidth / nPPTX);
return nTwips;
}
else
return nOldWidth;
}
-USHORT lcl_GetAttribHeight( const ScPatternAttr& rPattern, USHORT nFontHeightId )
+sal_uInt16 lcl_GetAttribHeight( const ScPatternAttr& rPattern, sal_uInt16 nFontHeightId )
{
- USHORT nHeight = (USHORT) ((const SvxFontHeightItem&)
rPattern.GetItem(nFontHeightId)).GetHeight();
+ sal_uInt16 nHeight = (sal_uInt16) ((const SvxFontHeightItem&)
rPattern.GetItem(nFontHeightId)).GetHeight();
const SvxMarginItem* pMargin = (const SvxMarginItem*) &rPattern.GetItem(ATTR_MARGIN);
nHeight += nHeight / 5;
// gibt bei 10pt 240
@@ -672,7 +672,7 @@ USHORT lcl_GetAttribHeight( const ScPatternAttr& rPattern, USHORT nFontHeightId
if ( nHeight + 240 > ScGlobal::nDefFontHeight )
{
- nHeight = sal::static_int_cast<USHORT>( nHeight + ScGlobal::nDefFontHeight );
+ nHeight = sal::static_int_cast<sal_uInt16>( nHeight + ScGlobal::nDefFontHeight );
nHeight -= 240;
}
@@ -691,11 +691,11 @@ USHORT lcl_GetAttribHeight( const ScPatternAttr& rPattern, USHORT
nFontHeightId
// nMinHeight, nMinStart zur Optimierung: ab nRow >= nMinStart ist mindestens nMinHeight
// (wird nur bei bStdAllowed ausgewertet)
-void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight,
+void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16* pHeight,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- BOOL bShrink, USHORT nMinHeight, SCROW nMinStart )
+ sal_Bool bShrink, sal_uInt16 nMinHeight, SCROW nMinStart )
{
ScAttrIterator aIter( pAttrArray, nStartRow, nEndRow );
@@ -720,11 +720,11 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT*
pHeight
else
{
SCROW nRow = 0;
- BOOL bStdAllowed = (pPattern->GetCellOrientation() == SVX_ORIENTATION_STANDARD);
- BOOL bStdOnly = FALSE;
+ sal_Bool bStdAllowed = (pPattern->GetCellOrientation() == SVX_ORIENTATION_STANDARD);
+ sal_Bool bStdOnly = sal_False;
if (bStdAllowed)
{
- BOOL bBreak = ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue() ||
+ sal_Bool bBreak = ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue() ||
((SvxCellHorJustify)((const SvxHorJustifyItem&)pPattern->
GetItem( ATTR_HOR_JUSTIFY )).GetValue() ==
SVX_HOR_JUSTIFY_BLOCK);
@@ -733,12 +733,12 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT*
pHeight
// bedingte Formatierung: Zellen durchgehen
if ( bStdOnly && ((const SfxUInt32Item&)pPattern->
GetItem(ATTR_CONDITIONAL)).GetValue() )
- bStdOnly = FALSE;
+ bStdOnly = sal_False;
// gedrehter Text: Zellen durchgehen
if ( bStdOnly && ((const SfxInt32Item&)pPattern->
GetItem(ATTR_ROTATE_VALUE)).GetValue() )
- bStdOnly = FALSE;
+ bStdOnly = sal_False;
}
if (bStdOnly)
@@ -746,11 +746,11 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT*
pHeight
{
if (nEditPos == nStart)
{
- bStdOnly = FALSE;
+ bStdOnly = sal_False;
if (nEnd > nEditPos)
nNextEnd = nEnd;
nEnd = nEditPos; // einzeln ausrechnen
- bStdAllowed = FALSE; // wird auf jeden Fall per Zelle
berechnet
+ bStdAllowed = sal_False; // wird auf jeden Fall per
Zelle berechnet
}
else
{
@@ -761,11 +761,11 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT*
pHeight
if (bStdAllowed)
{
- USHORT nLatHeight = 0;
- USHORT nCjkHeight = 0;
- USHORT nCtlHeight = 0;
- USHORT nDefHeight;
- BYTE nDefScript = ScGlobal::GetDefaultScriptType();
+ sal_uInt16 nLatHeight = 0;
+ sal_uInt16 nCjkHeight = 0;
+ sal_uInt16 nCtlHeight = 0;
+ sal_uInt16 nDefHeight;
+ sal_uInt8 nDefScript = ScGlobal::GetDefaultScriptType();
if ( nDefScript == SCRIPTTYPE_ASIAN )
nDefHeight = nCjkHeight = lcl_GetAttribHeight( *pPattern, ATTR_CJK_FONT_HEIGHT
);
else if ( nDefScript == SCRIPTTYPE_COMPLEX )
@@ -792,7 +792,7 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight
Search(nStart,nIndex);
while ( nIndex < nCount && (nRow=pItems[nIndex].nRow) <= nEnd )
{
- BYTE nScript = pDocument->GetScriptType( nCol, nRow, nTab,
pItems[nIndex].pCell );
+ sal_uInt8 nScript = pDocument->GetScriptType( nCol, nRow, nTab,
pItems[nIndex].pCell );
if ( nScript != nDefScript )
{
if ( nScript == SCRIPTTYPE_ASIAN )
@@ -828,16 +828,16 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT*
pHeight
SCSIZE nIndex;
Search(nStart,nIndex);
- while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEnd) : FALSE )
+ while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEnd) : sal_False )
{
// Zellhoehe nur berechnen, wenn sie spaeter auch gebraucht wird (#37928#)
if ( bShrink || !(pDocument->GetRowFlags(nRow, nTab) & CR_MANUALSIZE) )
{
aOptions.pPattern = pPattern;
- USHORT nHeight = (USHORT)
+ sal_uInt16 nHeight = (sal_uInt16)
( GetNeededSize( nRow, pDev, nPPTX, nPPTY,
- rZoomX, rZoomY, FALSE, aOptions ) / nPPTY );
+ rZoomX, rZoomY, sal_False, aOptions ) / nPPTY
);
if (nHeight > pHeight[nRow-nStartRow])
pHeight[nRow-nStartRow] = nHeight;
}
@@ -857,9 +857,9 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight
}
}
-BOOL ScColumn::GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& rData) const
+sal_Bool ScColumn::GetNextSpellingCell(SCROW& nRow, sal_Bool bInSel, const ScMarkData& rData) const
{
- BOOL bStop = FALSE;
+ sal_Bool bStop = sal_False;
CellType eCellType;
SCSIZE nIndex;
if (!bInSel && Search(nRow, nIndex))
@@ -868,17 +868,17 @@ BOOL ScColumn::GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const
ScMarkData& r
if ( (eCellType == CELLTYPE_STRING || eCellType == CELLTYPE_EDIT) &&
!(HasAttrib( nRow, nRow, HASATTR_PROTECTED) &&
pDocument->IsTabProtected(nTab)) )
- return TRUE;
+ return sal_True;
}
while (!bStop)
{
if (bInSel)
{
- nRow = rData.GetNextMarked(nCol, nRow, FALSE);
+ nRow = rData.GetNextMarked(nCol, nRow, sal_False);
if (!ValidRow(nRow))
{
nRow = MAXROW+1;
- bStop = TRUE;
+ bStop = sal_True;
}
else
{
@@ -886,7 +886,7 @@ BOOL ScColumn::GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const ScMarkData& r
if ( (eCellType == CELLTYPE_STRING || eCellType == CELLTYPE_EDIT) &&
!(HasAttrib( nRow, nRow, HASATTR_PROTECTED) &&
pDocument->IsTabProtected(nTab)) )
- return TRUE;
+ return sal_True;
else
nRow++;
}
@@ -897,17 +897,17 @@ BOOL ScColumn::GetNextSpellingCell(SCROW& nRow, BOOL bInSel, const
ScMarkData& r
if ( (eCellType == CELLTYPE_STRING || eCellType == CELLTYPE_EDIT) &&
!(HasAttrib( nRow, nRow, HASATTR_PROTECTED) &&
pDocument->IsTabProtected(nTab)) )
- return TRUE;
+ return sal_True;
else
nRow++;
}
else
{
nRow = MAXROW+1;
- bStop = TRUE;
+ bStop = sal_True;
}
}
- return FALSE;
+ return sal_False;
}
// =========================================================================================
@@ -985,8 +985,8 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow )
pEngine->SetKernAsianPunctuation( pDocument->GetAsianKerning() );
}
pEngine->SetText( *pData );
- USHORT nParCount = pEngine->GetParagraphCount();
- for (USHORT nPar=0; nPar<nParCount; nPar++)
+ sal_uInt16 nParCount = pEngine->GetParagraphCount();
+ for (sal_uInt16 nPar=0; nPar<nParCount; nPar++)
{
pEngine->QuickRemoveCharAttribs( nPar );
const SfxItemSet& rOld = pEngine->GetParaAttribs( nPar );
@@ -997,16 +997,16 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow )
}
}
// URL-Felder in Text wandeln (andere gibt's nicht, darum pType=0)
- pEngine->RemoveFields( TRUE );
+ pEngine->RemoveFields( sal_True );
- BOOL bSpellErrors = pEngine->HasOnlineSpellErrors();
- BOOL bNeedObject = bSpellErrors || nParCount>1; // Errors/Absaetze
behalten
+ sal_Bool bSpellErrors = pEngine->HasOnlineSpellErrors();
+ sal_Bool bNeedObject = bSpellErrors || nParCount>1; //
Errors/Absaetze behalten
// ScEditAttrTester nicht mehr noetig, Felder sind raus
if ( bNeedObject )
// bleibt Edit-Zelle
{
- ULONG nCtrl = pEngine->GetControlWord();
- ULONG nWantBig = bSpellErrors ? EE_CNTRL_ALLOWBIGOBJS : 0;
+ sal_uIntPtr nCtrl = pEngine->GetControlWord();
+ sal_uIntPtr nWantBig = bSpellErrors ? EE_CNTRL_ALLOWBIGOBJS : 0;
if ( ( nCtrl & EE_CNTRL_ALLOWBIGOBJS ) != nWantBig )
pEngine->SetControlWord( (nCtrl & ~EE_CNTRL_ALLOWBIGOBJS) | nWantBig );
EditTextObject* pNewData = pEngine->CreateTextObject();
@@ -1029,14 +1029,14 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow )
// =========================================================================================
-BOOL ScColumn::TestTabRefAbs(SCTAB nTable)
+sal_Bool ScColumn::TestTabRefAbs(SCTAB nTable)
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if (pItems)
for (SCSIZE i = 0; i < nCount; i++)
if ( pItems[i].pCell->GetCellType() == CELLTYPE_FORMULA )
if (((ScFormulaCell*)pItems[i].pCell)->TestTabRefAbs(nTable))
- bRet = TRUE;
+ bRet = sal_True;
return bRet;
}
@@ -1054,7 +1054,7 @@ ScColumnIterator::~ScColumnIterator()
{
}
-BOOL ScColumnIterator::Next( SCROW& rRow, ScBaseCell*& rpCell )
+sal_Bool ScColumnIterator::Next( SCROW& rRow, ScBaseCell*& rpCell )
{
if ( nPos < pColumn->nCount )
{
@@ -1063,13 +1063,13 @@ BOOL ScColumnIterator::Next( SCROW& rRow, ScBaseCell*& rpCell )
{
rpCell = pColumn->pItems[nPos].pCell;
++nPos;
- return TRUE;
+ return sal_True;
}
}
rRow = 0;
rpCell = NULL;
- return FALSE;
+ return sal_False;
}
SCSIZE ScColumnIterator::GetIndex() const // Index zur letzen abgefragten
Zelle
@@ -1080,10 +1080,10 @@ SCSIZE ScColumnIterator::GetIndex() const // Index
zur letzen abgefragten Zell
// -----------------------------------------------------------------------------------------
ScMarkedDataIter::ScMarkedDataIter( const ScColumn* pCol, const ScMarkData* pMarkData,
- BOOL bAllIfNone ) :
+ sal_Bool bAllIfNone ) :
pColumn( pCol ),
pMarkIter( NULL ),
- bNext( TRUE ),
+ bNext( sal_True ),
bAll( bAllIfNone )
{
if (pMarkData && pMarkData->IsMultiMarked())
@@ -1095,9 +1095,9 @@ ScMarkedDataIter::~ScMarkedDataIter()
delete pMarkIter;
}
-BOOL ScMarkedDataIter::Next( SCSIZE& rIndex )
+sal_Bool ScMarkedDataIter::Next( SCSIZE& rIndex )
{
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
do
{
if (bNext)
@@ -1110,48 +1110,48 @@ BOOL ScMarkedDataIter::Next( SCSIZE& rIndex )
nBottom = MAXROW;
}
else
- return FALSE;
+ return sal_False;
}
pColumn->Search( nTop, nPos );
- bNext = FALSE;
- bAll = FALSE; // nur beim ersten Versuch
+ bNext = sal_False;
+ bAll = sal_False; // nur beim ersten Versuch
}
if ( nPos >= pColumn->nCount )
- return FALSE;
+ return sal_False;
if ( pColumn->pItems[nPos].nRow <= nBottom )
- bFound = TRUE;
+ bFound = sal_True;
else
- bNext = TRUE;
+ bNext = sal_True;
}
while (!bFound);
rIndex = nPos++;
- return TRUE;
+ return sal_True;
}
//------------
-BOOL ScColumn::IsEmptyData() const
+sal_Bool ScColumn::IsEmptyData() const
{
return (nCount == 0);
}
-BOOL ScColumn::IsEmptyVisData(BOOL bNotes) const
+sal_Bool ScColumn::IsEmptyVisData(sal_Bool bNotes) const
{
if (!pItems || nCount == 0)
- return TRUE;
+ return sal_True;
else
{
- BOOL bVisData = FALSE;
+ sal_Bool bVisData = sal_False;
SCSIZE i;
for (i=0; i<nCount && !bVisData; i++)
{
ScBaseCell* pCell = pItems[i].pCell;
if ( pCell->GetCellType() != CELLTYPE_NOTE || (bNotes && pCell->HasNote()) )
- bVisData = TRUE;
+ bVisData = sal_True;
}
return !bVisData;
}
@@ -1176,20 +1176,20 @@ SCSIZE ScColumn::VisibleCount( SCROW nStartRow, SCROW nEndRow ) const
return nVisCount;
}
-SCROW ScColumn::GetLastVisDataPos(BOOL bNotes) const
+SCROW ScColumn::GetLastVisDataPos(sal_Bool bNotes) const
{
SCROW nRet = 0;
if (pItems)
{
SCSIZE i;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
for (i=nCount; i>0 && !bFound; )
{
--i;
ScBaseCell* pCell = pItems[i].pCell;
if ( pCell->GetCellType() != CELLTYPE_NOTE || (bNotes && pCell->HasNote()) )
{
- bFound = TRUE;
+ bFound = sal_True;
nRet = pItems[i].nRow;
}
}
@@ -1197,19 +1197,19 @@ SCROW ScColumn::GetLastVisDataPos(BOOL bNotes) const
return nRet;
}
-SCROW ScColumn::GetFirstVisDataPos(BOOL bNotes) const
+SCROW ScColumn::GetFirstVisDataPos(sal_Bool bNotes) const
{
SCROW nRet = 0;
if (pItems)
{
SCSIZE i;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
for (i=0; i<nCount && !bFound; i++)
{
ScBaseCell* pCell = pItems[i].pCell;
if ( pCell->GetCellType() != CELLTYPE_NOTE || (bNotes && pCell->HasNote()) )
{
- bFound = TRUE;
+ bFound = sal_True;
nRet = pItems[i].nRow;
}
}
@@ -1217,53 +1217,53 @@ SCROW ScColumn::GetFirstVisDataPos(BOOL bNotes) const
return nRet;
}
-BOOL ScColumn::HasVisibleDataAt(SCROW nRow) const
+sal_Bool ScColumn::HasVisibleDataAt(SCROW nRow) const
{
SCSIZE nIndex;
if (Search(nRow, nIndex))
if (!pItems[nIndex].pCell->IsBlank())
- return TRUE;
+ return sal_True;
- return FALSE;
+ return sal_False;
}
-BOOL ScColumn::IsEmptyAttr() const
+sal_Bool ScColumn::IsEmptyAttr() const
{
if (pAttrArray)
return pAttrArray->IsEmpty();
else
- return TRUE;
+ return sal_True;
}
-BOOL ScColumn::IsEmpty() const
+sal_Bool ScColumn::IsEmpty() const
{
return (IsEmptyData() && IsEmptyAttr());
}
-BOOL ScColumn::IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes) const
+sal_Bool ScColumn::IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes) const
{
Rectangle aRect;
- if (pAttrArray->HasLines(nStartRow, nEndRow, aRect, TRUE, TRUE))
- return FALSE;
+ if (pAttrArray->HasLines(nStartRow, nEndRow, aRect, sal_True, sal_True))
+ return sal_False;
if ( nCount == 0 || !pItems )
- return TRUE;
+ return sal_True;
SCSIZE nIndex;
Search( nStartRow, nIndex );
while ( nIndex < nCount && pItems[nIndex].nRow <= nEndRow )
{
if ( !pItems[nIndex].pCell->IsBlank( bIgnoreNotes ) ) // found a cell
- return FALSE; // not empty
+ return sal_False; // not empty
++nIndex;
}
- return TRUE; // no cell
found
+ return sal_True; // no cell
found
}
SCSIZE ScColumn::GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const
{
SCSIZE nLines = 0;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
SCSIZE i;
if (pItems && (nCount > 0))
{
@@ -1319,9 +1319,9 @@ SCROW ScColumn::GetLastDataPos() const
return 0;
}
-BOOL ScColumn::GetPrevDataPos(SCROW& rRow) const
+sal_Bool ScColumn::GetPrevDataPos(SCROW& rRow) const
{
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
SCSIZE i = nCount;
while (!bFound && (i > 0))
{
@@ -1333,13 +1333,13 @@ BOOL ScColumn::GetPrevDataPos(SCROW& rRow) const
return bFound;
}
-BOOL ScColumn::GetNextDataPos(SCROW& rRow) const // greater than rRow
+sal_Bool ScColumn::GetNextDataPos(SCROW& rRow) const // greater than rRow
{
SCSIZE nIndex;
if (Search( rRow, nIndex ))
++nIndex; // next cell
- BOOL bMore = ( nIndex < nCount );
+ sal_Bool bMore = ( nIndex < nCount );
if ( bMore )
rRow = pItems[nIndex].nRow;
return bMore;
@@ -1348,12 +1348,12 @@ BOOL ScColumn::GetNextDataPos(SCROW& rRow) const // greater
than rRow
void ScColumn::FindDataAreaPos(SCROW& rRow, long nMovY) const
{
if (!nMovY) return;
- BOOL bForward = (nMovY>0);
+ sal_Bool bForward = (nMovY>0);
SCSIZE nIndex;
- BOOL bThere = Search(rRow, nIndex);
+ sal_Bool bThere = Search(rRow, nIndex);
if (bThere && pItems[nIndex].pCell->IsBlank())
- bThere = FALSE;
+ bThere = sal_False;
if (bThere)
{
@@ -1393,7 +1393,7 @@ void ScColumn::FindDataAreaPos(SCROW& rRow, long nMovY) const
}
if (nLast==rRow)
{
- bThere = FALSE;
+ bThere = sal_False;
nIndex = bForward ? nOldIndex+1 : nOldIndex;
}
else
@@ -1423,7 +1423,7 @@ void ScColumn::FindDataAreaPos(SCROW& rRow, long nMovY) const
}
}
-BOOL ScColumn::HasDataAt(SCROW nRow) const
+sal_Bool ScColumn::HasDataAt(SCROW nRow) const
{
/* SCSIZE nIndex;
return Search( nRow, nIndex );
@@ -1434,13 +1434,13 @@ BOOL ScColumn::HasDataAt(SCROW nRow) const
SCSIZE nIndex;
if (Search(nRow, nIndex))
if (!pItems[nIndex].pCell->IsBlank())
- return TRUE;
+ return sal_True;
- return FALSE;
+ return sal_False;
}
-BOOL ScColumn::IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const
+sal_Bool ScColumn::IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const
{
if (pAttrArray && rCol.pAttrArray)
return pAttrArray->IsAllEqual( *rCol.pAttrArray, nStartRow, nEndRow );
@@ -1448,7 +1448,7 @@ BOOL ScColumn::IsAllAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW
nEnd
return !pAttrArray && !rCol.pAttrArray;
}
-BOOL ScColumn::IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const
+sal_Bool ScColumn::IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow, SCROW nEndRow ) const
{
if (pAttrArray && rCol.pAttrArray)
return pAttrArray->IsVisibleEqual( *rCol.pAttrArray, nStartRow, nEndRow );
@@ -1456,43 +1456,43 @@ BOOL ScColumn::IsVisibleAttrEqual( const ScColumn& rCol, SCROW nStartRow,
SCROW
return !pAttrArray && !rCol.pAttrArray;
}
-BOOL ScColumn::GetFirstVisibleAttr( SCROW& rFirstRow ) const
+sal_Bool ScColumn::GetFirstVisibleAttr( SCROW& rFirstRow ) const
{
if (pAttrArray)
return pAttrArray->GetFirstVisibleAttr( rFirstRow );
else
- return FALSE;
+ return sal_False;
}
-BOOL ScColumn::GetLastVisibleAttr( SCROW& rLastRow ) const
+sal_Bool ScColumn::GetLastVisibleAttr( SCROW& rLastRow ) const
{
if (pAttrArray)
{
// row of last cell is needed
- SCROW nLastData = GetLastVisDataPos( TRUE ); // always including notes, 0 if none
+ SCROW nLastData = GetLastVisDataPos( sal_True ); // always including notes, 0 if none
return pAttrArray->GetLastVisibleAttr( rLastRow, nLastData );
}
else
- return FALSE;
+ return sal_False;
}
-BOOL ScColumn::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const
+sal_Bool ScColumn::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const
{
if (pAttrArray)
return pAttrArray->HasVisibleAttrIn( nStartRow, nEndRow );
else
- return FALSE;
+ return sal_False;
}
-void ScColumn::FindUsed( SCROW nStartRow, SCROW nEndRow, BOOL* pUsed ) const
+void ScColumn::FindUsed( SCROW nStartRow, SCROW nEndRow, sal_Bool* pUsed ) const
{
SCROW nRow = 0;
SCSIZE nIndex;
Search( nStartRow, nIndex );
- while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : FALSE )
+ while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : sal_False )
{
- pUsed[nRow-nStartRow] = TRUE;
+ pUsed[nRow-nStartRow] = sal_True;
++nIndex;
}
}
@@ -1593,7 +1593,7 @@ void ScColumn::CompileDBFormula()
}
}
-void ScColumn::CompileDBFormula( BOOL bCreateFormulaString )
+void ScColumn::CompileDBFormula( sal_Bool bCreateFormulaString )
{
if (pItems)
for (SCSIZE i = 0; i < nCount; i++)
@@ -1604,7 +1604,7 @@ void ScColumn::CompileDBFormula( BOOL bCreateFormulaString )
}
}
-void ScColumn::CompileNameFormula( BOOL bCreateFormulaString )
+void ScColumn::CompileNameFormula( sal_Bool bCreateFormulaString )
{
if (pItems)
for (SCSIZE i = 0; i < nCount; i++)
@@ -1629,13 +1629,13 @@ void ScColumn::CompileColRowNameFormula()
void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
{
double nValue = 0.0;
- BOOL bVal = FALSE;
- BOOL bCell = TRUE;
+ sal_Bool bVal = sal_False;
+ sal_Bool bCell = sal_True;
switch (pCell->GetCellType())
{
case CELLTYPE_VALUE:
nValue = ((ScValueCell*)pCell)->GetValue();
- bVal = TRUE;
+ bVal = sal_True;
break;
case CELLTYPE_FORMULA:
{
@@ -1645,19 +1645,19 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
if ( pFC->GetErrCode() )
{
if ( rData.eFunc != SUBTOTAL_FUNC_CNT ) // fuer Anzahl einfach
weglassen
- rData.bError = TRUE;
+ rData.bError = sal_True;
}
else if (pFC->IsValue())
{
nValue = pFC->GetValue();
- bVal = TRUE;
+ bVal = sal_True;
}
// sonst Text
}
}
break;
case CELLTYPE_NOTE:
- bCell = FALSE;
+ bCell = sal_False;
break;
// bei Strings nichts
default:
@@ -1676,7 +1676,7 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
{
++rData.nCount;
if (!SubTotal::SafePlus( rData.nVal, nValue ))
- rData.bError = TRUE;
+ rData.bError = sal_True;
}
break;
case SUBTOTAL_FUNC_CNT: // nur Werte
@@ -1709,10 +1709,10 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell )
void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark,
ScFunctionData& rData,
ScFlatBoolRowSegments& rHiddenRows,
- BOOL bDoExclude, SCROW nExStartRow, SCROW nExEndRow )
+ sal_Bool bDoExclude, SCROW nExStartRow, SCROW nExEndRow )
{
SCSIZE nIndex;
- ScMarkedDataIter aDataIter(this, &rMark, FALSE);
+ ScMarkedDataIter aDataIter(this, &rMark, sal_False);
while (aDataIter.Next( nIndex ))
{
SCROW nRow = pItems[nIndex].nRow;
@@ -1740,9 +1740,9 @@ void ScColumn::UpdateAreaFunction( ScFunctionData& rData,
}
}
-ULONG ScColumn::GetWeightedCount() const
+sal_uIntPtr ScColumn::GetWeightedCount() const
{
- ULONG nTotal = 0;
+ sal_uIntPtr nTotal = 0;
// Notizen werden nicht gezaehlt
@@ -1771,9 +1771,9 @@ ULONG ScColumn::GetWeightedCount() const
return nTotal;
}
-ULONG ScColumn::GetCodeCount() const
+sal_uIntPtr ScColumn::GetCodeCount() const
{
- ULONG nCodeCount = 0;
+ sal_uIntPtr nCodeCount = 0;
for (SCSIZE i=0; i<nCount; i++)
{
--
1.7.0.4
Context
- [Libreoffice] [PATCH] Removed dependencies on tools/solar.h · Soeren Moeller
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.