summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2011-08-25 11:33:20 +0200
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2011-08-25 12:29:28 +0200
commit7dbc196e1de895959fe3a2b9c4cdc89069f263e9 (patch)
treed6f42f43149505528a98ee820968d6eaec4f81e4 /sc
parentbb00e570440b4f80013074a5f71f5caaf2b44000 (diff)
sal_Bool -> bool in ScTable
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/document.hxx14
-rw-r--r--sc/inc/olinetab.hxx4
-rw-r--r--sc/inc/table.hxx256
-rw-r--r--sc/source/core/data/dociter.cxx2
-rw-r--r--sc/source/core/data/document.cxx12
-rw-r--r--sc/source/core/data/olinetab.cxx24
-rw-r--r--sc/source/core/data/table1.cxx178
-rw-r--r--sc/source/core/data/table2.cxx198
-rw-r--r--sc/source/core/data/table3.cxx170
-rw-r--r--sc/source/core/data/table4.cxx111
-rw-r--r--sc/source/core/data/table5.cxx32
-rw-r--r--sc/source/core/data/table6.cxx98
-rw-r--r--sc/source/core/tool/consoli.cxx2
-rw-r--r--sc/source/filter/excel/exctools.cxx2
-rw-r--r--sc/source/filter/xml/xmlcoli.cxx4
-rw-r--r--sc/source/filter/xml/xmlrowi.cxx4
-rw-r--r--sc/source/ui/docshell/docfunc.cxx10
-rw-r--r--sc/source/ui/docshell/editable.cxx6
-rw-r--r--sc/source/ui/docshell/olinefun.cxx4
-rw-r--r--sc/source/ui/inc/viewfunc.hxx2
-rw-r--r--sc/source/ui/view/cellsh.cxx2
-rw-r--r--sc/source/ui/view/viewfun2.cxx2
-rw-r--r--sc/source/ui/view/viewfunc.cxx26
23 files changed, 582 insertions, 581 deletions
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 11b87fe6cd18..b10bb31aa9bb 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -550,9 +550,9 @@ public:
sal_Bool IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
- sal_Bool* pOnlyNotBecauseOfMatrix = NULL ) const;
+ bool* pOnlyNotBecauseOfMatrix = NULL ) const;
sal_Bool IsSelectionEditable( const ScMarkData& rMark,
- sal_Bool* pOnlyNotBecauseOfMatrix = NULL ) const;
+ bool* pOnlyNotBecauseOfMatrix = NULL ) const;
sal_Bool HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
const ScMarkData& rMark ) const;
@@ -769,8 +769,10 @@ public:
SC_DLLPUBLIC void GetString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString );
SC_DLLPUBLIC void GetString( SCCOL nCol, SCROW nRow, SCTAB nTab, rtl::OUString& rString );
+ SC_DLLPUBLIC rtl::OUString GetString( SCCOL nCol, SCROW nRow, SCTAB nTab) { rtl::OUString aString; GetString(nCol, nRow, nTab, aString); return aString;}
SC_DLLPUBLIC void GetInputString( SCCOL nCol, SCROW nRow, SCTAB nTab, String& rString );
SC_DLLPUBLIC double GetValue( const ScAddress& );
+ SC_DLLPUBLIC double GetValue( const SCCOL nCol, SCROW nRow, SCTAB nTab) { ScAddress aAdr(nCol, nRow, nTab); return GetValue(aAdr);}
SC_DLLPUBLIC void GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, double& rValue );
SC_DLLPUBLIC double RoundValueAsShown( double fVal, sal_uLong nFormat );
SC_DLLPUBLIC void GetNumberFormat( SCCOL nCol, SCROW nRow, SCTAB nTab,
@@ -970,10 +972,10 @@ public:
void DeleteRow( SCCOL nStartCol, SCTAB nStartTab,
SCCOL nEndCol, SCTAB nEndTab,
SCROW nStartRow, SCSIZE nSize,
- ScDocument* pRefUndoDoc = NULL, sal_Bool* pUndoOutline = NULL,
+ ScDocument* pRefUndoDoc = NULL, bool* pUndoOutline = NULL,
const ScMarkData* pTabMark = NULL );
SC_DLLPUBLIC void DeleteRow( const ScRange& rRange,
- ScDocument* pRefUndoDoc = NULL, sal_Bool* pUndoOutline = NULL );
+ ScDocument* pRefUndoDoc = NULL, bool* pUndoOutline = NULL );
sal_Bool InsertCol( SCROW nStartRow, SCTAB nStartTab,
SCROW nEndRow, SCTAB nEndTab,
SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL,
@@ -982,10 +984,10 @@ public:
void DeleteCol( SCROW nStartRow, SCTAB nStartTab,
SCROW nEndRow, SCTAB nEndTab,
SCCOL nStartCol, SCSIZE nSize,
- ScDocument* pRefUndoDoc = NULL, sal_Bool* pUndoOutline = NULL,
+ ScDocument* pRefUndoDoc = NULL, bool* pUndoOutline = NULL,
const ScMarkData* pTabMark = NULL );
void DeleteCol( const ScRange& rRange,
- ScDocument* pRefUndoDoc = NULL, sal_Bool* pUndoOutline = NULL );
+ ScDocument* pRefUndoDoc = NULL, bool* pUndoOutline = NULL );
sal_Bool CanInsertRow( const ScRange& rRange ) const;
sal_Bool CanInsertCol( const ScRange& rRange ) const;
diff --git a/sc/inc/olinetab.hxx b/sc/inc/olinetab.hxx
index d1cf0257c0bd..9dcdf0cfebc6 100644
--- a/sc/inc/olinetab.hxx
+++ b/sc/inc/olinetab.hxx
@@ -101,8 +101,8 @@ public:
sal_Bool FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd,
sal_uInt16& rFindLevel ) const;
- sal_Bool Insert( SCCOLROW nStartPos, SCCOLROW nEndPos, sal_Bool& rSizeChanged,
- sal_Bool bHidden = false, sal_Bool bVisible = sal_True );
+ bool Insert( SCCOLROW nStartPos, SCCOLROW nEndPos, bool& rSizeChanged,
+ bool bHidden = false, bool bVisible = true );
sal_Bool Remove( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, sal_Bool& rSizeChanged );
ScOutlineEntry* GetEntry( sal_uInt16 nLevel, sal_uInt16 nIndex ) const;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 1a595cef7a7b..dc8706c5208a 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -107,9 +107,9 @@ private:
String aName;
String aCodeName;
String aComment;
- sal_Bool bScenario;
- sal_Bool bLayoutRTL;
- sal_Bool bLoadingRTL;
+ bool bScenario;
+ bool bLayoutRTL;
+ bool bLoadingRTL;
String aLinkDoc;
String aLinkFlt;
@@ -120,7 +120,7 @@ private:
// page style template
String aPageStyle;
- sal_Bool bPageSizeValid;
+ bool bPageSizeValid;
Size aPageSizeTwips; // size of the print-page
SCCOL nRepeatStartX; // repeating rows/columns
SCCOL nRepeatEndX; // REPEAT_NONE, if not used
@@ -150,13 +150,13 @@ private:
SCCOL nTableAreaX;
SCROW nTableAreaY;
- sal_Bool bTableAreaValid;
+ bool bTableAreaValid;
// internal management
- sal_Bool bVisible;
- sal_Bool bStreamValid;
- sal_Bool bPendingRowHeights;
- sal_Bool bCalcNotification;
+ bool bVisible;
+ bool bStreamValid;
+ bool bPendingRowHeights;
+ bool bCalcNotification;
SCTAB nTab;
sal_uInt16 nRecalcLvl; // recursion level Size-Recalc
@@ -170,7 +170,7 @@ private:
// sort parameter to minimize stack size of quicksort
ScSortParam aSortParam;
CollatorWrapper* pSortCollator;
- sal_Bool bGlobalKeepQuery;
+ bool bGlobalKeepQuery;
ScRangeVec aPrintRanges;
bool bPrintEntireSheet;
@@ -184,7 +184,7 @@ private:
Color aScenarioColor;
Color aTabBgColor;
sal_uInt16 nScenarioFlags;
- sal_Bool bActiveScenario;
+ bool bActiveScenario;
ScDBData* pDBDataNoName;
mutable ScRangeName* mpRangeName;
bool mbPageBreaksValid;
@@ -203,7 +203,7 @@ friend class ScAttrRectIterator;
public:
ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
- sal_Bool bColInfo = sal_True, sal_Bool bRowInfo = sal_True );
+ bool bColInfo = true, bool bRowInfo = true );
~ScTable();
ScOutlineTable* GetOutlineTable() { return pOutlineTable; }
@@ -213,37 +213,37 @@ public:
sal_uLong GetWeightedCount() const;
sal_uLong GetCodeCount() const; // RPN code in formula
- sal_Bool SetOutlineTable( const ScOutlineTable* pNewOutline );
+ bool SetOutlineTable( const ScOutlineTable* pNewOutline );
void StartOutlineTable();
void DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
- sal_Bool TestRemoveSubTotals( const ScSubTotalParam& rParam );
+ bool TestRemoveSubTotals( const ScSubTotalParam& rParam );
void RemoveSubTotals( ScSubTotalParam& rParam );
- sal_Bool DoSubTotals( ScSubTotalParam& rParam );
+ bool DoSubTotals( ScSubTotalParam& rParam );
const ScSheetEvents* GetSheetEvents() const { return pSheetEvents; }
void SetSheetEvents( const ScSheetEvents* pNew );
- sal_Bool IsVisible() const { return bVisible; }
- void SetVisible( sal_Bool bVis );
+ bool IsVisible() const { return bVisible; }
+ void SetVisible( bool bVis );
- sal_Bool IsStreamValid() const { return bStreamValid; }
- void SetStreamValid( sal_Bool bSet, sal_Bool bIgnoreLock = false );
+ bool IsStreamValid() const { return bStreamValid; }
+ void SetStreamValid( bool bSet, bool bIgnoreLock = false );
- sal_Bool IsPendingRowHeights() const { return bPendingRowHeights; }
- void SetPendingRowHeights( sal_Bool bSet );
+ bool IsPendingRowHeights() const { return bPendingRowHeights; }
+ void SetPendingRowHeights( bool bSet );
- sal_Bool GetCalcNotification() const { return bCalcNotification; }
- void SetCalcNotification( sal_Bool bSet );
+ bool GetCalcNotification() const { return bCalcNotification; }
+ void SetCalcNotification( bool bSet );
- sal_Bool IsLayoutRTL() const { return bLayoutRTL; }
- sal_Bool IsLoadingRTL() const { return bLoadingRTL; }
- void SetLayoutRTL( sal_Bool bSet );
- void SetLoadingRTL( sal_Bool bSet );
+ bool IsLayoutRTL() const { return bLayoutRTL; }
+ bool IsLoadingRTL() const { return bLoadingRTL; }
+ void SetLayoutRTL( bool bSet );
+ void SetLoadingRTL( bool bSet );
- sal_Bool IsScenario() const { return bScenario; }
- void SetScenario( sal_Bool bFlag );
+ bool IsScenario() const { return bScenario; }
+ void SetScenario( bool bFlag );
void GetScenarioComment( String& rComment) const { rComment = aComment; }
void SetScenarioComment( const String& rComment ) { aComment = rComment; }
const Color& GetScenarioColor() const { return aScenarioColor; }
@@ -252,11 +252,11 @@ public:
void SetTabBgColor(const Color& rColor);
sal_uInt16 GetScenarioFlags() const { return nScenarioFlags; }
void SetScenarioFlags(sal_uInt16 nNew) { nScenarioFlags = nNew; }
- void SetActiveScenario(sal_Bool bSet) { bActiveScenario = bSet; }
- sal_Bool IsActiveScenario() const { return bActiveScenario; }
+ void SetActiveScenario(bool bSet) { bActiveScenario = bSet; }
+ bool IsActiveScenario() const { return bActiveScenario; }
sal_uInt8 GetLinkMode() const { return nLinkMode; }
- sal_Bool IsLinked() const { return nLinkMode != SC_LINK_NONE; }
+ bool IsLinked() const { return nLinkMode != SC_LINK_NONE; }
const String& GetLinkDoc() const { return aLinkDoc; }
const String& GetLinkFlt() const { return aLinkFlt; }
const String& GetLinkOpt() const { return aLinkOpt; }
@@ -281,7 +281,7 @@ public:
void SetPageStyle( const String& rName );
void PageStyleModified( const String& rNewName );
- sal_Bool IsProtected() const;
+ bool IsProtected() const;
void SetProtection(const ScTableProtection* pProtect);
ScTableProtection* GetProtection();
@@ -294,21 +294,21 @@ public:
void LockTable();
void UnlockTable();
- sal_Bool IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
- SCROW nRow2, sal_Bool* pOnlyNotBecauseOfMatrix = NULL ) const;
- sal_Bool IsSelectionEditable( const ScMarkData& rMark,
- sal_Bool* pOnlyNotBecauseOfMatrix = NULL ) const;
+ bool IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
+ SCROW nRow2, bool* pOnlyNotBecauseOfMatrix = NULL ) const;
+ bool IsSelectionEditable( const ScMarkData& rMark,
+ bool* pOnlyNotBecauseOfMatrix = NULL ) const;
- sal_Bool HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const;
+ bool HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const;
bool HasSelectionMatrixFragment( const ScMarkData& rMark ) const;
- sal_Bool IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const;
+ bool IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes = false ) const;
void PutCell( const ScAddress&, ScBaseCell* pCell );
void PutCell( SCCOL nCol, SCROW nRow, ScBaseCell* pCell );
void PutCell(SCCOL nCol, SCROW nRow, sal_uLong nFormatIndex, ScBaseCell* pCell);
// TRUE = numberformat set
- sal_Bool SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString,
+ bool SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString,
ScSetStringParam* pParam = NULL );
void SetValue( SCCOL nCol, SCROW nRow, const double& rVal );
void SetError( SCCOL nCol, SCROW nRow, sal_uInt16 nError);
@@ -354,53 +354,53 @@ public:
@param bForced True = always create all captions, false = skip when Undo is disabled. */
void InitializeNoteCaptions( bool bForced = false );
- sal_Bool TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize );
+ bool TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize );
void InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize );
void DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize,
- sal_Bool* pUndoOutline = NULL );
+ bool* pUndoOutline = NULL );
- sal_Bool TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize );
+ bool TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize );
void InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize );
void DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize,
- sal_Bool* pUndoOutline = NULL );
+ bool* pUndoOutline = NULL );
void DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nDelFlag);
void CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTable,
- sal_Bool bKeepScenarioFlags, sal_Bool bCloneNoteCaptions);
+ bool bKeepScenarioFlags, bool bCloneNoteCaptions);
void CopyToClip(const ScRangeList& rRanges, ScTable* pTable,
bool bKeepScenarioFlags, bool bCloneNoteCaptions);
void CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCsCOL nDx, SCsROW nDy,
- sal_uInt16 nInsFlag, sal_Bool bAsLink, sal_Bool bSkipAttrForEmpty, ScTable* pTable);
+ sal_uInt16 nInsFlag, bool bAsLink, bool bSkipAttrForEmpty, ScTable* pTable);
void StartListeningInArea( SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2 );
void BroadcastInArea( SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2 );
void CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- sal_uInt16 nFlags, sal_Bool bMarked, ScTable* pDestTab,
+ sal_uInt16 nFlags, bool bMarked, ScTable* pDestTab,
const ScMarkData* pMarkData = NULL,
- sal_Bool bAsLink = false, sal_Bool bColRowFlags = sal_True);
+ bool bAsLink = false, bool bColRowFlags = true);
void UndoToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- sal_uInt16 nFlags, sal_Bool bMarked, ScTable* pDestTab,
+ sal_uInt16 nFlags, bool bMarked, ScTable* pDestTab,
const ScMarkData* pMarkData = NULL);
void TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- ScTable* pTransClip, sal_uInt16 nFlags, sal_Bool bAsLink );
+ ScTable* pTransClip, sal_uInt16 nFlags, bool bAsLink );
// mark of this document
void MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction,
- sal_Bool bSkipEmpty, ScTable* pSrcTab );
+ bool bSkipEmpty, ScTable* pSrcTab );
void MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- sal_uInt16 nFunction, sal_Bool bSkipEmpty, ScTable* pSrcTab );
+ sal_uInt16 nFunction, bool bSkipEmpty, ScTable* pSrcTab );
void CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
SCCOL nDestCol, SCROW nDestRow, SCTAB nDestTab );
void CopyScenarioFrom( const ScTable* pSrcTab );
void CopyScenarioTo( ScTable* pDestTab ) const;
- sal_Bool TestCopyScenarioTo( const ScTable* pDestTab ) const;
+ bool TestCopyScenarioTo( const ScTable* pDestTab ) const;
void MarkScenarioIn( ScMarkData& rMark, sal_uInt16 nNeededBits ) const;
- sal_Bool HasScenarioRange( const ScRange& rRange ) const;
+ bool HasScenarioRange( const ScRange& rRange ) const;
void InvalidateScenarioRanges();
const ScRangeList* GetScenarioRanges() const;
@@ -409,21 +409,21 @@ public:
void InvalidateTableArea();
void InvalidatePageBreaks();
- sal_Bool GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = empty
- sal_Bool GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const;
- sal_Bool GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, sal_Bool bNotes ) const;
- sal_Bool GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
- SCCOL& rEndCol, sal_Bool bNotes ) const;
- sal_Bool GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
- SCROW& rEndRow, sal_Bool bNotes ) const;
+ bool GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const; // FALSE = empty
+ bool GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const;
+ bool GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes ) const;
+ bool GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
+ SCCOL& rEndCol, bool bNotes ) const;
+ bool GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
+ SCROW& rEndRow, bool bNotes ) const;
- sal_Bool GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const;
+ bool GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const;
void ExtendPrintArea( OutputDevice* pDev,
SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW nEndRow );
void GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
- sal_Bool bIncludeOld, bool bOnlyDown ) const;
+ bool bIncludeOld, bool bOnlyDown ) const;
bool ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rStartRow,
SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const;
@@ -433,14 +433,14 @@ public:
void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY );
void GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
- sal_Bool bMarked, sal_Bool bUnprotected, const ScMarkData& rMark );
+ bool bMarked, bool bUnprotected, const ScMarkData& rMark );
void LimitChartArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow );
- sal_Bool HasData( SCCOL nCol, SCROW nRow );
- sal_Bool HasStringData( SCCOL nCol, SCROW nRow );
- sal_Bool HasValueData( SCCOL nCol, SCROW nRow );
- sal_Bool HasStringCells( SCCOL nStartCol, SCROW nStartRow,
+ bool HasData( SCCOL nCol, SCROW nRow );
+ bool HasStringData( SCCOL nCol, SCROW nRow );
+ bool HasValueData( SCCOL nCol, SCROW nRow );
+ bool HasStringCells( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow ) const;
sal_uInt16 GetErrCode( const ScAddress& rPos ) const
@@ -465,7 +465,7 @@ public:
void UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
- ScDocument* pUndoDoc = NULL, sal_Bool bIncludeDraw = sal_True, bool bUpdateNoteCaptionPos = true );
+ ScDocument* pUndoDoc = NULL, bool bIncludeDraw = true, bool bUpdateNoteCaptionPos = true );
void UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
@@ -477,11 +477,11 @@ public:
void UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY );
void UpdateInsertTab(SCTAB nTable, SCTAB nNewSheets = 1);
- void UpdateDeleteTab( SCTAB nTable, sal_Bool bIsMove, ScTable* pRefUndo = NULL, SCTAB nSheets = 1 );
+ void UpdateDeleteTab( SCTAB nTable, bool bIsMove, ScTable* pRefUndo = NULL, SCTAB nSheets = 1 );
void UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo, ScProgress* pProgress );
- void UpdateCompile( sal_Bool bForceIfNameInUse = false );
+ void UpdateCompile( bool bForceIfNameInUse = false );
void SetTabNo(SCTAB nNewTab);
- sal_Bool IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+ bool IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
sal_uInt16 nIndex) const;
void FindRangeNamesInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
std::set<sal_uInt16>& rIndexes) const;
@@ -500,7 +500,7 @@ public:
sal_uInt16 nFormatNo );
void GetAutoFormatData(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScAutoFormatData& rData);
void ScReplaceTabsStr( String& rStr, const String& rSrch, const String& rRepl ); // from sw
- sal_Bool SearchAndReplace(const SvxSearchItem& rSearchItem,
+ bool SearchAndReplace(const SvxSearchItem& rSearchItem,
SCCOL& rCol, SCROW& rRow, ScMarkData& rMark,
String& rUndoStr, ScDocument* pUndoDoc);
@@ -514,7 +514,7 @@ public:
bool HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const;
bool ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
SCCOL& rEndCol, SCROW& rEndRow,
- sal_Bool bRefresh, sal_Bool bAttrs );
+ bool bRefresh, bool bAttrs );
const SfxPoolItem* GetAttr( SCCOL nCol, SCROW nRow, sal_uInt16 nWhich ) const;
const ScPatternAttr* GetPattern( SCCOL nCol, SCROW nRow ) const;
const ScPatternAttr* GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const;
@@ -528,9 +528,9 @@ public:
sal_uLong GetNumberFormat( SCCOL nCol, SCROW nRow ) const;
sal_uInt32 GetNumberFormat( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const;
void MergeSelectionPattern( ScMergePatternState& rState,
- const ScMarkData& rMark, sal_Bool bDeep ) const;
+ const ScMarkData& rMark, bool bDeep ) const;
void MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1,
- SCCOL nCol2, SCROW nRow2, sal_Bool bDeep ) const;
+ SCCOL nCol2, SCROW nRow2, bool bDeep ) const;
void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
ScLineFlags& rFlags,
SCCOL nStartCol, SCROW nStartRow,
@@ -546,12 +546,12 @@ public:
const ScPatternAttr& rAttr, ScEditDataArray* pDataArray = NULL );
bool SetAttrEntries(SCCOL nCol, ScAttrEntry* pData, SCSIZE nSize);
- void SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, sal_Bool bPutToPool = false )
+ void SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, bool bPutToPool = false )
{
if (ValidColRow(rPos.Col(),rPos.Row()))
aCol[rPos.Col()].SetPattern( rPos.Row(), rAttr, bPutToPool );
}
- void SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, sal_Bool bPutToPool = false );
+ void SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, bool bPutToPool = false );
void ApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
const ScPatternAttr& rPattern, short nNewType );
@@ -559,19 +559,19 @@ public:
void ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle );
void ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark);
void ApplySelectionLineStyle( const ScMarkData& rMark,
- const ::editeng::SvxBorderLine* pLine, sal_Bool bColorOnly );
+ const ::editeng::SvxBorderLine* pLine, bool bColorOnly );
const ScStyleSheet* GetStyle( SCCOL nCol, SCROW nRow ) const;
const ScStyleSheet* GetSelectionStyle( const ScMarkData& rMark, bool& rFound ) const;
const ScStyleSheet* GetAreaStyle( bool& rFound, SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2 ) const;
- void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, sal_Bool bRemoved,
+ void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY );
- sal_Bool IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const;
+ bool IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const;
bool ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags );
bool RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags );
@@ -580,7 +580,7 @@ public:
void DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark );
void ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark );
- void ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark );
+ void ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark );
const ScRange* GetRepeatColRange() const { return pRepeatColRange; }
const ScRange* GetRepeatRowRange() const { return pRepeatRowRange; }
@@ -605,31 +605,31 @@ public:
sal_uInt16 GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- sal_Bool bFormula, const ScMarkData* pMarkData,
+ bool bFormula, const ScMarkData* pMarkData,
const ScColWidthParam* pParam );
- sal_Bool SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nExtra,
+ bool SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nExtra,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- sal_Bool bForce,
+ bool bForce,
ScProgress* pOuterProgress = NULL, sal_uLong nProgressStart = 0 );
void SetOptimalHeightOnly(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nExtra,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- sal_Bool bForce,
+ bool bForce,
ScProgress* pOuterProgress = NULL, sal_uLong nProgressStart = 0 );
long GetNeededSize( SCCOL nCol, SCROW nRow,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- sal_Bool bWidth, sal_Bool bTotalSize );
+ bool bWidth, bool bTotalSize );
void SetColWidth( SCCOL nCol, sal_uInt16 nNewWidth );
void SetColWidthOnly( SCCOL nCol, sal_uInt16 nNewWidth );
void SetRowHeight( SCROW nRow, sal_uInt16 nNewHeight );
- sal_Bool SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight,
+ bool SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight,
double nPPTX, double nPPTY );
/**
@@ -642,7 +642,7 @@ public:
void SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight );
// nPPT to test for modification
- void SetManualHeight( SCROW nStartRow, SCROW nEndRow, sal_Bool bManual );
+ void SetManualHeight( SCROW nStartRow, SCROW nEndRow, bool bManual );
sal_uInt16 GetColWidth( SCCOL nCol ) const;
SC_DLLPUBLIC sal_uInt16 GetRowHeight( SCROW nRow, SCROW* pStartRow = NULL, SCROW* pEndRow = NULL, bool bHiddenAsZero = true ) const;
@@ -694,12 +694,12 @@ public:
const ScBitMaskCompressedArray< SCROW, sal_uInt8> * GetRowFlagsArray() const
{ return pRowFlags; }
- sal_Bool UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, sal_Bool bShow );
- sal_Bool UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, sal_Bool bShow );
+ bool UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, bool bShow );
+ bool UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, bool bShow );
void UpdatePageBreaks( const ScRange* pUserArea );
void RemoveManualBreaks();
- sal_Bool HasManualBreaks() const;
+ bool HasManualBreaks() const;
void SetRowManualBreaks( const ::std::set<SCROW>& rBreaks );
void SetColManualBreaks( const ::std::set<SCCOL>& rBreaks );
@@ -762,20 +762,20 @@ public:
void StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
void ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 );
- void Sort(const ScSortParam& rSortParam, sal_Bool bKeepQuery);
- sal_Bool ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam,
- sal_Bool* pSpecial = NULL, ScBaseCell* pCell = NULL,
- sal_Bool* pbTestEqualCondition = NULL );
+ void Sort(const ScSortParam& rSortParam, bool bKeepQuery);
+ bool ValidQuery(SCROW nRow, const ScQueryParam& rQueryParam,
+ bool* pSpecial = NULL, ScBaseCell* pCell = NULL,
+ bool* pbTestEqualCondition = NULL );
void TopTenQuery( ScQueryParam& );
- SCSIZE Query(ScQueryParam& rQueryParam, sal_Bool bKeepSub);
- sal_Bool CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
+ SCSIZE Query(ScQueryParam& rQueryParam, bool bKeepSub);
+ bool CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
void GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings, bool& rHasDates);
void GetFilteredFilterEntries( SCCOL nCol, SCROW nRow1, SCROW nRow2, const ScQueryParam& rParam, TypedScStrCollection& rStrings, bool& rHasDates );
- sal_Bool GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, sal_Bool bLimit);
+ bool GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, bool bLimit);
- sal_Bool HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
- sal_Bool HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
+ bool HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
+ bool HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow );
void DoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd );
@@ -791,7 +791,7 @@ public:
void IncRecalcLevel();
void DecRecalcLevel( bool bUpdateNoteCaptionPos = true );
- sal_Bool IsSortCollatorGlobal() const;
+ bool IsSortCollatorGlobal() const;
void InitSortCollator( const ScSortParam& rPar );
void DestroySortCollator();
void SetDrawPageSize( bool bResetStreamValid = true, bool bUpdateNoteCaptionPos = true );
@@ -805,7 +805,7 @@ private:
sal_uLong nFillCount, FillDir eFillDir, FillCmd eFillCmd,
FillDateCmd eFillDateCmd,
double nStepValue, double nMaxValue, sal_uInt16 nMinDigits,
- sal_Bool bAttribs, ScProgress& rProgress );
+ bool bAttribs, ScProgress& rProgress );
void FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
FillCmd& rCmd, FillDateCmd& rDateCmd,
double& rInc, sal_uInt16& rMinDigits,
@@ -813,30 +813,30 @@ private:
void FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
sal_uLong nFillCount, FillDir eFillDir, ScProgress& rProgress );
- sal_Bool ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
- sal_Bool bMarked, sal_Bool bUnprotected );
+ bool ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
+ bool bMarked, bool bUnprotected );
void AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow,
const ScPatternAttr& rAttr, sal_uInt16 nFormatNo);
void GetAutoFormatAttr(SCCOL nCol, SCROW nRow, sal_uInt16 nIndex, ScAutoFormatData& rData);
void GetAutoFormatFrame(SCCOL nCol, SCROW nRow, sal_uInt16 nFlags, sal_uInt16 nIndex, ScAutoFormatData& rData);
- sal_Bool SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow,
+ bool SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow,
const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc);
- sal_Bool Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+ bool Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc);
- sal_Bool SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+ bool SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
String& rUndoStr, ScDocument* pUndoDoc);
- sal_Bool Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+ bool Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc);
- sal_Bool ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+ bool ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
String& rUndoStr, ScDocument* pUndoDoc);
- sal_Bool SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+ bool SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
ScMarkData& rMark);
- sal_Bool ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
- ScMarkData& rMark, sal_Bool bIsUndo);
- sal_Bool SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark);
- sal_Bool ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+ bool ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+ ScMarkData& rMark, bool bIsUndo);
+ bool SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark);
+ bool ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
ScDocument* pUndoDoc);
bool SearchAndReplaceEmptyCells(
const SvxSearchItem& rSearchItem,
@@ -850,7 +850,7 @@ private:
String& rUndoStr, ScDocument* pUndoDoc);
// use the global sort parameter:
- sal_Bool IsSorted(SCCOLROW nStart, SCCOLROW nEnd);
+ bool IsSorted(SCCOLROW nStart, SCCOLROW nEnd);
void DecoladeRow( ScSortInfoArray*, SCROW nRow1, SCROW nRow2 );
void SwapCol(SCCOL nCol1, SCCOL nCol2);
void SwapRow(SCROW nRow1, SCROW nRow2);
@@ -863,25 +863,25 @@ private:
void QuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi);
void SortReorder( ScSortInfoArray*, ScProgress& );
- sal_Bool CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
- sal_Bool CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
+ bool CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
+ bool CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam);
void GetUpperCellString(SCCOL nCol, SCROW nRow, String& rStr);
- sal_Bool RefVisible(ScFormulaCell* pCell);
+ bool RefVisible(ScFormulaCell* pCell);
- sal_Bool IsEmptyLine(SCROW nRow, SCCOL nStartCol, SCCOL nEndCol);
+ bool IsEmptyLine(SCROW nRow, SCCOL nStartCol, SCCOL nEndCol);
void IncDate(double& rVal, sal_uInt16& nDayOfMonth, double nStep, FillDateCmd eCmd);
- void FillFormula(sal_uLong& nFormulaCounter, sal_Bool bFirst, ScFormulaCell* pSrcCell,
- SCCOL nDestCol, SCROW nDestRow, sal_Bool bLast );
+ void FillFormula(sal_uLong& nFormulaCounter, bool bFirst, ScFormulaCell* pSrcCell,
+ SCCOL nDestCol, SCROW nDestRow, bool bLast );
void UpdateInsertTabAbs(SCTAB nNewPos);
- sal_Bool GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, sal_Bool bInSel,
+ bool GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, bool bInSel,
const ScMarkData& rMark) const;
- sal_Bool GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark );
- sal_Bool TestTabRefAbs(SCTAB nTable);
+ bool GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark );
+ bool TestTabRefAbs(SCTAB nTable);
void CompileDBFormula();
- void CompileDBFormula( sal_Bool bCreateFormulaString );
- void CompileNameFormula( sal_Bool bCreateFormulaString );
+ void CompileDBFormula( bool bCreateFormulaString );
+ void CompileNameFormula( bool bCreateFormulaString );
void CompileColRowNameFormula();
void StartListening( const ScAddress& rAddress, SvtListener* pListener );
@@ -899,7 +899,7 @@ private:
// idle calculation of OutputDevice text width for cell
// also invalidates script type, broadcasts for "calc as shown"
void InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo,
- sal_Bool bNumFormatChanged, sal_Bool bBroadcast );
+ bool bNumFormatChanged, bool bBroadcast );
void SkipFilteredRows(SCROW& rRow, SCROW& rLastNonFilteredRow, bool bForward);
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 3ad343ce3fd9..76a254f9bfd2 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1165,7 +1165,7 @@ ScBaseCell* ScQueryCellIterator::GetThis()
++nRow;
else
{
- sal_Bool bTestEqualCondition;
+ bool bTestEqualCondition;
if ( (pDoc->maTabs[nTab])->ValidQuery( nRow, aParam, NULL,
(nCol == static_cast<SCCOL>(nFirstQueryField) ? pCell : NULL),
(nTestEqualCondition ? &bTestEqualCondition : NULL) ) )
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 8de3fbbcc9f2..75cb42472c39 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1190,7 +1190,7 @@ sal_Bool ScDocument::InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc )
void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab,
SCCOL nEndCol, SCTAB nEndTab,
SCROW nStartRow, SCSIZE nSize,
- ScDocument* pRefUndoDoc, sal_Bool* pUndoOutline,
+ ScDocument* pRefUndoDoc, bool* pUndoOutline,
const ScMarkData* pTabMark )
{
SCTAB i;
@@ -1266,7 +1266,7 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab,
}
-void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc, sal_Bool* pUndoOutline )
+void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc, bool* pUndoOutline )
{
DeleteRow( rRange.aStart.Col(), rRange.aStart.Tab(),
rRange.aEnd.Col(), rRange.aEnd.Tab(),
@@ -1385,7 +1385,7 @@ sal_Bool ScDocument::InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc )
void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab,
SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc,
- sal_Bool* pUndoOutline, const ScMarkData* pTabMark )
+ bool* pUndoOutline, const ScMarkData* pTabMark )
{
SCTAB i;
@@ -1460,7 +1460,7 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA
}
-void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, sal_Bool* pUndoOutline )
+void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, bool* pUndoOutline )
{
DeleteCol( rRange.aStart.Row(), rRange.aStart.Tab(),
rRange.aEnd.Row(), rRange.aEnd.Tab(),
@@ -4769,7 +4769,7 @@ void ScDocument::UnlockTable(SCTAB nTab)
sal_Bool ScDocument::IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
- sal_Bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
+ bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
{
// import into read-only document is possible
if ( !bImportingXML && !mbChangeReadOnlyEnabled && pShell && pShell->IsReadOnly() )
@@ -4792,7 +4792,7 @@ sal_Bool ScDocument::IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartR
sal_Bool ScDocument::IsSelectionEditable( const ScMarkData& rMark,
- sal_Bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
+ bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
{
// import into read-only document is possible
if ( !bImportingXML && !mbChangeReadOnlyEnabled && pShell && pShell->IsReadOnly() )
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index 2b231917cc85..056f148696bc 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -181,8 +181,8 @@ void ScOutlineArray::FindEntry( SCCOLROW nSearchPos, sal_uInt16& rFindLevel, sal
}
}
-sal_Bool ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, sal_Bool& rSizeChanged,
- sal_Bool bHidden, sal_Bool bVisible )
+bool ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, bool& rSizeChanged,
+ bool bHidden, bool bVisible )
{
rSizeChanged = false;
@@ -190,9 +190,9 @@ sal_Bool ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, sal_Bool&
sal_uInt16 nStartIndex;
sal_uInt16 nEndLevel;
sal_uInt16 nEndIndex;
- sal_Bool bFound = false;
+ bool bFound = false;
- sal_Bool bCont;
+ bool bCont;
sal_uInt16 nFindMax;
FindEntry( nStartCol, nStartLevel, nStartIndex ); // nLevel = neuer Level (alter+1) !!!
FindEntry( nEndCol, nEndLevel, nEndIndex );
@@ -202,7 +202,7 @@ sal_Bool ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, sal_Bool&
bCont = false;
if ( nStartLevel == nEndLevel && nStartIndex == nEndIndex && nStartLevel < SC_OL_MAXDEPTH )
- bFound = sal_True;
+ bFound = true;
if (!bFound)
{
@@ -217,7 +217,7 @@ sal_Bool ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, sal_Bool&
if ( ((ScOutlineEntry*)aCollections[nEndLevel-1].At(nEndIndex))->
GetEnd() == nEndCol )
FindEntry( nEndCol, nEndLevel, nEndIndex, nFindMax );
- bCont = sal_True;
+ bCont = true;
}
}
}
@@ -230,11 +230,11 @@ sal_Bool ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, sal_Bool&
// untere verschieben
- sal_Bool bNeedSize = false;
+ bool bNeedSize = false;
for ( short nMoveLevel = nDepth-1; nMoveLevel >= (short) nLevel; nMoveLevel-- )
{
sal_uInt16 nCount = aCollections[nMoveLevel].GetCount();
- sal_Bool bMoved = false;
+ bool bMoved = false;
for ( sal_uInt16 i=0; i<nCount; i += bMoved ? 0 : 1 )
{
ScOutlineEntry* pEntry = (ScOutlineEntry*) aCollections[nMoveLevel].At(i);
@@ -249,7 +249,7 @@ sal_Bool ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, sal_Bool&
aCollections[nMoveLevel+1].Insert( new ScOutlineEntry( *pEntry ) );
aCollections[nMoveLevel].AtFree( i );
nCount = aCollections[nMoveLevel].GetCount();
- bMoved = sal_True;
+ bMoved = true;
if (nMoveLevel == (short) nDepth - 1)
bNeedSize = sal_True;
}
@@ -261,20 +261,20 @@ sal_Bool ScOutlineArray::Insert( SCCOLROW nStartCol, SCCOLROW nEndCol, sal_Bool&
if (bNeedSize)
{
++nDepth;
- rSizeChanged = sal_True;
+ rSizeChanged = true;
}
if (nDepth <= nLevel)
{
nDepth = nLevel+1;
- rSizeChanged = sal_True;
+ rSizeChanged = true;
}
ScOutlineEntry* pNewEntry = new ScOutlineEntry( nStartCol, nEndCol+1-nStartCol, bHidden );
pNewEntry->SetVisible( bVisible );
aCollections[nLevel].Insert( pNewEntry );
- return sal_True;
+ return true;
}
sal_Bool ScOutlineArray::FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, sal_uInt16& rFindLevel ) const
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index e1221249ad84..2abaf370537b 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -230,7 +230,7 @@ bool SetOptimalHeightsToRows(OptimalHeightsFuncObjBase& rFuncObj,
// -----------------------------------------------------------------------
ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
- sal_Bool bColInfo, sal_Bool bRowInfo ) :
+ bool bColInfo, bool bRowInfo ) :
aName( rNewName ),
aCodeName( rNewName ),
bScenario( false ),
@@ -253,7 +253,7 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName,
pOutlineTable( NULL ),
pSheetEvents( NULL ),
bTableAreaValid( false ),
- bVisible( sal_True ),
+ bVisible( true ),
bStreamValid( false ),
bPendingRowHeights( false ),
bCalcNotification( false ),
@@ -364,7 +364,7 @@ const String& ScTable::GetUpperName() const
return aUpperName;
}
-void ScTable::SetVisible( sal_Bool bVis )
+void ScTable::SetVisible( bool bVis )
{
if (bVisible != bVis && IsStreamValid())
SetStreamValid(false);
@@ -372,23 +372,23 @@ void ScTable::SetVisible( sal_Bool bVis )
bVisible = bVis;
}
-void ScTable::SetStreamValid( sal_Bool bSet, sal_Bool bIgnoreLock )
+void ScTable::SetStreamValid( bool bSet, bool bIgnoreLock )
{
if ( bIgnoreLock || !pDocument->IsStreamValidLocked() )
bStreamValid = bSet;
}
-void ScTable::SetPendingRowHeights( sal_Bool bSet )
+void ScTable::SetPendingRowHeights( bool bSet )
{
bPendingRowHeights = bSet;
}
-void ScTable::SetLayoutRTL( sal_Bool bSet )
+void ScTable::SetLayoutRTL( bool bSet )
{
bLayoutRTL = bSet;
}
-void ScTable::SetLoadingRTL( sal_Bool bSet )
+void ScTable::SetLoadingRTL( bool bSet )
{
bLoadingRTL = bSet;
}
@@ -409,7 +409,7 @@ void ScTable::SetTabBgColor(const Color& rColor)
}
}
-void ScTable::SetScenario( sal_Bool bFlag )
+void ScTable::SetScenario( bool bFlag )
{
bScenario = bFlag;
}
@@ -432,7 +432,7 @@ void ScTable::SetLink( sal_uInt8 nMode,
sal_uInt16 ScTable::GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- sal_Bool bFormula, const ScMarkData* pMarkData,
+ bool bFormula, const ScMarkData* pMarkData,
const ScColWidthParam* pParam )
{
return aCol[nCol].GetOptimalColWidth( pDev, nPPTX, nPPTY, rZoomX, rZoomY,
@@ -443,7 +443,7 @@ long ScTable::GetNeededSize( SCCOL nCol, SCROW nRow,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- sal_Bool bWidth, sal_Bool bTotalSize )
+ bool bWidth, bool bTotalSize )
{
ScNeededSizeOptions aOptions;
aOptions.bSkipMerged = false; // zusammengefasste mitzaehlen
@@ -453,11 +453,11 @@ long ScTable::GetNeededSize( SCCOL nCol, SCROW nRow,
( nRow, pDev, nPPTX, nPPTY, rZoomX, rZoomY, bWidth, aOptions );
}
-sal_Bool ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nExtra,
+bool ScTable::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nExtra,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- sal_Bool bForce, ScProgress* pOuterProgress, sal_uLong nProgressStart )
+ bool bForce, ScProgress* pOuterProgress, sal_uLong nProgressStart )
{
OSL_ENSURE( nExtra==0 || bForce, "autom. OptimalHeight mit Extra" );
@@ -490,7 +490,7 @@ void ScTable::SetOptimalHeightOnly( SCROW nStartRow, SCROW nEndRow, sal_uInt16 n
OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY,
- sal_Bool bForce, ScProgress* pOuterProgress, sal_uLong nProgressStart )
+ bool bForce, ScProgress* pOuterProgress, sal_uLong nProgressStart )
{
OSL_ENSURE( nExtra==0 || bForce, "autom. OptimalHeight mit Extra" );
@@ -515,17 +515,17 @@ void ScTable::SetOptimalHeightOnly( SCROW nStartRow, SCROW nEndRow, sal_uInt16 n
delete pProgress;
}
-sal_Bool ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const
+bool ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const
{
- sal_Bool bFound = false;
+ bool bFound = false;
SCCOL nMaxX = 0;
SCROW nMaxY = 0;
for (SCCOL i=0; i<=MAXCOL; i++)
- if (!aCol[i].IsEmptyVisData(sal_True)) // sal_True = Notizen zaehlen auch
+ if (!aCol[i].IsEmptyVisData(true)) // true = Notizen zaehlen auch
{
- bFound = sal_True;
+ bFound = true;
nMaxX = i;
- SCROW nColY = aCol[i].GetLastVisDataPos(sal_True);
+ SCROW nColY = aCol[i].GetLastVisDataPos(true);
if (nColY > nMaxY)
nMaxY = nColY;
}
@@ -535,14 +535,14 @@ sal_Bool ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const
return bFound;
}
-sal_Bool ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const
+bool ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const
{
- sal_Bool bRet = sal_True; //! merken?
+ bool bRet = true; //! merken?
if (!bTableAreaValid)
{
bRet = GetPrintArea( ((ScTable*)this)->nTableAreaX,
- ((ScTable*)this)->nTableAreaY, sal_True );
- ((ScTable*)this)->bTableAreaValid = sal_True;
+ ((ScTable*)this)->nTableAreaY, true );
+ ((ScTable*)this)->bTableAreaValid = true;
}
rEndCol = nTableAreaX;
rEndRow = nTableAreaY;
@@ -551,9 +551,9 @@ sal_Bool ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const
const SCCOL SC_COLUMNS_STOP = 30;
-sal_Bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, sal_Bool bNotes ) const
+bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, bool bNotes ) const
{
- sal_Bool bFound = false;
+ bool bFound = false;
SCCOL nMaxX = 0;
SCROW nMaxY = 0;
SCCOL i;
@@ -561,7 +561,7 @@ sal_Bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, sal_Bool bNotes
for (i=0; i<=MAXCOL; i++) // Daten testen
if (!aCol[i].IsEmptyVisData(bNotes))
{
- bFound = sal_True;
+ bFound = true;
if (i>nMaxX)
nMaxX = i;
SCROW nColY = aCol[i].GetLastVisDataPos(bNotes);
@@ -576,7 +576,7 @@ sal_Bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, sal_Bool bNotes
SCROW nLastRow;
if (aCol[i].GetLastVisibleAttr( nLastRow ))
{
- bFound = sal_True;
+ bFound = true;
nMaxX = i;
if (nLastRow > nMaxY)
nMaxY = nLastRow;
@@ -622,10 +622,10 @@ sal_Bool ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, sal_Bool bNotes
return bFound;
}
-sal_Bool ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
- SCCOL& rEndCol, sal_Bool /* bNotes */ ) const
+bool ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
+ SCCOL& rEndCol, bool /* bNotes */ ) const
{
- sal_Bool bFound = false;
+ bool bFound = false;
SCCOL nMaxX = 0;
SCCOL i;
@@ -633,7 +633,7 @@ sal_Bool ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
{
if (aCol[i].HasVisibleAttrIn( nStartRow, nEndRow ))
{
- bFound = sal_True;
+ bFound = true;
nMaxX = i;
}
}
@@ -649,7 +649,7 @@ sal_Bool ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
{
if (!aCol[i].IsEmptyBlock( nStartRow, nEndRow )) //! bNotes ??????
{
- bFound = sal_True;
+ bFound = true;
if (i>nMaxX)
nMaxX = i;
}
@@ -659,10 +659,10 @@ sal_Bool ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
return bFound;
}
-sal_Bool ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
- SCROW& rEndRow, sal_Bool bNotes ) const
+bool ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
+ SCROW& rEndRow, bool bNotes ) const
{
- sal_Bool bFound = false;
+ bool bFound = false;
SCROW nMaxY = 0;
SCCOL i;
@@ -671,7 +671,7 @@ sal_Bool ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
SCROW nLastRow;
if (aCol[i].GetLastVisibleAttr( nLastRow ))
{
- bFound = sal_True;
+ bFound = true;
if (nLastRow > nMaxY)
nMaxY = nLastRow;
}
@@ -680,7 +680,7 @@ sal_Bool ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
for (i=nStartCol; i<=nEndCol; i++) // Daten testen
if (!aCol[i].IsEmptyVisData(bNotes))
{
- bFound = sal_True;
+ bFound = true;
SCROW nColY = aCol[i].GetLastVisDataPos(bNotes);
if (nColY > nMaxY)
nMaxY = nColY;
@@ -690,9 +690,9 @@ sal_Bool ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
return bFound;
}
-sal_Bool ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
+bool ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
{
- sal_Bool bFound = false;
+ bool bFound = false;
SCCOL nMinX = MAXCOL;
SCROW nMinY = MAXROW;
SCCOL i;
@@ -704,7 +704,7 @@ sal_Bool ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
{
if (!bFound)
nMinX = i;
- bFound = sal_True;
+ bFound = true;
if (nFirstRow < nMinY)
nMinY = nFirstRow;
}
@@ -720,14 +720,14 @@ sal_Bool ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
}
}
- sal_Bool bDatFound = false;
+ bool bDatFound = false;
for (i=0; i<=MAXCOL; i++) // Daten testen
- if (!aCol[i].IsEmptyVisData(sal_True))
+ if (!aCol[i].IsEmptyVisData(true))
{
if (!bDatFound && i<nMinX)
nMinX = i;
- bFound = bDatFound = sal_True;
- SCROW nColY = aCol[i].GetFirstVisDataPos(sal_True);
+ bFound = bDatFound = true;
+ SCROW nColY = aCol[i].GetFirstVisDataPos(true);
if (nColY < nMinY)
nMinY = nColY;
}
@@ -738,14 +738,14 @@ sal_Bool ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
}
void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
- sal_Bool bIncludeOld, bool bOnlyDown ) const
-{
- sal_Bool bLeft = false;
- sal_Bool bRight = false;
- sal_Bool bTop = false;
- sal_Bool bBottom = false;
- sal_Bool bChanged;
- sal_Bool bFound;
+ bool bIncludeOld, bool bOnlyDown ) const
+{
+ bool bLeft = false;
+ bool bRight = false;
+ bool bTop = false;
+ bool bBottom = false;
+ bool bChanged;
+ bool bFound;
SCCOL i;
SCROW nTest;
@@ -764,16 +764,16 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S
if (!aCol[rEndCol+1].IsEmptyBlock(nStart,nEnd))
{
++rEndCol;
- bChanged = sal_True;
- bRight = sal_True;
+ bChanged = true;
+ bRight = true;
}
if (rStartCol > 0)
if (!aCol[rStartCol-1].IsEmptyBlock(nStart,nEnd))
{
--rStartCol;
- bChanged = sal_True;
- bLeft = sal_True;
+ bChanged = true;
+ bLeft = true;
}
if (rStartRow > 0)
@@ -782,12 +782,12 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S
bFound = false;
for (i=rStartCol; i<=rEndCol && !bFound; i++)
if (aCol[i].HasDataAt(nTest))
- bFound = sal_True;
+ bFound = true;
if (bFound)
{
--rStartRow;
- bChanged = sal_True;
- bTop = sal_True;
+ bChanged = true;
+ bTop = true;
}
}
}
@@ -798,12 +798,12 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S
bFound = false;
for (i=rStartCol; i<=rEndCol && !bFound; i++)
if (aCol[i].HasDataAt(nTest))
- bFound = sal_True;
+ bFound = true;
if (bFound)
{
++rEndRow;
- bChanged = sal_True;
- bBottom = sal_True;
+ bChanged = true;
+ bBottom = true;
}
}
}
@@ -822,7 +822,7 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S
bFound = false;
for (i=rStartCol; i<=rEndCol && !bFound; i++)
if (aCol[i].HasDataAt(rStartRow))
- bFound = sal_True;
+ bFound = true;
if (!bFound)
++rStartRow;
}
@@ -831,7 +831,7 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S
bFound = false;
for (i=rStartCol; i<=rEndCol && !bFound; i++)
if (aCol[i].HasDataAt(rEndRow))
- bFound = sal_True;
+ bFound = true;
if (!bFound)
--rEndRow;
}
@@ -954,12 +954,12 @@ SCSIZE ScTable::GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
return nCount;
}
-sal_Bool ScTable::IsEmptyLine( SCROW nRow, SCCOL nStartCol, SCCOL nEndCol )
+bool ScTable::IsEmptyLine( SCROW nRow, SCCOL nStartCol, SCCOL nEndCol )
{
- sal_Bool bFound = false;
+ bool bFound = false;
for (SCCOL i=nStartCol; i<=nEndCol && !bFound; i++)
if (aCol[i].HasDataAt(nRow))
- bFound = sal_True;
+ bFound = true;
return !bFound;
}
@@ -983,8 +983,8 @@ void ScTable::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY
if (nMovX)
{
SCsCOL nNewCol = (SCsCOL) rCol;
- sal_Bool bThere = aCol[nNewCol].HasVisibleDataAt(rRow);
- sal_Bool bFnd;
+ bool bThere = aCol[nNewCol].HasVisibleDataAt(rRow);
+ bool bFnd;
if (bThere)
{
do
@@ -1004,7 +1004,7 @@ void ScTable::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY
do
{
nNewCol = sal::static_int_cast<SCsCOL>( nNewCol + nMovX );
- bFnd = (nNewCol>=0 && nNewCol<=MAXCOL) ? aCol[nNewCol].HasVisibleDataAt(rRow) : sal_True;
+ bFnd = (nNewCol>=0 && nNewCol<=MAXCOL) ? aCol[nNewCol].HasVisibleDataAt(rRow) : true;
}
while (!bFnd);
}
@@ -1018,8 +1018,8 @@ void ScTable::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY
aCol[rCol].FindDataAreaPos(rRow,nMovY);
}
-sal_Bool ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
- sal_Bool bMarked, sal_Bool bUnprotected )
+bool ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
+ bool bMarked, bool bUnprotected )
{
if (!ValidCol(nCol) || !ValidRow(nRow))
return false;
@@ -1048,11 +1048,11 @@ sal_Bool ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark,
return false;
}
- return sal_True;
+ return true;
}
void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
- sal_Bool bMarked, sal_Bool bUnprotected, const ScMarkData& rMark )
+ bool bMarked, bool bUnprotected, const ScMarkData& rMark )
{
if (bUnprotected && !IsProtected()) // Tabelle ueberhaupt geschuetzt?
bUnprotected = false;
@@ -1069,7 +1069,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
if ( nMovY && bMarked )
{
- sal_Bool bUp = ( nMovY < 0 );
+ bool bUp = ( nMovY < 0 );
nRow = rMark.GetNextMarked( nCol, nRow, bUp );
while ( VALIDROW(nRow) &&
(RowHidden(nRow) || pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
@@ -1175,9 +1175,9 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
{
SCsROW nNextRow = pNextRows[nCol] - 1;
if ( bMarked )
- nNextRow = rMark.GetNextMarked( nCol, nNextRow, sal_True );
+ nNextRow = rMark.GetNextMarked( nCol, nNextRow, true );
if ( bUnprotected )
- nNextRow = aCol[nCol].GetNextUnprotected( nNextRow, sal_True );
+ nNextRow = aCol[nCol].GetNextUnprotected( nNextRow, true );
pNextRows[nCol] = nNextRow;
SCsROW nMaxRow = -1;
@@ -1216,7 +1216,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
}
}
-sal_Bool ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark )
+bool ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark )
{
const ScMarkArray* pMarkArray = rMark.GetArray();
OSL_ENSURE(pMarkArray,"GetNextMarkedCell ohne MarkArray");
@@ -1242,7 +1242,7 @@ sal_Bool ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData&
if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE )
{
rRow = nCellRow;
- return sal_True; // Zelle gefunden
+ return true; // Zelle gefunden
}
}
rRow = nEnd + 1; // naechsten markierten Bereich suchen
@@ -1282,7 +1282,7 @@ void ScTable::UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nR
void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
- ScDocument* pUndoDoc, sal_Bool bIncludeDraw, bool bUpdateNoteCaptionPos )
+ ScDocument* pUndoDoc, bool bIncludeDraw, bool bUpdateNoteCaptionPos )
{
bool bUpdated = false;
SCCOL i;
@@ -1318,7 +1318,7 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW
SCROW nSRow = 0;
SCCOL nECol = 0;
SCROW nERow = 0;
- sal_Bool bRecalcPages = false;
+ bool bRecalcPages = false;
for ( ScRangeVec::iterator aIt = aPrintRanges.begin(), aEnd = aPrintRanges.end(); aIt != aEnd; ++aIt )
{
@@ -1334,7 +1334,7 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW
nSCol,nSRow,nSTab, nECol,nERow,nETab ) )
{
*aIt = ScRange( nSCol, nSRow, 0, nECol, nERow, 0 );
- bRecalcPages = sal_True;
+ bRecalcPages = true;
}
}
@@ -1352,7 +1352,7 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW
nSCol,nSRow,nSTab, nECol,nERow,nETab ) )
{
*pRepeatColRange = ScRange( nSCol, nSRow, 0, nECol, nERow, 0 );
- bRecalcPages = sal_True;
+ bRecalcPages = true;
nRepeatStartX = nSCol; // fuer UpdatePageBreaks
nRepeatEndX = nECol;
}
@@ -1372,7 +1372,7 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW
nSCol,nSRow,nSTab, nECol,nERow,nETab ) )
{
*pRepeatRowRange = ScRange( nSCol, nSRow, 0, nECol, nERow, 0 );
- bRecalcPages = sal_True;
+ bRecalcPages = true;
nRepeatStartY = nSRow; // fuer UpdatePageBreaks
nRepeatEndY = nERow;
}
@@ -1424,7 +1424,7 @@ void ScTable::UpdateInsertTab(SCTAB nTable, SCTAB nNewSheets)
SetStreamValid(false);
}
-void ScTable::UpdateDeleteTab( SCTAB nTable, sal_Bool bIsMove, ScTable* pRefUndo, SCTAB nSheets )
+void ScTable::UpdateDeleteTab( SCTAB nTable, bool bIsMove, ScTable* pRefUndo, SCTAB nSheets )
{
if (nTab > nTable)
{
@@ -1476,7 +1476,7 @@ void ScTable::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo,
pDBDataNoName->UpdateMoveTab(nOldPos, nNewPos);
}
-void ScTable::UpdateCompile( sal_Bool bForceIfNameInUse )
+void ScTable::UpdateCompile( bool bForceIfNameInUse )
{
for (SCCOL i=0; i <= MAXCOL; i++)
{
@@ -1490,10 +1490,10 @@ void ScTable::SetTabNo(SCTAB nNewTab)
for (SCCOL i=0; i <= MAXCOL; i++) aCol[i].SetTabNo(nNewTab);
}
-sal_Bool ScTable::IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+bool ScTable::IsRangeNameInUse(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
sal_uInt16 nIndex) const
{
- sal_Bool bInUse = false;
+ bool bInUse = false;
for (SCCOL i = nCol1; !bInUse && (i <= nCol2) && (ValidCol(i)); i++)
bInUse = aCol[i].IsRangeNameInUse(nRow1, nRow2, nIndex);
return bInUse;
@@ -1613,7 +1613,7 @@ void ScTable::MaybeAddExtraColumn(SCCOL& rCol, SCROW nRow, OutputDevice* pDev, d
if ( TEXTWIDTH_DIRTY == nPixel )
{
ScNeededSizeOptions aOptions;
- aOptions.bTotalSize = sal_True;
+ aOptions.bTotalSize = true;
aOptions.bFormula = bFormula;
aOptions.bSkipMerged = false;
@@ -1776,7 +1776,7 @@ void ScTable::SetPrintEntireSheet()
if( !IsPrintEntireSheet() )
{
ClearPrintRanges();
- bPrintEntireSheet = sal_True;
+ bPrintEntireSheet = true;
}
}
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 353063184f02..10f0e9f08c31 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -64,7 +64,7 @@
// STATIC DATA -----------------------------------------------------------
-sal_Bool ScTable::SetOutlineTable( const ScOutlineTable* pNewOutline )
+bool ScTable::SetOutlineTable( const ScOutlineTable* pNewOutline )
{
sal_uInt16 nOldSizeX = 0;
sal_uInt16 nOldSizeY = 0;
@@ -113,15 +113,15 @@ void ScTable::SetSheetEvents( const ScSheetEvents* pNew )
}
-void ScTable::SetCalcNotification( sal_Bool bSet )
+void ScTable::SetCalcNotification( bool bSet )
{
bCalcNotification = bSet;
}
-sal_Bool ScTable::TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize )
+bool ScTable::TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCSIZE nSize )
{
- sal_Bool bTest = sal_True;
+ bool bTest = true;
if ( nStartCol==0 && nEndCol==MAXCOL && pOutlineTable )
bTest = pOutlineTable->TestInsertRow(nSize);
@@ -185,7 +185,7 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize,
- sal_Bool* pUndoOutline )
+ bool* pUndoOutline )
{
IncRecalcLevel();
InitializeNoteCaptions();
@@ -200,7 +200,7 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
if (pOutlineTable)
if (pOutlineTable->DeleteRow( nStartRow, nSize ))
if (pUndoOutline)
- *pUndoOutline = sal_True;
+ *pUndoOutline = true;
mpFilteredRows->removeSegment(nStartRow, nStartRow+nSize);
mpHiddenRows->removeSegment(nStartRow, nStartRow+nSize);
@@ -241,9 +241,9 @@ void ScTable::DeleteRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE
}
-sal_Bool ScTable::TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize )
+bool ScTable::TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize )
{
- sal_Bool bTest = sal_True;
+ bool bTest = true;
if ( nStartRow==0 && nEndRow==MAXROW && pOutlineTable )
bTest = pOutlineTable->TestInsertCol(nSize);
@@ -334,7 +334,7 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize,
- sal_Bool* pUndoOutline )
+ bool* pUndoOutline )
{
IncRecalcLevel();
InitializeNoteCaptions();
@@ -350,7 +350,7 @@ void ScTable::DeleteCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE
if (pOutlineTable)
if (pOutlineTable->DeleteCol( nStartCol, nSize ))
if (pUndoOutline)
- *pUndoOutline = sal_True;
+ *pUndoOutline = true;
SCCOL nRmSize = nStartCol + static_cast<SCCOL>(nSize);
mpHiddenCols->removeSegment(nStartCol, nRmSize);
@@ -459,7 +459,7 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark )
// pTable = Clipboard
void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- ScTable* pTable, sal_Bool bKeepScenarioFlags, sal_Bool bCloneNoteCaptions)
+ ScTable* pTable, bool bKeepScenarioFlags, bool bCloneNoteCaptions)
{
if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
{
@@ -516,7 +516,7 @@ void ScTable::CopyToClip(const ScRangeList& rRanges, ScTable* pTable,
void ScTable::CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
SCsCOL nDx, SCsROW nDy, sal_uInt16 nInsFlag,
- sal_Bool bAsLink, sal_Bool bSkipAttrForEmpty, ScTable* pTable)
+ bool bAsLink, bool bSkipAttrForEmpty, ScTable* pTable)
{
SCCOL i;
@@ -565,7 +565,7 @@ void ScTable::CopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
void ScTable::MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- sal_uInt16 nFunction, sal_Bool bSkipEmpty, ScTable* pSrcTab )
+ sal_uInt16 nFunction, bool bSkipEmpty, ScTable* pSrcTab )
{
for (SCCOL i=nCol1; i<=nCol2; i++)
aCol[i].MixData( nRow1, nRow2, nFunction, bSkipEmpty, pSrcTab->aCol[i] );
@@ -574,7 +574,7 @@ void ScTable::MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
// Markierung von diesem Dokument
void ScTable::MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction,
- sal_Bool bSkipEmpty, ScTable* pSrcTab )
+ bool bSkipEmpty, ScTable* pSrcTab )
{
for (SCCOL i=0; i<=MAXCOL; i++)
aCol[i].MixMarked( rMark, nFunction, bSkipEmpty, pSrcTab->aCol[i] );
@@ -582,9 +582,9 @@ void ScTable::MixMarked( const ScMarkData& rMark, sal_uInt16 nFunction,
void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- ScTable* pTransClip, sal_uInt16 nFlags, sal_Bool bAsLink )
+ ScTable* pTransClip, sal_uInt16 nFlags, bool bAsLink )
{
- sal_Bool bWasCut = pDocument->IsCutMode();
+ bool bWasCut = pDocument->IsCutMode();
ScDocument* pDestDoc = pTransClip->pDocument;
@@ -607,7 +607,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
aRef.nRow = nRow;
aRef.nTab = nTab;
aRef.InitFlags(); // -> all absolute
- aRef.SetFlag3D(sal_True);
+ aRef.SetFlag3D(true);
aRef.CalcRelFromAbs( aDestPos );
ScTokenArray aArr;
aArr.AddSingleReference( aRef );
@@ -666,7 +666,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
{
// no borders or merge items involved - use pattern as-is
for (nRow = nAttrRow1; nRow<=nAttrRow2; nRow++)
- pTransClip->SetPattern( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), *pPattern, sal_True );
+ pTransClip->SetPattern( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), *pPattern, true );
}
else
{
@@ -709,7 +709,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
for (nRow = nAttrRow1; nRow<=nAttrRow2; nRow++)
pTransClip->SetPattern( static_cast<SCCOL>(nRow-nRow1),
- static_cast<SCROW>(nCol-nCol1), aNewPattern, sal_True);
+ static_cast<SCROW>(nCol-nCol1), aNewPattern, true);
}
}
}
@@ -756,9 +756,9 @@ void ScTable::StartListeningInArea( SCCOL nCol1, SCROW nRow1,
void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- sal_uInt16 nFlags, sal_Bool bMarked, ScTable* pDestTab,
+ sal_uInt16 nFlags, bool bMarked, ScTable* pDestTab,
const ScMarkData* pMarkData,
- sal_Bool bAsLink, sal_Bool bColRowFlags)
+ bool bAsLink, bool bColRowFlags)
{
if (!ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2))
return;
@@ -786,8 +786,8 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
bool bFlagChange = false;
- sal_Bool bWidth = (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth);
- sal_Bool bHeight = (nCol1==0 && nCol2==MAXCOL && mpRowHeights && pDestTab->mpRowHeights);
+ bool bWidth = (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth);
+ bool bHeight = (nCol1==0 && nCol2==MAXCOL && mpRowHeights && pDestTab->mpRowHeights);
if (bWidth || bHeight)
{
@@ -868,13 +868,13 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
void ScTable::UndoToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
- sal_uInt16 nFlags, sal_Bool bMarked, ScTable* pDestTab,
+ sal_uInt16 nFlags, bool bMarked, ScTable* pDestTab,
const ScMarkData* pMarkData)
{
if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2))
{
- sal_Bool bWidth = (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth);
- sal_Bool bHeight = (nCol1==0 && nCol2==MAXCOL && mpRowHeights && pDestTab->mpRowHeights);
+ bool bWidth = (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth);
+ bool bHeight = (nCol1==0 && nCol2==MAXCOL && mpRowHeights && pDestTab->mpRowHeights);
if (bWidth||bHeight)
IncRecalcLevel();
@@ -950,7 +950,7 @@ void ScTable::MarkScenarioIn( ScMarkData& rDestMark, sal_uInt16 nNeededBits ) co
aCol[i].MarkScenarioIn( rDestMark );
}
-sal_Bool ScTable::HasScenarioRange( const ScRange& rRange ) const
+bool ScTable::HasScenarioRange( const ScRange& rRange ) const
{
OSL_ENSURE( bScenario, "bScenario == FALSE" );
@@ -966,7 +966,7 @@ sal_Bool ScTable::HasScenarioRange( const ScRange& rRange ) const
{
const ScRange* pR = (*pList)[j];
if ( pR->Intersects( aTabRange ) )
- return sal_True;
+ return true;
}
}
@@ -993,14 +993,14 @@ const ScRangeList* ScTable::GetScenarioRanges() const
return pScenarioRanges;
}
-sal_Bool ScTable::TestCopyScenarioTo( const ScTable* pDestTab ) const
+bool ScTable::TestCopyScenarioTo( const ScTable* pDestTab ) const
{
OSL_ENSURE( bScenario, "bScenario == FALSE" );
if (!pDestTab->IsProtected())
- return sal_True;
+ return true;
- sal_Bool bOk = sal_True;
+ bool bOk = true;
for (SCCOL i=0; i<=MAXCOL && bOk; i++)
bOk = aCol[i].TestCopyScenarioTo( pDestTab->aCol[i] );
return bOk;
@@ -1039,7 +1039,7 @@ void ScTable::PutCell( const ScAddress& rPos, ScBaseCell* pCell )
}
-sal_Bool ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString,
+bool ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString,
ScSetStringParam* pParam )
{
if (ValidColRow(nCol,nRow))
@@ -1184,7 +1184,7 @@ void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const
}
-sal_Bool ScTable::HasData( SCCOL nCol, SCROW nRow )
+bool ScTable::HasData( SCCOL nCol, SCROW nRow )
{
if (ValidColRow(nCol,nRow))
return aCol[nCol].HasDataAt( nRow );
@@ -1193,7 +1193,7 @@ sal_Bool ScTable::HasData( SCCOL nCol, SCROW nRow )
}
-sal_Bool ScTable::HasStringData( SCCOL nCol, SCROW nRow )
+bool ScTable::HasStringData( SCCOL nCol, SCROW nRow )
{
if (ValidColRow(nCol,nRow))
return aCol[nCol].HasStringData( nRow );
@@ -1202,7 +1202,7 @@ sal_Bool ScTable::HasStringData( SCCOL nCol, SCROW nRow )
}
-sal_Bool ScTable::HasValueData( SCCOL nCol, SCROW nRow )
+bool ScTable::HasValueData( SCCOL nCol, SCROW nRow )
{
if (ValidColRow(nCol,nRow))
return aCol[nCol].HasValueData( nRow );
@@ -1211,13 +1211,13 @@ sal_Bool ScTable::HasValueData( SCCOL nCol, SCROW nRow )
}
-sal_Bool ScTable::HasStringCells( SCCOL nStartCol, SCROW nStartRow,
+bool ScTable::HasStringCells( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow ) const
{
if ( ValidCol(nEndCol) )
for ( SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++ )
if (aCol[nCol].HasStringCells(nStartRow, nEndRow))
- return sal_True;
+ return true;
return false;
}
@@ -1232,7 +1232,7 @@ void ScTable::SetDirtyVar()
void ScTable::SetDirty()
{
- sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+ bool bOldAutoCalc = pDocument->GetAutoCalc();
pDocument->SetAutoCalc( false ); // Mehrfachberechnungen vermeiden
for (SCCOL i=0; i<=MAXCOL; i++)
aCol[i].SetDirty();
@@ -1242,7 +1242,7 @@ void ScTable::SetDirty()
void ScTable::SetDirty( const ScRange& rRange )
{
- sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+ bool bOldAutoCalc = pDocument->GetAutoCalc();
pDocument->SetAutoCalc( false ); // Mehrfachberechnungen vermeiden
SCCOL nCol2 = rRange.aEnd.Col();
for (SCCOL i=rRange.aStart.Col(); i<=nCol2; i++)
@@ -1253,7 +1253,7 @@ void ScTable::SetDirty( const ScRange& rRange )
void ScTable::SetTableOpDirty( const ScRange& rRange )
{
- sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+ bool bOldAutoCalc = pDocument->GetAutoCalc();
pDocument->SetAutoCalc( false ); // no multiple recalculation
SCCOL nCol2 = rRange.aEnd.Col();
for (SCCOL i=rRange.aStart.Col(); i<=nCol2; i++)
@@ -1264,7 +1264,7 @@ void ScTable::SetTableOpDirty( const ScRange& rRange )
void ScTable::SetDirtyAfterLoad()
{
- sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+ bool bOldAutoCalc = pDocument->GetAutoCalc();
pDocument->SetAutoCalc( false ); // Mehrfachberechnungen vermeiden
for (SCCOL i=0; i<=MAXCOL; i++)
aCol[i].SetDirtyAfterLoad();
@@ -1274,7 +1274,7 @@ void ScTable::SetDirtyAfterLoad()
void ScTable::SetRelNameDirty()
{
- sal_Bool bOldAutoCalc = pDocument->GetAutoCalc();
+ bool bOldAutoCalc = pDocument->GetAutoCalc();
pDocument->SetAutoCalc( false ); // Mehrfachberechnungen vermeiden
for (SCCOL i=0; i<=MAXCOL; i++)
aCol[i].SetRelNameDirty();
@@ -1394,7 +1394,7 @@ bool ScTable::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) co
bool ScTable::ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
SCCOL& rEndCol, SCROW& rEndRow,
- sal_Bool bRefresh, sal_Bool bAttrs )
+ bool bRefresh, bool bAttrs )
{
if (!(ValidCol(nStartCol) && ValidCol(rEndCol)))
{
@@ -1410,14 +1410,14 @@ bool ScTable::ExtendMerge( SCCOL nStartCol, SCROW nStartRow,
}
-sal_Bool ScTable::IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes ) const
+bool ScTable::IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes ) const
{
if (!(ValidCol(nCol1) && ValidCol(nCol2)))
{
OSL_FAIL("ScTable::IsBlockEmpty: invalid column number");
return false;
}
- sal_Bool bEmpty = sal_True;
+ bool bEmpty = true;
for (SCCOL i=nCol1; i<=nCol2 && bEmpty; i++)
bEmpty = aCol[i].IsEmptyBlock( nRow1, nRow2, bIgnoreNotes );
return bEmpty;
@@ -1432,7 +1432,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO
sal_uInt8 nRotDir = pPattern->GetRotateDir( pCondSet );
if ( nRotDir != SC_ROTDIR_NONE )
{
- sal_Bool bHit = sal_True;
+ bool bHit = true;
if ( nCol+1 < nX1 ) // column to the left
bHit = ( nRotDir != SC_ROTDIR_LEFT );
else if ( nCol > nX2+1 ) // column to the right
@@ -1460,7 +1460,7 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO
{
if (!RowHidden(nRow))
{
- sal_Bool bHitOne = sal_True;
+ bool bHitOne = true;
if ( nCol > nX2+1 )
{
// reicht die gedrehte Zelle bis in den sichtbaren Bereich?
@@ -1517,7 +1517,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC
while ( pPattern )
{
const SfxPoolItem* pCondItem;
- if ( pPattern->GetItemSet().GetItemState( ATTR_CONDITIONAL, sal_True, &pCondItem )
+ if ( pPattern->GetItemSet().GetItemState( ATTR_CONDITIONAL, true, &pCondItem )
== SFX_ITEM_SET )
{
// alle Formate durchgehen, damit die Zellen nicht einzeln
@@ -1562,7 +1562,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC
}
}
-sal_Bool ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const
+bool ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const
{
// nix:0, mitte:1, unten:2, links:4, oben:8, rechts:16, offen:32
sal_uInt16 nEdges;
@@ -1573,24 +1573,24 @@ sal_Bool ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
nEdges = aCol[nCol1].GetBlockMatrixEdges( nRow1, nRow2, n );
// nicht (4 und 16) oder 1 oder 32
if ( nEdges && (((nEdges & n) != n) || (nEdges & 33)) )
- return sal_True; // linke oder rechte Kante fehlt oder offen
+ return true; // linke oder rechte Kante fehlt oder offen
}
else
{ // linke Spalte
nEdges = aCol[nCol1].GetBlockMatrixEdges( nRow1, nRow2, 4 );
// nicht 4 oder 1 oder 32
if ( nEdges && (((nEdges & 4) != 4) || (nEdges & 33)) )
- return sal_True; // linke Kante fehlt oder offen
+ return true; // linke Kante fehlt oder offen
// rechte Spalte
nEdges = aCol[nCol2].GetBlockMatrixEdges( nRow1, nRow2, 16 );
// nicht 16 oder 1 oder 32
if ( nEdges && (((nEdges & 16) != 16) || (nEdges & 33)) )
- return sal_True; // rechte Kante fehlt oder offen
+ return true; // rechte Kante fehlt oder offen
}
if ( nRow1 == nRow2 )
{ // obere und untere Zeile
- sal_Bool bOpen = false;
+ bool bOpen = false;
const sal_uInt16 n = 2 | 8;
for ( SCCOL i=nCol1; i<=nCol2; i++)
{
@@ -1598,17 +1598,17 @@ sal_Bool ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
if ( nEdges )
{
if ( (nEdges & n) != n )
- return sal_True; // obere oder untere Kante fehlt
+ return true; // obere oder untere Kante fehlt
if ( nEdges & 4 )
- bOpen = sal_True; // linke Kante oeffnet, weitersehen
+ bOpen = true; // linke Kante oeffnet, weitersehen
else if ( !bOpen )
- return sal_True; // es gibt was, was nicht geoeffnet wurde
+ return true; // es gibt was, was nicht geoeffnet wurde
if ( nEdges & 16 )
bOpen = false; // rechte Kante schliesst
}
}
if ( bOpen )
- return sal_True; // es geht noch weiter
+ return true; // es geht noch weiter
}
else
{
@@ -1617,7 +1617,7 @@ sal_Bool ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
// erst obere Zeile, dann untere Zeile
for ( j=0, nR=nRow1, n=8; j<2; j++, nR=nRow2, n=2 )
{
- sal_Bool bOpen = false;
+ bool bOpen = false;
for ( SCCOL i=nCol1; i<=nCol2; i++)
{
nEdges = aCol[i].GetBlockMatrixEdges( nR, nR, n );
@@ -1626,17 +1626,17 @@ sal_Bool ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
// in oberere Zeile keine obere Kante bzw.
// in unterer Zeile keine untere Kante
if ( (nEdges & n) != n )
- return sal_True;
+ return true;
if ( nEdges & 4 )
- bOpen = sal_True; // linke Kante oeffnet, weitersehen
+ bOpen = true; // linke Kante oeffnet, weitersehen
else if ( !bOpen )
- return sal_True; // es gibt was, was nicht geoeffnet wurde
+ return true; // es gibt was, was nicht geoeffnet wurde
if ( nEdges & 16 )
bOpen = false; // rechte Kante schliesst
}
}
if ( bOpen )
- return sal_True; // es geht noch weiter
+ return true; // es geht noch weiter
}
}
return false;
@@ -1652,8 +1652,8 @@ bool ScTable::HasSelectionMatrixFragment( const ScMarkData& rMark ) const
}
-sal_Bool ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
- SCROW nRow2, sal_Bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
+bool ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
+ SCROW nRow2, bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
{
if ( !ValidColRow( nCol2, nRow2 ) )
{
@@ -1663,7 +1663,7 @@ sal_Bool ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
return false;
}
- sal_Bool bIsEditable = sal_True;
+ bool bIsEditable = true;
if ( nLockCount )
bIsEditable = false;
else if ( IsProtected() && !pDocument->IsScenario(nTab) )
@@ -1716,7 +1716,7 @@ sal_Bool ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
{
bIsEditable = false;
if ( pOnlyNotBecauseOfMatrix )
- *pOnlyNotBecauseOfMatrix = sal_True;
+ *pOnlyNotBecauseOfMatrix = true;
}
else if ( pOnlyNotBecauseOfMatrix )
*pOnlyNotBecauseOfMatrix = false;
@@ -1727,10 +1727,10 @@ sal_Bool ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
}
-sal_Bool ScTable::IsSelectionEditable( const ScMarkData& rMark,
- sal_Bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
+bool ScTable::IsSelectionEditable( const ScMarkData& rMark,
+ bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
{
- sal_Bool bIsEditable = sal_True;
+ bool bIsEditable = true;
if ( nLockCount )
bIsEditable = false;
else if ( IsProtected() && !pDocument->IsScenario(nTab) )
@@ -1794,7 +1794,7 @@ sal_Bool ScTable::IsSelectionEditable( const ScMarkData& rMark,
{
bIsEditable = false;
if ( pOnlyNotBecauseOfMatrix )
- *pOnlyNotBecauseOfMatrix = sal_True;
+ *pOnlyNotBecauseOfMatrix = true;
}
else if ( pOnlyNotBecauseOfMatrix )
*pOnlyNotBecauseOfMatrix = false;
@@ -1823,7 +1823,7 @@ void ScTable::UnlockTable()
}
-void ScTable::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, sal_Bool bDeep ) const
+void ScTable::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, bool bDeep ) const
{
for (SCCOL i=0; i<=MAXCOL; i++)
aCol[i].MergeSelectionPattern( rState, rMark, bDeep );
@@ -1831,7 +1831,7 @@ void ScTable::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkDa
void ScTable::MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1,
- SCCOL nCol2, SCROW nRow2, sal_Bool bDeep ) const
+ SCCOL nCol2, SCROW nRow2, bool bDeep ) const
{
for (SCCOL i=nCol1; i<=nCol2; i++)
aCol[i].MergePatternArea( rState, nRow1, nRow2, bDeep );
@@ -1932,7 +1932,7 @@ void ScTable::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData&
void ScTable::ApplySelectionLineStyle( const ScMarkData& rMark,
- const ::editeng::SvxBorderLine* pLine, sal_Bool bColorOnly )
+ const ::editeng::SvxBorderLine* pLine, bool bColorOnly )
{
if ( bColorOnly && !pLine )
return;
@@ -2005,17 +2005,17 @@ const ScStyleSheet* ScTable::GetAreaStyle( bool& rFound, SCCOL nCol1, SCROW nRow
}
-sal_Bool ScTable::IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGatherAllStyles ) const
+bool ScTable::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const
{
- sal_Bool bIsUsed = false;
+ bool bIsUsed = false;
for ( SCCOL i=0; i<=MAXCOL; i++ )
{
if ( aCol[i].IsStyleSheetUsed( rStyle, bGatherAllStyles ) )
{
if ( !bGatherAllStyles )
- return sal_True;
- bIsUsed = sal_True;
+ return true;
+ bIsUsed = true;
}
}
@@ -2023,7 +2023,7 @@ sal_Bool ScTable::IsStyleSheetUsed( const ScStyleSheet& rStyle, sal_Bool bGather
}
-void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, sal_Bool bRemoved,
+void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const Fraction& rZoomX, const Fraction& rZoomY )
@@ -2071,7 +2071,7 @@ bool ScTable::RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
}
-void ScTable::SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, sal_Bool bPutToPool )
+void ScTable::SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, bool bPutToPool )
{
if (ValidColRow(nCol,nRow))
aCol[nCol].SetPattern( nRow, rAttr, bPutToPool );
@@ -2093,7 +2093,7 @@ void ScTable::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& r
}
-void ScTable::ChangeSelectionIndent( sal_Bool bIncrement, const ScMarkData& rMark )
+void ScTable::ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark )
{
for (SCCOL i=0; i<=MAXCOL; i++)
aCol[i].ChangeSelectionIndent( bIncrement, rMark );
@@ -2203,10 +2203,10 @@ bool lcl_pixelSizeChanged(
}
-sal_Bool ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight,
+bool ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight,
double /* nPPTX */, double nPPTY )
{
- sal_Bool bChanged = false;
+ bool bChanged = false;
if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && mpRowHeights)
{
if (!nNewHeight)
@@ -2215,11 +2215,11 @@ sal_Bool ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16
nNewHeight = ScGlobal::nStdRowHeight;
}
- sal_Bool bSingle = false; // sal_True = process every row for its own
+ bool bSingle = false; // true = process every row for its own
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
if (pDrawLayer)
if (pDrawLayer->HasObjectsInRows( nTab, nStartRow, nEndRow ))
- bSingle = sal_True;
+ bSingle = true;
if (bSingle)
{
@@ -2241,9 +2241,9 @@ sal_Bool ScTable::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, sal_uInt16
{
SCROW nMid = (nStartRow+nEndRow) / 2;
if (SetRowHeightRange( nStartRow, nMid, nNewHeight, 1.0, 1.0 ))
- bChanged = sal_True;
+ bChanged = true;
if (SetRowHeightRange( nMid+1, nEndRow, nNewHeight, 1.0, 1.0 ))
- bChanged = sal_True;
+ bChanged = true;
}
}
else
@@ -2276,7 +2276,7 @@ void ScTable::SetRowHeightOnly( SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewH
mpRowHeights->setValue(nStartRow, nEndRow, nNewHeight);
}
-void ScTable::SetManualHeight( SCROW nStartRow, SCROW nEndRow, sal_Bool bManual )
+void ScTable::SetManualHeight( SCROW nStartRow, SCROW nEndRow, bool bManual )
{
if (VALIDROW(nStartRow) && VALIDROW(nEndRow) && pRowFlags)
{
@@ -2577,7 +2577,7 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
if (nEndRow > nRow2)
nEndRow = nRow2;
- sal_Bool bChanged = ( bWasVis != bShow );
+ bool bChanged = ( bWasVis != bShow );
SetRowHidden(nStartRow, nEndRow, !bShow);
SetRowFiltered(nStartRow, nEndRow, !bShow);
@@ -2617,7 +2617,7 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool bShow)
if (nEndRow > nRow2)
nEndRow = nRow2;
- sal_Bool bChanged = ( bWasVis != bShow );
+ bool bChanged = ( bWasVis != bShow );
SetRowHidden(nStartRow, nEndRow, !bShow);
if (bShow)
@@ -2775,7 +2775,7 @@ SCROW ScTable::GetLastChangedRow() const
}
-sal_Bool ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, sal_Bool bShow )
+bool ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, bool bShow )
{
if (pOutlineTable && pColFlags)
{
@@ -2787,7 +2787,7 @@ sal_Bool ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, sal_Bool bSh
}
-sal_Bool ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, sal_Bool bShow )
+bool ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, bool bShow )
{
if (pOutlineTable && pRowFlags)
return pOutlineTable->GetRowArray()->ManualAction( nStartRow, nEndRow, bShow, *this, false );
@@ -2866,12 +2866,12 @@ short DiffSign( T a, T b )
void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
{
- sal_Bool bSizeChanged = false;
+ bool bSizeChanged = false;
SCCOL nCol;
SCROW nRow;
SCROW i;
- sal_Bool bFound;
+ bool bFound;
ScOutlineArray* pArray;
ScBaseCell* pCell;
ScRange aRef;
@@ -2953,7 +2953,7 @@ void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW n
ScAddress aSrc( nStartCol, nStartRow, nTab );
ScAddress aDest( nDestCol, nDestRow, nDestTab );
ScRange aRange( aSrc, aDest );
- sal_Bool bThisTab = ( nDestTab == nTab );
+ bool bThisTab = ( nDestTab == nTab );
SCROW nDestY = nDestRow;
for (SCROW nRow=nStartRow; nRow<=nEndRow; nRow++)
{
@@ -2980,12 +2980,12 @@ void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW n
if (bThisTab)
{
PutCell( nDestX, nDestY, pCell );
- SetPattern( nDestX, nDestY, *GetPattern( nCol, nRow ), sal_True );
+ SetPattern( nDestX, nDestY, *GetPattern( nCol, nRow ), true );
}
else
{
pDocument->PutCell( aDest, pCell );
- pDocument->SetPattern( aDest, *GetPattern( nCol, nRow ), sal_True );
+ pDocument->SetPattern( aDest, *GetPattern( nCol, nRow ), true );
}
++nDestX;
@@ -2995,7 +2995,7 @@ void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW n
}
-sal_Bool ScTable::RefVisible(ScFormulaCell* pCell)
+bool ScTable::RefVisible(ScFormulaCell* pCell)
{
ScRange aRef;
@@ -3009,12 +3009,12 @@ sal_Bool ScTable::RefVisible(ScFormulaCell* pCell)
nEndRow = ::std::numeric_limits<SCROW>::max();
if (!ValidRow(nEndRow) || nEndRow < aRef.aEnd.Row())
- return sal_True; // at least partly visible
+ return true; // at least partly visible
return false; // completely invisible
}
}
- return sal_True; // irgendwie anders
+ return true; // irgendwie anders
}
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 81b9c973fdc1..047a7f60bcdd 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -144,15 +144,15 @@ bool SplitString( const rtl::OUString &sWhole,
sInput2 is greater.
*/
short Compare( const String &sInput1, const String &sInput2,
- const sal_Bool bCaseSens, const ScUserListData* pData, const CollatorWrapper *pCW )
+ const bool bCaseSens, const ScUserListData* pData, const CollatorWrapper *pCW )
{
rtl::OUString sStr1( sInput1 ), sStr2( sInput2 ), sPre1, sSuf1, sPre2, sSuf2;
do
{
double nNum1, nNum2;
- sal_Bool bNumFound1 = SplitString( sStr1, sPre1, sSuf1, nNum1 );
- sal_Bool bNumFound2 = SplitString( sStr2, sPre2, sSuf2, nNum2 );
+ bool bNumFound1 = SplitString( sStr1, sPre1, sSuf1, nNum1 );
+ bool bNumFound2 = SplitString( sStr2, sPre2, sSuf2, nNum2 );
short nPreRes; // Prefix comparison result
if ( pData )
@@ -308,7 +308,7 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 )
}
-sal_Bool ScTable::IsSortCollatorGlobal() const
+bool ScTable::IsSortCollatorGlobal() const
{
return pSortCollator == ScGlobal::GetCollator() ||
pSortCollator == ScGlobal::GetCaseCollator();
@@ -346,7 +346,7 @@ void ScTable::DestroySortCollator()
void ScTable::SortReorder( ScSortInfoArray* pArray, ScProgress& rProgress )
{
- sal_Bool bByRow = aSortParam.bByRow;
+ bool bByRow = aSortParam.bByRow;
SCSIZE nCount = pArray->GetCount();
SCCOLROW nStart = pArray->GetStart();
ScSortInfo** ppInfo = pArray->GetFirstArray();
@@ -401,10 +401,10 @@ short ScTable::CompareCell( sal_uInt16 nSort,
{
if (pCell2)
{
- sal_Bool bStr1 = ( eType1 != CELLTYPE_VALUE );
+ bool bStr1 = ( eType1 != CELLTYPE_VALUE );
if ( eType1 == CELLTYPE_FORMULA && ((ScFormulaCell*)pCell1)->IsValue() )
bStr1 = false;
- sal_Bool bStr2 = ( eType2 != CELLTYPE_VALUE );
+ bool bStr2 = ( eType2 != CELLTYPE_VALUE );
if ( eType2 == CELLTYPE_FORMULA && ((ScFormulaCell*)pCell2)->IsValue() )
bStr2 = false;
@@ -421,9 +421,9 @@ short ScTable::CompareCell( sal_uInt16 nSort,
else
GetString(nCell2Col, nCell2Row, aStr2);
- sal_Bool bUserDef = aSortParam.bUserDef; // custom sort order
- sal_Bool bNaturalSort = aSortParam.bNaturalSort; // natural sort
- sal_Bool bCaseSens = aSortParam.bCaseSens; // case sensitivity
+ bool bUserDef = aSortParam.bUserDef; // custom sort order
+ bool bNaturalSort = aSortParam.bNaturalSort; // natural sort
+ bool bCaseSens = aSortParam.bCaseSens; // case sensitivity
if (bUserDef)
{
@@ -577,8 +577,8 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL nCol2)
const ScPatternAttr* pPat2 = GetPattern(nCol2, nRow);
if (pPat1 != pPat2)
{
- SetPattern(nCol1, nRow, *pPat2, sal_True);
- SetPattern(nCol2, nRow, *pPat1, sal_True);
+ SetPattern(nCol1, nRow, *pPat2, true);
+ SetPattern(nCol2, nRow, *pPat1, true);
}
}
}
@@ -595,8 +595,8 @@ void ScTable::SwapRow(SCROW nRow1, SCROW nRow2)
const ScPatternAttr* pPat2 = GetPattern(nCol, nRow2);
if (pPat1 != pPat2)
{
- SetPattern(nCol, nRow1, *pPat2, sal_True);
- SetPattern(nCol, nRow2, *pPat1, sal_True);
+ SetPattern(nCol, nRow1, *pPat2, true);
+ SetPattern(nCol, nRow2, *pPat1, true);
}
}
}
@@ -642,14 +642,14 @@ short ScTable::Compare(SCCOLROW nIndex1, SCCOLROW nIndex2)
return nRes;
}
-sal_Bool ScTable::IsSorted( SCCOLROW nStart, SCCOLROW nEnd ) // ueber aSortParam
+bool ScTable::IsSorted( SCCOLROW nStart, SCCOLROW nEnd ) // ueber aSortParam
{
for (SCCOLROW i=nStart; i<nEnd; i++)
{
if (Compare( i, i+1 ) > 0)
return false;
}
- return sal_True;
+ return true;
}
void ScTable::DecoladeRow( ScSortInfoArray* pArray, SCROW nRow1, SCROW nRow2 )
@@ -663,7 +663,7 @@ void ScTable::DecoladeRow( ScSortInfoArray* pArray, SCROW nRow1, SCROW nRow2 )
}
}
-void ScTable::Sort(const ScSortParam& rSortParam, sal_Bool bKeepQuery)
+void ScTable::Sort(const ScSortParam& rSortParam, bool bKeepQuery)
{
aSortParam = rSortParam;
InitSortCollator( rSortParam );
@@ -718,7 +718,7 @@ void ScTable::Sort(const ScSortParam& rSortParam, sal_Bool bKeepQuery)
// Testen, ob beim Loeschen von Zwischenergebnissen andere Daten mit geloescht werden
// (fuer Hinweis-Box)
-sal_Bool ScTable::TestRemoveSubTotals( const ScSubTotalParam& rParam )
+bool ScTable::TestRemoveSubTotals( const ScSubTotalParam& rParam )
{
SCCOL nStartCol = rParam.nCol1;
SCROW nStartRow = rParam.nRow1 + 1; // Header
@@ -729,7 +729,7 @@ sal_Bool ScTable::TestRemoveSubTotals( const ScSubTotalParam& rParam )
SCROW nRow;
ScBaseCell* pCell;
- sal_Bool bWillDelete = false;
+ bool bWillDelete = false;
for ( nCol=nStartCol; nCol<=nEndCol && !bWillDelete; nCol++ )
{
ScColumnIterator aIter( &aCol[nCol],nStartRow,nEndRow );
@@ -741,7 +741,7 @@ sal_Bool ScTable::TestRemoveSubTotals( const ScSubTotalParam& rParam )
for (SCCOL nTestCol=0; nTestCol<=MAXCOL; nTestCol++)
if (nTestCol<nStartCol || nTestCol>nEndCol)
if (aCol[nTestCol].HasDataAt(nRow))
- bWillDelete = sal_True;
+ bWillDelete = true;
}
}
}
@@ -793,7 +793,7 @@ void lcl_RemoveNumberFormat( ScTable* pTab, SCCOL nCol, SCROW nRow )
SfxItemSet& rSet = aNewPattern.GetItemSet();
rSet.ClearItem( ATTR_VALUE_FORMAT );
rSet.ClearItem( ATTR_LANGUAGE_FORMAT );
- pTab->SetPattern( nCol, nRow, aNewPattern, sal_True );
+ pTab->SetPattern( nCol, nRow, aNewPattern, true );
}
}
@@ -811,7 +811,7 @@ typedef struct lcl_ScTable_DoSubTotals_RowEntry
// neue Zwischenergebnisse
// rParam.nRow2 wird veraendert !
-sal_Bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
+bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
{
SCCOL nStartCol = rParam.nCol1;
SCROW nStartRow = rParam.nRow1 + 1; // Header
@@ -826,7 +826,7 @@ sal_Bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
nEndRow -= nEmpty;
sal_uInt16 nLevelCount = 0; // Anzahl Gruppierungen
- sal_Bool bDoThis = sal_True;
+ bool bDoThis = true;
for (i=0; i<MAXSUBTOTAL && bDoThis; i++)
if (rParam.bGroupActive[i])
nLevelCount = i+1;
@@ -834,7 +834,7 @@ sal_Bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
bDoThis = false;
if (nLevelCount==0) // nichts tun
- return sal_True;
+ return true;
SCCOL* nGroupCol = rParam.nField; // Spalten nach denen
// gruppiert wird
@@ -842,12 +842,12 @@ sal_Bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
// Durch (leer) als eigene Kategorie muss immer auf
// Teilergebniszeilen aus den anderen Spalten getestet werden
// (frueher nur, wenn eine Spalte mehrfach vorkam)
- sal_Bool bTestPrevSub = ( nLevelCount > 1 );
+ bool bTestPrevSub = ( nLevelCount > 1 );
String aSubString;
String aOutString;
- sal_Bool bIgnoreCase = !rParam.bCaseSens;
+ bool bIgnoreCase = !rParam.bCaseSens;
String *pCompString[MAXSUBTOTAL]; // Pointer wegen Compiler-Problemen
for (i=0; i<MAXSUBTOTAL; i++)
@@ -858,7 +858,7 @@ sal_Bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
ScStyleSheet* pStyle = (ScStyleSheet*) pDocument->GetStyleSheetPool()->Find(
ScGlobal::GetRscString(STR_STYLENAME_RESULT), SFX_STYLE_FAMILY_PARA );
- sal_Bool bSpaceLeft = sal_True; // Erfolg beim Einfuegen?
+ bool bSpaceLeft = true; // Erfolg beim Einfuegen?
// For performance reasons collect formula entries so their
// references don't have to be tested for updates each time a new row is
@@ -868,7 +868,7 @@ sal_Bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
for (sal_uInt16 nLevel=0; nLevel<=nLevelCount && bSpaceLeft; nLevel++) // incl. Gesamtergebnis
{
- sal_Bool bTotal = ( nLevel == nLevelCount );
+ bool bTotal = ( nLevel == nLevelCount );
aRowEntry.nGroupNo = bTotal ? 0 : (nLevelCount-nLevel-1);
// how many results per level
@@ -887,13 +887,13 @@ sal_Bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
*pCompString[i] = aSubString;
} // aSubString bleibt auf dem letzten stehen
- sal_Bool bBlockVis = false; // Gruppe eingeblendet?
+ bool bBlockVis = false; // Gruppe eingeblendet?
aRowEntry.nSubStartRow = nStartRow;
for (SCROW nRow=nStartRow; nRow<=nEndRow+1 && bSpaceLeft; nRow++)
{
- sal_Bool bChanged;
+ bool bChanged;
if (nRow>nEndRow)
- bChanged = sal_True;
+ bChanged = true;
else
{
bChanged = false;
@@ -1065,25 +1065,25 @@ sal_Bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
}
-sal_Bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
- sal_Bool* pSpecial /* =NULL */ , ScBaseCell* pCell /* =NULL */ ,
- sal_Bool* pbTestEqualCondition /* = NULL */ )
+bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
+ bool* pSpecial /* =NULL */ , ScBaseCell* pCell /* =NULL */ ,
+ bool* pbTestEqualCondition /* = NULL */ )
{
if (!rParam.GetEntry(0).bDoQuery)
- return sal_True;
+ return true;
//---------------------------------------------------------------
const SCSIZE nFixedBools = 32;
- sal_Bool aBool[nFixedBools];
- sal_Bool aTest[nFixedBools];
+ bool aBool[nFixedBools];
+ bool aTest[nFixedBools];
SCSIZE nEntryCount = rParam.GetEntryCount();
- sal_Bool* pPasst = ( nEntryCount <= nFixedBools ? &aBool[0] : new sal_Bool[nEntryCount] );
- sal_Bool* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new sal_Bool[nEntryCount] );
+ bool* pPasst = ( nEntryCount <= nFixedBools ? &aBool[0] : new bool[nEntryCount] );
+ bool* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new bool[nEntryCount] );
long nPos = -1;
SCSIZE i = 0;
- sal_Bool bMatchWholeCell = pDocument->GetDocOptions().IsMatchWholeCell();
+ bool bMatchWholeCell = pDocument->GetDocOptions().IsMatchWholeCell();
CollatorWrapper* pCollator = (rParam.bCaseSens ? ScGlobal::GetCaseCollator() :
ScGlobal::GetCollator());
::utl::TransliterationWrapper* pTransliteration = (rParam.bCaseSens ?
@@ -1096,8 +1096,8 @@ sal_Bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
if ( !pCell || i > 0 )
pCell = GetCell( static_cast<SCCOL>(rEntry.nField), nRow );
- sal_Bool bOk = false;
- sal_Bool bTestEqual = false;
+ bool bOk = false;
+ bool bTestEqual = false;
if ( pSpecial && pSpecial[i] )
{
@@ -1211,12 +1211,12 @@ sal_Bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
else
GetInputString( static_cast<SCCOL>(rEntry.nField), nRow, aCellStr );
- sal_Bool bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL)
+ bool bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL)
|| (rEntry.eOp == SC_NOT_EQUAL) || (rEntry.eOp == SC_CONTAINS)
|| (rEntry.eOp == SC_DOES_NOT_CONTAIN) || (rEntry.eOp == SC_BEGINS_WITH)
|| (rEntry.eOp == SC_ENDS_WITH) || (rEntry.eOp == SC_DOES_NOT_BEGIN_WITH)
|| (rEntry.eOp == SC_DOES_NOT_END_WITH)));
- sal_Bool bTestRegExp = (pbTestEqualCondition && rParam.bRegExp
+ bool bTestRegExp = (pbTestEqualCondition && rParam.bRegExp
&& ((rEntry.eOp == SC_LESS_EQUAL)
|| (rEntry.eOp == SC_GREATER_EQUAL)));
if ( bRealRegExp || bTestRegExp )
@@ -1225,17 +1225,17 @@ sal_Bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
xub_StrLen nEnd = aCellStr.Len();
// from 614 on, nEnd is behind the found text
- sal_Bool bMatch = false;
+ bool bMatch = false;
if ( rEntry.eOp == SC_ENDS_WITH || rEntry.eOp == SC_DOES_NOT_END_WITH )
{
nEnd = 0;
nStart = aCellStr.Len();
- bMatch = (sal_Bool) rEntry.GetSearchTextPtr( rParam.bCaseSens )
+ bMatch = (bool) rEntry.GetSearchTextPtr( rParam.bCaseSens )
->SearchBkwrd( aCellStr, &nStart, &nEnd );
}
else
{
- bMatch = (sal_Bool) rEntry.GetSearchTextPtr( rParam.bCaseSens )
+ bMatch = (bool) rEntry.GetSearchTextPtr( rParam.bCaseSens )
->SearchFrwrd( aCellStr, &nStart, &nEnd );
}
if ( bMatch && bMatchWholeCell
@@ -1371,14 +1371,14 @@ sal_Bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
(pCell ? pCell->HasValueData() :
HasValueData( static_cast<SCCOL>(rEntry.nField), nRow)))
{
- bOk = sal_True;
+ bOk = true;
}
else if (!rEntry.bQueryByString &&
(rEntry.eOp == SC_GREATER || rEntry.eOp == SC_GREATER_EQUAL) &&
(pCell ? pCell->HasStringData() :
HasStringData( static_cast<SCCOL>(rEntry.nField), nRow)))
{
- bOk = sal_True;
+ bOk = true;
}
}
@@ -1411,7 +1411,7 @@ sal_Bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
pTest[0] = pTest[0] || pTest[j];
}
- sal_Bool bRet = pPasst[0];
+ bool bRet = pPasst[0];
if ( pPasst != &aBool[0] )
delete [] pPasst;
if ( pbTestEqualCondition )
@@ -1424,7 +1424,7 @@ sal_Bool ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam,
void ScTable::TopTenQuery( ScQueryParam& rParam )
{
- sal_Bool bSortCollatorInitialized = false;
+ bool bSortCollatorInitialized = false;
SCSIZE nEntryCount = rParam.GetEntryCount();
SCROW nRow1 = (rParam.bHasHeader ? rParam.nRow1 + 1 : rParam.nRow1);
SCSIZE nCount = static_cast<SCSIZE>(rParam.nRow2 - nRow1 + 1);
@@ -1442,7 +1442,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
aSortParam = aLocalSortParam; // used in CreateSortInfoArray, Compare
if ( !bSortCollatorInitialized )
{
- bSortCollatorInitialized = sal_True;
+ bSortCollatorInitialized = true;
InitSortCollator( aLocalSortParam );
}
ScSortInfoArray* pArray = CreateSortInfoArray( nRow1, rParam.nRow2 );
@@ -1544,7 +1544,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam )
DestroySortCollator();
}
-static void lcl_PrepareQuery( ScDocument* pDoc, ScTable* pTab, ScQueryParam& rParam, sal_Bool* pSpecial )
+static void lcl_PrepareQuery( ScDocument* pDoc, ScTable* pTab, ScQueryParam& rParam, bool* pSpecial )
{
bool bTopTen = false;
SCSIZE nEntryCount = rParam.GetEntryCount();
@@ -1583,7 +1583,7 @@ static void lcl_PrepareQuery( ScDocument* pDoc, ScTable* pTab, ScQueryParam& rPa
// call from UNO or second call from autofilter
if ( rEntry.nVal == SC_EMPTYFIELDS || rEntry.nVal == SC_NONEMPTYFIELDS )
{
- pSpecial[i] = sal_True;
+ pSpecial[i] = true;
}
}
if ( !bTopTen )
@@ -1612,14 +1612,14 @@ static void lcl_PrepareQuery( ScDocument* pDoc, ScTable* pTab, ScQueryParam& rPa
}
}
-SCSIZE ScTable::Query(ScQueryParam& rParamOrg, sal_Bool bKeepSub)
+SCSIZE ScTable::Query(ScQueryParam& rParamOrg, bool bKeepSub)
{
ScQueryParam aParam( rParamOrg );
ScStrCollection aScStrCollection;
StrData* pStrData = NULL;
- sal_Bool bStarted = false;
- sal_Bool bOldResult = sal_True;
+ bool bStarted = false;
+ bool bOldResult = true;
SCROW nOldStart = 0;
SCROW nOldEnd = 0;
@@ -1628,7 +1628,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, sal_Bool bKeepSub)
SCROW nHeader = aParam.bHasHeader ? 1 : 0;
SCSIZE nEntryCount = aParam.GetEntryCount();
- sal_Bool* pSpecial = new sal_Bool[nEntryCount];
+ bool* pSpecial = new bool[nEntryCount];
lcl_PrepareQuery( pDocument, this, aParam, pSpecial );
if (!aParam.bInplace)
@@ -1646,8 +1646,8 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, sal_Bool bKeepSub)
SCROW nRealRow2 = aParam.nRow2;
for (SCROW j = aParam.nRow1 + nHeader; j <= nRealRow2; ++j)
{
- sal_Bool bResult; // Filterergebnis
- sal_Bool bValid = ValidQuery(j, aParam, pSpecial);
+ bool bResult; // Filterergebnis
+ bool bValid = ValidQuery(j, aParam, pSpecial);
if (!bValid && bKeepSub) // Subtotals stehenlassen
{
for (SCCOL nCol=aParam.nCol1; nCol<=aParam.nCol2 && !bValid; nCol++)
@@ -1658,13 +1658,13 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, sal_Bool bKeepSub)
if ( pCell->GetCellType() == CELLTYPE_FORMULA )
if (((ScFormulaCell*)pCell)->IsSubTotal())
if (RefVisible((ScFormulaCell*)pCell))
- bValid = sal_True;
+ bValid = true;
}
}
if (bValid)
{
if (aParam.bDuplicate)
- bResult = sal_True;
+ bResult = true;
else
{
String aStr;
@@ -1677,11 +1677,11 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, sal_Bool bKeepSub)
}
pStrData = new StrData(aStr);
- sal_Bool bIsUnique = sal_True;
+ bool bIsUnique = true;
if (pStrData)
bIsUnique = aScStrCollection.Insert(pStrData);
if (bIsUnique)
- bResult = sal_True;
+ bResult = true;
else
{
delete pStrData;
@@ -1703,7 +1703,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, sal_Bool bKeepSub)
nOldStart = nOldEnd = j;
bOldResult = bResult;
}
- bStarted = sal_True;
+ bStarted = true;
}
else
{
@@ -1727,9 +1727,9 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, sal_Bool bKeepSub)
return nCount;
}
-sal_Bool ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
+bool ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
{
- sal_Bool bValid = sal_True;
+ bool bValid = true;
SCCOL* pFields = new SCCOL[nCol2-nCol1+1];
String aCellStr;
SCCOL nCol = nCol1;
@@ -1742,7 +1742,7 @@ sal_Bool ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
{
String aQueryStr;
GetUpperCellString(nCol, nRow1, aQueryStr);
- sal_Bool bFound = false;
+ bool bFound = false;
SCCOL i = rQueryParam.nCol1;
while (!bFound && (i <= nDBCol2))
{
@@ -1807,7 +1807,7 @@ sal_Bool ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
return bValid;
}
-sal_Bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
+bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
{
// A valid StarQuery must be at least 4 columns wide. To be precise it
// should be exactly 4 columns ...
@@ -1820,8 +1820,8 @@ sal_Bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n
if (nCol2 - nCol1 < 3)
return false;
- sal_Bool bValid;
- sal_Bool bFound;
+ bool bValid;
+ bool bFound;
String aCellStr;
SCSIZE nIndex = 0;
SCROW nRow = nRow1;
@@ -1845,12 +1845,12 @@ sal_Bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n
if ( aCellStr == ScGlobal::GetRscString(STR_TABLE_UND) )
{
rEntry.eConnect = SC_AND;
- bValid = sal_True;
+ bValid = true;
}
else if ( aCellStr == ScGlobal::GetRscString(STR_TABLE_ODER) )
{
rEntry.eConnect = SC_OR;
- bValid = sal_True;
+ bValid = true;
}
}
// Zweite Spalte FeldName
@@ -1869,7 +1869,7 @@ sal_Bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n
if (bFound)
{
rEntry.nField = i;
- bValid = sal_True;
+ bValid = true;
}
else
bValid = false;
@@ -1904,7 +1904,7 @@ sal_Bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n
if (bValid)
{
GetString(nCol1 + 3, nRow, *rEntry.pStr);
- rEntry.bDoQuery = sal_True;
+ rEntry.bDoQuery = true;
}
nIndex++;
nRow++;
@@ -1913,7 +1913,7 @@ sal_Bool ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n
return bValid;
}
-sal_Bool ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
+bool ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam)
{
SCSIZE i, nCount;
PutInOrder(nCol1, nCol2);
@@ -1924,7 +1924,7 @@ sal_Bool ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
rQueryParam.GetEntry(i).Clear();
// Standard QueryTabelle
- sal_Bool bValid = CreateStarQuery(nCol1, nRow1, nCol2, nRow2, rQueryParam);
+ bool bValid = CreateStarQuery(nCol1, nRow1, nCol2, nRow2, rQueryParam);
// Excel QueryTabelle
if (!bValid)
bValid = CreateExcelQuery(nCol1, nRow1, nCol2, nRow2, rQueryParam);
@@ -1934,7 +1934,7 @@ sal_Bool ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
{
// bQueryByString muss gesetzt sein
for (i=0; i < nCount; i++)
- rQueryParam.GetEntry(i).bQueryByString = sal_True;
+ rQueryParam.GetEntry(i).bQueryByString = true;
}
else
{
@@ -1945,7 +1945,7 @@ sal_Bool ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
return bValid;
}
-sal_Bool ScTable::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW /* nEndRow */ )
+bool ScTable::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW /* nEndRow */ )
{
for (SCCOL nCol=nStartCol; nCol<=nEndCol; nCol++)
{
@@ -1953,10 +1953,10 @@ sal_Bool ScTable::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
if (eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT)
return false;
}
- return sal_True;
+ return true;
}
-sal_Bool ScTable::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL /* nEndCol */, SCROW nEndRow )
+bool ScTable::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL /* nEndCol */, SCROW nEndRow )
{
for (SCROW nRow=nStartRow; nRow<=nEndRow; nRow++)
{
@@ -1964,7 +1964,7 @@ sal_Bool ScTable::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL /* nEndC
if (eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT)
return false;
}
- return sal_True;
+ return true;
}
void ScTable::GetFilterEntries(SCCOL nCol, SCROW nRow1, SCROW nRow2, TypedScStrCollection& rStrings, bool& rHasDates)
@@ -1989,7 +1989,7 @@ void ScTable::GetFilteredFilterEntries(
}
nEntryCount = aParam.GetEntryCount();
- sal_Bool* pSpecial = new sal_Bool[nEntryCount];
+ bool* pSpecial = new bool[nEntryCount];
lcl_PrepareQuery( pDocument, this, aParam, pSpecial );
bool bHasDates = false;
for ( SCROW j = nRow1; j <= nRow2; ++j )
@@ -2006,7 +2006,7 @@ void ScTable::GetFilteredFilterEntries(
delete[] pSpecial;
}
-sal_Bool ScTable::GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, sal_Bool bLimit)
+bool ScTable::GetDataEntries(SCCOL nCol, SCROW nRow, TypedScStrCollection& rStrings, bool bLimit)
{
return aCol[nCol].GetDataEntries( nRow, rStrings, bLimit );
}
@@ -2072,7 +2072,7 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData,
{
// Cursor neben einer Markierung nicht beruecksichtigen:
//! nur noch MarkData uebergeben, Cursorposition ggf. hineinselektieren!!!
- sal_Bool bSingle = ( rMark.IsMarked() || !rMark.IsMultiMarked() );
+ bool bSingle = ( rMark.IsMarked() || !rMark.IsMultiMarked() );
// Mehrfachselektion:
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index c94a8fa9c687..4854f493581e 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -168,7 +168,7 @@ String lcl_ValueString( sal_Int32 nValue, sal_uInt16 nMinDigits )
static ScBaseCell * lcl_getSuffixCell( ScDocument* pDocument, sal_Int32 nValue,
sal_uInt16 nDigits, const String& rSuffix, CellType eCellType,
- sal_Bool bIsOrdinalSuffix )
+ bool bIsOrdinalSuffix )
{
String aValue( lcl_ValueString( nValue, nDigits ));
if (!bIsOrdinalSuffix)
@@ -228,7 +228,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if (eCellType == CELLTYPE_VALUE)
{
sal_uInt32 nFormat = ((const SfxUInt32Item*)GetAttr(nCol,nRow,ATTR_VALUE_FORMAT))->GetValue();
- sal_Bool bDate = ( pDocument->GetFormatTable()->GetType(nFormat) == NUMBERFORMAT_DATE );
+ bool bDate = ( pDocument->GetFormatTable()->GetType(nFormat) == NUMBERFORMAT_DATE );
if (bDate)
{
if (nCount > 1)
@@ -261,7 +261,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
nCol = sal::static_int_cast<SCCOL>( nCol + nAddX );
nRow = sal::static_int_cast<SCROW>( nRow + nAddY );
- sal_Bool bVal = sal_True;
+ bool bVal = true;
for (sal_uInt16 i=1; i<nCount && bVal; i++)
{
ScBaseCell* pCell = GetCell(nCol,nRow);
@@ -318,7 +318,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
rInc = nVal2 - nVal1;
nCol = sal::static_int_cast<SCCOL>( nCol + nAddX );
nRow = sal::static_int_cast<SCROW>( nRow + nAddY );
- sal_Bool bVal = sal_True;
+ bool bVal = true;
for (sal_uInt16 i=1; i<nCount && bVal; i++)
{
ScBaseCell* pCell = GetCell(nCol,nRow);
@@ -376,7 +376,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
rInc = (double)nVal2 - (double)nVal1;
nCol = sal::static_int_cast<SCCOL>( nCol + nAddX );
nRow = sal::static_int_cast<SCROW>( nRow + nAddY );
- sal_Bool bVal = sal_True;
+ bool bVal = true;
for (sal_uInt16 i=1; i<nCount && bVal; i++)
{
ScBaseCell* pCell = GetCell(nCol,nRow);
@@ -417,8 +417,8 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
}
}
-void ScTable::FillFormula(sal_uLong& /* nFormulaCounter */, sal_Bool /* bFirst */, ScFormulaCell* pSrcCell,
- SCCOL nDestCol, SCROW nDestRow, sal_Bool bLast )
+void ScTable::FillFormula(sal_uLong& /* nFormulaCounter */, bool /* bFirst */, ScFormulaCell* pSrcCell,
+ SCCOL nDestCol, SCROW nDestRow, bool bLast )
{
pDocument->SetNoListening( true ); // noch falsche Referenzen
@@ -471,8 +471,8 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
// Richtung auswerten
//
- sal_Bool bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP);
- sal_Bool bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT);
+ bool bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP);
+ bool bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT);
sal_uLong nCol = 0;
sal_uLong nRow = 0;
@@ -526,7 +526,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
sal_uLong nIMin = nIStart;
sal_uLong nIMax = nIEnd;
PutInOrder(nIMin,nIMax);
- sal_Bool bHasFiltered = IsDataFiltered();
+ bool bHasFiltered = IsDataFiltered();
if (!bHasFiltered)
{
@@ -553,7 +553,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
const ScStyleSheet* pStyleSheet = NULL;
sal_uLong nAtSrc = nISrcStart;
ScPatternAttr* pNewPattern = NULL;
- sal_Bool bGetPattern = sal_True;
+ bool bGetPattern = true;
rInner = nIStart;
while (true) // #i53728# with "for (;;)" old solaris/x86 compiler mis-optimizes
{
@@ -624,18 +624,18 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if ( nAtSrc != nISrcStart )
{ // mehr als eine Source-Zelle
nAtSrc = nISrcStart;
- bGetPattern = sal_True;
+ bGetPattern = true;
}
}
else if (bPositive)
{
++nAtSrc;
- bGetPattern = sal_True;
+ bGetPattern = true;
}
else
{
--nAtSrc;
- bGetPattern = sal_True;
+ bGetPattern = true;
}
}
@@ -712,16 +712,16 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
nDelta = -1.0;
double nVal = 0.0;
sal_uLong nFormulaCounter = nActFormCnt;
- sal_Bool bFirst = sal_True;
- sal_Bool bGetCell = sal_True;
+ bool bFirst = true;
+ bool bGetCell = true;
sal_uInt16 nCellDigits = 0;
short nHeadNoneTail = 0;
sal_Int32 nStringValue = 0;
String aValue;
ScBaseCell* pSrcCell = NULL;
CellType eCellType = CELLTYPE_NONE;
- sal_Bool bIsOrdinalSuffix = false;
- sal_Bool bRowFiltered = false;
+ bool bIsOrdinalSuffix = false;
+ bool bRowFiltered = false;
rInner = nIStart;
while (true) // #i53728# with "for (;;)" old solaris/x86 compiler mis-optimizes
@@ -836,7 +836,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if ( nSource != nISrcStart )
{ // mehr als eine Source-Zelle
nSource = nISrcStart;
- bGetCell = sal_True;
+ bGetCell = true;
}
if ( !(nScFillModeMouseModifier & KEY_MOD1) && !bHasFiltered )
{
@@ -851,12 +851,12 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
else if (bPositive)
{
++nSource;
- bGetCell = sal_True;
+ bGetCell = true;
}
else
{
--nSource;
- bGetCell = sal_True;
+ bGetCell = true;
}
}
@@ -903,7 +903,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
SCROW nRow1 = rSource.aStart.Row();
SCCOL nCol2 = rSource.aEnd.Col();
SCROW nRow2 = rSource.aEnd.Row();
- sal_Bool bOk = sal_True;
+ bool bOk = true;
long nIndex = 0;
sal_uLong nSrcCount = 0;
FillDir eFillDir = FILL_TO_BOTTOM;
@@ -1051,7 +1051,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
}
else if ( eFillCmd == FILL_LINEAR || eFillCmd == FILL_DATE ) // Werte
{
- sal_Bool bValueOk;
+ bool bValueOk;
double nStart;
sal_Int32 nVal = 0;
short nHeadNoneTail = 0;
@@ -1095,7 +1095,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n
}
else // Datum
{
- bValueOk = sal_True;
+ bValueOk = true;
sal_uInt16 nDayOfMonth = 0;
if ( nIndex < 0 )
{
@@ -1242,14 +1242,14 @@ void ScTable::IncDate(double& rVal, sal_uInt16& nDayOfMonth, double nStep, FillD
void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
sal_uLong nFillCount, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd,
double nStepValue, double nMaxValue, sal_uInt16 nArgMinDigits,
- sal_Bool bAttribs, ScProgress& rProgress )
+ bool bAttribs, ScProgress& rProgress )
{
//
// Richtung auswerten
//
- sal_Bool bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP);
- sal_Bool bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT);
+ bool bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP);
+ bool bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT);
sal_uLong nCol = 0;
sal_uLong nRow = 0;
@@ -1320,7 +1320,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
sal_uLong nActFormCnt = 0;
for (rOuter = nOStart; rOuter <= nOEnd; rOuter++)
{
- sal_Bool bFirst = sal_True;
+ bool bFirst = true;
rInner = nISource;
ScBaseCell* pSrcCell = aCol[nCol].GetCell(static_cast<SCROW>(nRow));
@@ -1332,10 +1332,10 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
const ScPatternAttr* pSrcPattern = aCol[nCol].GetPattern(static_cast<SCROW>(nRow));
if (bVertical)
aCol[nCol].SetPatternArea( static_cast<SCROW>(nIMin),
- static_cast<SCROW>(nIMax), *pSrcPattern, sal_True );
+ static_cast<SCROW>(nIMax), *pSrcPattern, true );
else
for (SCCOL nAtCol = static_cast<SCCOL>(nIMin); nAtCol <= sal::static_int_cast<SCCOL>(nIMax); nAtCol++)
- aCol[nAtCol].SetPattern(static_cast<SCROW>(nRow), *pSrcPattern, sal_True);
+ aCol[nAtCol].SetPattern(static_cast<SCROW>(nRow), *pSrcPattern, true);
}
if (pSrcCell)
@@ -1380,8 +1380,8 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
double nVal = nStartVal;
long nIndex = 0;
- sal_Bool bError = false;
- sal_Bool bOverflow = false;
+ bool bError = false;
+ bool bOverflow = false;
sal_uInt16 nDayOfMonth = 0;
rInner = nIStart;
@@ -1399,16 +1399,16 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
double nAdd = nStepValue;
if ( !SubTotal::SafeMult( nAdd, (double) ++nIndex ) ||
!SubTotal::SafePlus( nVal, nAdd ) )
- bError = sal_True;
+ bError = true;
}
break;
case FILL_GROWTH:
if (!SubTotal::SafeMult(nVal, nStepValue))
- bError = sal_True;
+ bError = true;
break;
case FILL_DATE:
if (fabs(nVal) > _D_MAX_LONG_)
- bError = sal_True;
+ bError = true;
else
IncDate(nVal, nDayOfMonth, nStepValue, eFillDateCmd);
break;
@@ -1423,7 +1423,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if (nVal > nMaxValue) // Zielwert erreicht?
{
nVal = nMaxValue;
- bOverflow = sal_True;
+ bOverflow = true;
}
}
else
@@ -1431,7 +1431,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if (nVal < nMaxValue)
{
nVal = nMaxValue;
- bOverflow = sal_True;
+ bOverflow = true;
}
}
}
@@ -1472,10 +1472,10 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
double nStartVal = (double)nStringValue;
double nVal = nStartVal;
long nIndex = 0;
- sal_Bool bError = false;
- sal_Bool bOverflow = false;
+ bool bError = false;
+ bool bOverflow = false;
- sal_Bool bIsOrdinalSuffix = aValue.Equals( ScGlobal::GetOrdinalSuffix(
+ bool bIsOrdinalSuffix = aValue.Equals( ScGlobal::GetOrdinalSuffix(
(sal_Int32)nStartVal));
rInner = nIStart;
@@ -1493,12 +1493,12 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
double nAdd = nStepValue;
if ( !SubTotal::SafeMult( nAdd, (double) ++nIndex ) ||
!SubTotal::SafePlus( nVal, nAdd ) )
- bError = sal_True;
+ bError = true;
}
break;
case FILL_GROWTH:
if (!SubTotal::SafeMult(nVal, nStepValue))
- bError = sal_True;
+ bError = true;
break;
default:
{
@@ -1511,7 +1511,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if (nVal > nMaxValue) // Zielwert erreicht?
{
nVal = nMaxValue;
- bOverflow = sal_True;
+ bOverflow = true;
}
}
else
@@ -1519,7 +1519,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
if (nVal < nMaxValue)
{
nVal = nMaxValue;
- bOverflow = sal_True;
+ bOverflow = true;
}
}
}
@@ -1580,7 +1580,7 @@ void ScTable::Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
FillAuto(nCol1, nRow1, nCol2, nRow2, nFillCount, eFillDir, aProgress);
else
FillSeries(nCol1, nRow1, nCol2, nRow2, nFillCount, eFillDir,
- eFillCmd, eFillDateCmd, nStepValue, nMaxValue, 0, sal_True, aProgress);
+ eFillCmd, eFillDateCmd, nStepValue, nMaxValue, 0, true, aProgress);
}
@@ -1897,7 +1897,7 @@ void ScTable::UpdateInsertTabAbs(SCTAB nTable)
aCol[i].UpdateInsertTabAbs(nTable);
}
-sal_Bool ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, sal_Bool bInSel,
+bool ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, bool bInSel,
const ScMarkData& rMark) const
{
if (rRow == MAXROW+2) // Tabellenende
@@ -1915,17 +1915,17 @@ sal_Bool ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, sal_Bool bInSel,
}
}
if (rCol == MAXCOL+1)
- return sal_True;
+ return true;
else
{
- sal_Bool bStop = false;
+ bool bStop = false;
while (!bStop)
{
if (ValidCol(rCol))
{
bStop = aCol[rCol].GetNextSpellingCell(rRow, bInSel, rMark);
if (bStop)
- return sal_True;
+ return true;
else /*if (rRow == MAXROW+1) */
{
rCol++;
@@ -1933,7 +1933,7 @@ sal_Bool ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, sal_Bool bInSel,
}
}
else
- return sal_True;
+ return true;
}
}
return false;
@@ -1945,13 +1945,12 @@ void ScTable::RemoveAutoSpellObj()
aCol[i].RemoveAutoSpellObj();
}
-sal_Bool ScTable::TestTabRefAbs(SCTAB nTable)
+bool ScTable::TestTabRefAbs(SCTAB nTable)
{
- sal_Bool bRet = false;
for (SCCOL i=0; i <= MAXCOL; i++)
if (aCol[i].TestTabRefAbs(nTable))
- bRet = sal_True;
- return bRet;
+ return true;
+ return false;
}
void ScTable::CompileDBFormula()
@@ -1959,12 +1958,12 @@ void ScTable::CompileDBFormula()
for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].CompileDBFormula();
}
-void ScTable::CompileDBFormula( sal_Bool bCreateFormulaString )
+void ScTable::CompileDBFormula( bool bCreateFormulaString )
{
for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].CompileDBFormula( bCreateFormulaString );
}
-void ScTable::CompileNameFormula( sal_Bool bCreateFormulaString )
+void ScTable::CompileNameFormula( bool bCreateFormulaString )
{
for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].CompileNameFormula( bCreateFormulaString );
}
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 9c87f162e262..5e619b7203a4 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -181,24 +181,24 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
// Mittelteil: Breaks verteilen
- sal_Bool bRepeatCol = ( nRepeatStartX != SCCOL_REPEAT_NONE );
- sal_Bool bColFound = false;
+ bool bRepeatCol = ( nRepeatStartX != SCCOL_REPEAT_NONE );
+ bool bColFound = false;
long nSizeX = 0;
for (nX=nStartCol; nX<=nEndCol; nX++)
{
- sal_Bool bStartOfPage = false;
+ bool bStartOfPage = false;
long nThisX = ColHidden(nX) ? 0 : pColWidth[nX];
bool bManualBreak = HasColManualBreak(nX);
if ( (nSizeX+nThisX > nPageSizeX) || (bManualBreak && !bSkipColBreaks) )
{
SetColBreak(nX, true, false);
nSizeX = 0;
- bStartOfPage = sal_True;
+ bStartOfPage = true;
}
else if (nX != nStartCol)
RemoveColBreak(nX, true, false);
else
- bStartOfPage = sal_True;
+ bStartOfPage = true;
if ( bStartOfPage && bRepeatCol && nX>nRepeatStartX && !bColFound )
{
@@ -207,7 +207,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
nPageSizeX -= ColHidden(i) ? 0 : pColWidth[i];
while (nX<=nRepeatEndX)
RemoveColBreak(++nX, true, false);
- bColFound = sal_True;
+ bColFound = true;
}
nSizeX += nThisX;
@@ -217,15 +217,15 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
RemoveRowPageBreaks(nStartRow+1, nEndRow);
// And set new page breaks.
- sal_Bool bRepeatRow = ( nRepeatStartY != SCROW_REPEAT_NONE );
- sal_Bool bRowFound = false;
+ bool bRepeatRow = ( nRepeatStartY != SCROW_REPEAT_NONE );
+ bool bRowFound = false;
long nSizeY = 0;
ScFlatBoolRowSegments::ForwardIterator aIterHidden(*mpHiddenRows);
ScFlatUInt16RowSegments::ForwardIterator aIterHeights(*mpRowHeights);
SCROW nNextManualBreak = GetNextManualBreak(nStartRow); // -1 => no more manual breaks
for (SCROW nY = nStartRow; nY <= nEndRow; ++nY)
{
- sal_Bool bStartOfPage = false;
+ bool bStartOfPage = false;
bool bThisRowHidden = false;
aIterHidden.getValue(nY, bThisRowHidden);
long nThisY = 0;
@@ -249,12 +249,12 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
{
SetRowBreak(nY, true, false);
nSizeY = 0;
- bStartOfPage = sal_True;
+ bStartOfPage = true;
}
else if (nY != nStartRow)
; // page break already removed
else
- bStartOfPage = sal_True;
+ bStartOfPage = true;
if ( bStartOfPage && bRepeatRow && nY>nRepeatStartY && !bRowFound )
{
@@ -267,7 +267,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
nPageSizeY -= nHeights;
if (nY <= nRepeatEndY)
RemoveRowPageBreaks(nY, nRepeatEndY);
- bRowFound = sal_True;
+ bRowFound = true;
}
if (bThisRowHidden)
@@ -332,7 +332,7 @@ void ScTable::RemoveManualBreaks()
SetStreamValid(false);
}
-sal_Bool ScTable::HasManualBreaks() const
+bool ScTable::HasManualBreaks() const
{
return !maRowManualBreaks.empty() || !maColManualBreaks.empty();
}
@@ -1047,14 +1047,14 @@ void ScTable::SetPageSize( const Size& rSize )
if (aPageSizeTwips != rSize)
InvalidatePageBreaks();
- bPageSizeValid = sal_True;
+ bPageSizeValid = true;
aPageSizeTwips = rSize;
}
else
bPageSizeValid = false;
}
-sal_Bool ScTable::IsProtected() const
+bool ScTable::IsProtected() const
{
return pTabProtection.get() && pTabProtection->isProtected();
}
@@ -1154,7 +1154,7 @@ void ScTable::PageStyleModified( const String& rNewName )
}
void ScTable::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* pAdrTo,
- sal_Bool bNumFormatChanged, sal_Bool bBroadcast )
+ bool bNumFormatChanged, bool bBroadcast )
{
if ( pAdrFrom && !pAdrTo )
{
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 7397dd59f66e..963a75c35057 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -52,9 +52,9 @@
using ::com::sun::star::util::SearchOptions;
-sal_Bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, String& rVal )
+bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, String& rVal )
{
- // sal_True = more than 1 paragraph
+ // true = more than 1 paragraph
const EditTextObject* pData = NULL;
rCell.GetData( pData );
@@ -64,12 +64,12 @@ sal_Bool lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, Strin
return ( rEngine.GetParagraphCount() > 1 );
}
-sal_Bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow,
+bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow,
const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc)
{
- sal_Bool bFound = false;
- sal_Bool bDoSearch = sal_True;
- sal_Bool bDoBack = rSearchItem.GetBackward();
+ bool bFound = false;
+ bool bDoSearch = true;
+ bool bDoBack = rSearchItem.GetBackward();
String aString;
ScBaseCell* pCell;
@@ -77,7 +77,7 @@ sal_Bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW
bDoSearch = rMark.IsCellMarked(nCol, nRow);
if ( bDoSearch && ((pCell = aCol[nCol].GetCell( nRow )) != NULL) )
{
- sal_Bool bMultiLine = false;
+ bool bMultiLine = false;
CellType eCellType = pCell->GetCellType();
switch (rSearchItem.GetCellType())
{
@@ -120,13 +120,13 @@ sal_Bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW
if ( bDoBack )
{
xub_StrLen nTemp=nStart; nStart=nEnd; nEnd=nTemp;
- bFound = (sal_Bool)(pSearchText->SearchBkwrd(aString, &nStart, &nEnd, &aSearchResult));
+ bFound = (bool)(pSearchText->SearchBkwrd(aString, &nStart, &nEnd, &aSearchResult));
// change results to definition before 614:
--nEnd;
}
else
{
- bFound = (sal_Bool)(pSearchText->SearchFrwrd(aString, &nStart, &nEnd, &aSearchResult));
+ bFound = (bool)(pSearchText->SearchFrwrd(aString, &nStart, &nEnd, &aSearchResult));
// change results to definition before 614:
--nEnd;
}
@@ -160,7 +160,7 @@ sal_Bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW
ScBaseCell* pUndoCell = pCell->CloneWithoutNote( *pUndoDoc );
pUndoDoc->PutCell( aAdr, pUndoCell);
}
- sal_Bool bRepeat = !rSearchItem.GetWordOnly();
+ bool bRepeat = !rSearchItem.GetWordOnly();
do
{
// wenn der gefundene Text leer ist, nicht weitersuchen,
@@ -202,13 +202,13 @@ sal_Bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW
else if (bDoBack)
{
xub_StrLen nTemp=nStart; nStart=nEnd; nEnd=nTemp;
- bRepeat = ((sal_Bool)(pSearchText->SearchBkwrd(aString, &nStart, &nEnd)));
+ bRepeat = ((bool)(pSearchText->SearchBkwrd(aString, &nStart, &nEnd)));
// change results to definition before 614:
--nEnd;
}
else
{
- bRepeat = ((sal_Bool)(pSearchText->SearchFrwrd(aString, &nStart, &nEnd)));
+ bRepeat = ((bool)(pSearchText->SearchFrwrd(aString, &nStart, &nEnd)));
// change results to definition before 614:
--nEnd;
}
@@ -286,11 +286,11 @@ void ScTable::SkipFilteredRows(SCROW& rRow, SCROW& rLastNonFilteredRow, bool bFo
}
}
-sal_Bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc)
{
- sal_Bool bFound = false;
- sal_Bool bAll = (rSearchItem.GetCommand() == SVX_SEARCHCMD_FIND_ALL)
+ bool bFound = false;
+ bool bAll = (rSearchItem.GetCommand() == SVX_SEARCHCMD_FIND_ALL)
||(rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL);
SCCOL nCol = rCol;
SCROW nRow = rRow;
@@ -316,14 +316,14 @@ sal_Bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& r
bFound = SearchCell(rSearchItem, nCol, nRow, rMark, rUndoStr, pUndoDoc);
if (!bFound)
{
- sal_Bool bIsEmpty;
+ bool bIsEmpty;
do
{
nCol--;
if ((SCsCOL)nCol >= 0)
bIsEmpty = aCol[nCol].IsEmptyData();
else
- bIsEmpty = sal_True;
+ bIsEmpty = true;
}
while (((SCsCOL)nCol >= 0) && bIsEmpty);
}
@@ -355,7 +355,7 @@ sal_Bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& r
if (!bFound)
{
// Not found in this column. Move to the next column.
- sal_Bool bIsEmpty;
+ bool bIsEmpty;
nRow = nLastRow;
nLastNonFilteredRow = MAXROW + 1;
do
@@ -364,7 +364,7 @@ sal_Bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& r
if ((SCsCOL)nCol >= 0)
bIsEmpty = aCol[nCol].IsEmptyData();
else
- bIsEmpty = sal_True;
+ bIsEmpty = true;
}
while (((SCsCOL)nCol >= 0) && bIsEmpty);
}
@@ -434,10 +434,10 @@ sal_Bool ScTable::Search(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& r
return bFound;
}
-sal_Bool ScTable::SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+bool ScTable::SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
String& rUndoStr, ScDocument* pUndoDoc)
{
- sal_Bool bFound = sal_True;
+ bool bFound = true;
SCCOL nCol = 0;
SCROW nRow = -1;
@@ -457,10 +457,10 @@ sal_Bool ScTable::SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
return (aNewMark.IsMultiMarked());
}
-sal_Bool ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+bool ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc)
{
- sal_Bool bFound = false;
+ bool bFound = false;
SCCOL nCol = rCol;
SCROW nRow = rRow;
if (rSearchItem.GetBackward())
@@ -486,14 +486,14 @@ sal_Bool ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW&
return bFound;
}
-sal_Bool ScTable::ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+bool ScTable::ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
String& rUndoStr, ScDocument* pUndoDoc)
{
- sal_Bool bOldDouble = ScColumn::bDoubleAlloc; // sollte immer sal_False sein?
+ bool bOldDouble = ScColumn::bDoubleAlloc; // sollte immer sal_False sein?
OSL_ENSURE(!bOldDouble,"bDoubleAlloc ???");
- ScColumn::bDoubleAlloc = sal_True; // fuer Undo-Doc
+ ScColumn::bDoubleAlloc = true; // fuer Undo-Doc
- sal_Bool bFound = sal_True;
+ bool bFound = true;
SCCOL nCol = 0;
SCROW nRow = -1;
@@ -515,7 +515,7 @@ sal_Bool ScTable::ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark
return (aNewMark.IsMultiMarked());
}
-sal_Bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
ScMarkData& rMark)
{
const ScStyleSheet* pSearchStyle = (const ScStyleSheet*)
@@ -524,11 +524,11 @@ sal_Bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCR
SCsCOL nCol = rCol;
SCsROW nRow = rRow;
- sal_Bool bFound = false;
+ bool bFound = false;
- sal_Bool bSelect = rSearchItem.GetSelection();
- sal_Bool bRows = rSearchItem.GetRowDirection();
- sal_Bool bBack = rSearchItem.GetBackward();
+ bool bSelect = rSearchItem.GetSelection();
+ bool bRows = rSearchItem.GetRowDirection();
+ bool bBack = rSearchItem.GetBackward();
short nAdd = bBack ? -1 : 1;
if (bRows) // zeilenweise
@@ -545,7 +545,7 @@ sal_Bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCR
else
{
nRow = nNextRow;
- bFound = sal_True;
+ bFound = true;
}
}
while (!bFound && ValidCol(nCol));
@@ -569,7 +569,7 @@ sal_Bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCR
{
nCol = i;
nRow = nNextRows[i];
- bFound = sal_True;
+ bFound = true;
}
}
else // vorwaerts
@@ -580,7 +580,7 @@ sal_Bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCR
{
nCol = i;
nRow = nNextRows[i];
- bFound = sal_True;
+ bFound = true;
}
}
}
@@ -595,12 +595,12 @@ sal_Bool ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCR
//! einzelnes Pattern fuer Undo zurueckgeben
-sal_Bool ScTable::ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
- ScMarkData& rMark, sal_Bool bIsUndo)
+bool ScTable::ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow,
+ ScMarkData& rMark, bool bIsUndo)
{
- sal_Bool bRet;
+ bool bRet;
if (bIsUndo)
- bRet = sal_True;
+ bRet = true;
else
bRet = SearchStyle(rSearchItem, rCol, rRow, rMark);
if (bRet)
@@ -620,19 +620,19 @@ sal_Bool ScTable::ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SC
return bRet;
}
-sal_Bool ScTable::SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark)
+bool ScTable::SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark)
{
const ScStyleSheet* pSearchStyle = (const ScStyleSheet*)
pDocument->GetStyleSheetPool()->Find(
rSearchItem.GetSearchString(), SFX_STYLE_FAMILY_PARA );
- sal_Bool bSelect = rSearchItem.GetSelection();
- sal_Bool bBack = rSearchItem.GetBackward();
+ bool bSelect = rSearchItem.GetSelection();
+ bool bBack = rSearchItem.GetBackward();
ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren
aNewMark.ResetMark();
for (SCCOL i=0; i<=MAXCOL; i++)
{
- sal_Bool bFound = sal_True;
+ bool bFound = true;
SCsROW nRow = 0;
SCsROW nEndRow;
while (bFound && nRow <= MAXROW)
@@ -658,10 +658,10 @@ sal_Bool ScTable::SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& r
return (aNewMark.IsMultiMarked());
}
-sal_Bool ScTable::ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
+bool ScTable::ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark,
ScDocument* pUndoDoc)
{
- sal_Bool bRet = SearchAllStyle(rSearchItem, rMark);
+ bool bRet = SearchAllStyle(rSearchItem, rMark);
if (bRet)
{
const ScStyleSheet* pReplaceStyle = (const ScStyleSheet*)
@@ -672,7 +672,7 @@ sal_Bool ScTable::ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData&
{
if (pUndoDoc)
pDocument->CopyToDocument( 0,0,nTab, MAXCOL,MAXROW,nTab,
- IDF_ATTRIB, sal_True, pUndoDoc, &rMark );
+ IDF_ATTRIB, true, pUndoDoc, &rMark );
ApplySelectionStyle( *pReplaceStyle, rMark );
}
else
@@ -684,12 +684,12 @@ sal_Bool ScTable::ReplaceAllStyle(const SvxSearchItem& rSearchItem, ScMarkData&
return bRet;
}
-sal_Bool ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem,
+bool ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem,
SCCOL& rCol, SCROW& rRow, ScMarkData& rMark,
String& rUndoStr, ScDocument* pUndoDoc)
{
sal_uInt16 nCommand = rSearchItem.GetCommand();
- sal_Bool bFound = false;
+ bool bFound = false;
if ( ValidColRow(rCol, rRow) ||
((nCommand == SVX_SEARCHCMD_FIND || nCommand == SVX_SEARCHCMD_REPLACE) &&
(((rCol == MAXCOLCOUNT || rCol == -1) && VALIDROW(rRow)) ||
@@ -698,7 +698,7 @@ sal_Bool ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem,
)
)
{
- sal_Bool bStyles = rSearchItem.GetPattern();
+ bool bStyles = rSearchItem.GetPattern();
if (bStyles)
{
if (nCommand == SVX_SEARCHCMD_FIND)
diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 0555fcac179d..8afc9dc446d1 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -799,7 +799,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow,
ScOutlineArray* pOutArr = pDestDoc->GetOutlineTable( nTab, sal_True )->GetRowArray();
SCROW nOutStart = nRow+nArrY;
SCROW nOutEnd = nRow+nArrY+nNeeded-1;
- sal_Bool bSize = false;
+ bool bSize = false;
pOutArr->Insert( nOutStart, nOutEnd, bSize );
pDestDoc->InitializeNoteCaptions(nTab);
for (SCROW nOutRow=nOutStart; nOutRow<=nOutEnd; nOutRow++)
diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx
index b63e5e674e0c..3ff1a94b2dc6 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -161,7 +161,7 @@ void XclImpOutlineBuffer::MakeScOutline()
else if (nFirstPos > 0)
bCollapsed = maCollapsedPosSet.count(nFirstPos-1) > 0;
- sal_Bool bDummy;
+ bool bDummy;
mpOutlineArray->Insert(nFirstPos, nPos-1, bDummy, bCollapsed);
}
}
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index a7f5b2e5823b..4249f26b6684 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -301,8 +301,8 @@ void ScXMLTableColsContext::EndElement()
ScOutlineArray* pColArray = pOutlineTable ? pOutlineTable->GetColArray() : NULL;
if (pColArray)
{
- sal_Bool bResized;
- pColArray->Insert(static_cast<SCCOL>(nGroupStartCol), static_cast<SCCOL>(nGroupEndCol), bResized, !bGroupDisplay, sal_True);
+ bool bResized;
+ pColArray->Insert(static_cast<SCCOL>(nGroupStartCol), static_cast<SCCOL>(nGroupEndCol), bResized, !bGroupDisplay, true);
}
}
}
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index fee203586d90..e494f6377296 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -352,8 +352,8 @@ void ScXMLTableRowsContext::EndElement()
ScXMLImport::MutexGuard aGuard(GetScImport());
ScOutlineTable* pOutlineTable(pDoc->GetOutlineTable(nSheet, sal_True));
ScOutlineArray* pRowArray(pOutlineTable->GetRowArray());
- sal_Bool bResized;
- pRowArray->Insert(static_cast<SCROW>(nGroupStartRow), static_cast<SCROW>(nGroupEndRow), bResized, !bGroupDisplay, sal_True);
+ bool bResized;
+ pRowArray->Insert(static_cast<SCROW>(nGroupStartRow), static_cast<SCROW>(nGroupEndRow), bResized, !bGroupDisplay, true);
}
}
}
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 7fd656b41bc6..64c6cfcc5828 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1228,10 +1228,10 @@ sal_Bool ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAtt
if ( bRecord && !pDoc->IsUndoEnabled() )
bRecord = false;
- sal_Bool bImportingXML = pDoc->IsImportingXML();
+ bool bImportingXML = pDoc->IsImportingXML();
// Cell formats can still be set if the range isn't editable only because of matrix formulas.
// #i62483# When loading XML, the check can be skipped altogether.
- sal_Bool bOnlyNotBecauseOfMatrix;
+ bool bOnlyNotBecauseOfMatrix;
if ( !bImportingXML && !pDoc->IsSelectionEditable( rMark, &bOnlyNotBecauseOfMatrix )
&& !bOnlyNotBecauseOfMatrix )
{
@@ -1291,10 +1291,10 @@ sal_Bool ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String& rStyleNam
if ( bRecord && !pDoc->IsUndoEnabled() )
bRecord = false;
- sal_Bool bImportingXML = pDoc->IsImportingXML();
+ bool bImportingXML = pDoc->IsImportingXML();
// Cell formats can still be set if the range isn't editable only because of matrix formulas.
// #i62483# When loading XML, the check can be skipped altogether.
- sal_Bool bOnlyNotBecauseOfMatrix;
+ bool bOnlyNotBecauseOfMatrix;
if ( !bImportingXML && !pDoc->IsSelectionEditable( rMark, &bOnlyNotBecauseOfMatrix )
&& !bOnlyNotBecauseOfMatrix )
{
@@ -2070,7 +2070,7 @@ sal_Bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMa
rDocShell.UpdatePaintExt( nExtFlags, nStartCol, nStartRow, *itr, nEndCol, nEndRow, *itr );
}
- sal_Bool bUndoOutline = false;
+ bool bUndoOutline = false;
switch (eCmd)
{
case DEL_CELLSUP:
diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx
index ca4492b2ce15..b34cdab1d2b1 100644
--- a/sc/source/ui/docshell/editable.cxx
+++ b/sc/source/ui/docshell/editable.cxx
@@ -89,7 +89,7 @@ void ScEditableTester::TestBlock( ScDocument* pDoc, SCTAB nTab,
{
if ( bIsEditable || bOnlyMatrix )
{
- sal_Bool bThisMatrix;
+ bool bThisMatrix;
if ( !pDoc->IsBlockEditable( nTab, nStartCol, nStartRow, nEndCol, nEndRow, &bThisMatrix ) )
{
bIsEditable = false;
@@ -125,7 +125,7 @@ void ScEditableTester::TestSelection( ScDocument* pDoc, const ScMarkData& rMark
{
if ( bIsEditable || bOnlyMatrix )
{
- sal_Bool bThisMatrix;
+ bool bThisMatrix;
if ( !pDoc->IsSelectionEditable( rMark, &bThisMatrix ) )
{
bIsEditable = false;
@@ -139,7 +139,7 @@ void ScEditableTester::TestView( ScViewFunc* pView )
{
if ( bIsEditable || bOnlyMatrix )
{
- sal_Bool bThisMatrix;
+ bool bThisMatrix;
if ( !pView->SelectionEditable( &bThisMatrix ) )
{
bIsEditable = false;
diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx
index 6d35207b78ce..b95c3dfb1543 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -118,8 +118,8 @@ sal_Bool ScOutlineDocFunc::MakeOutline( const ScRange& rRange, sal_Bool bColumns
ScOutlineArray* pArray = bColumns ? pTable->GetColArray() : pTable->GetRowArray();
- sal_Bool bRes;
- sal_Bool bSize = false;
+ bool bRes;
+ bool bSize = false;
if ( bColumns )
bRes = pArray->Insert( nStartCol, nEndCol, bSize );
else
diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx
index 23e55b230006..e6b3d4faabf4 100644
--- a/sc/source/ui/inc/viewfunc.hxx
+++ b/sc/source/ui/inc/viewfunc.hxx
@@ -337,7 +337,7 @@ public:
void EditNote();
void ForgetFormatArea() { bFormatValid = false; }
- sal_Bool SelectionEditable( sal_Bool* pOnlyNotBecauseOfMatrix = NULL );
+ sal_Bool SelectionEditable( bool* pOnlyNotBecauseOfMatrix = NULL );
// Amelia Wang
SC_DLLPUBLIC void DataFormPutData( SCROW nCurrentRow ,
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index e6d3180cc8cc..054dcbfa5fc9 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -118,7 +118,7 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
ScRange aMarkRange;
ScMarkType eMarkType = GetViewData()->GetSimpleArea( aMarkRange );
sal_Bool bSimpleArea = (eMarkType == SC_MARK_SIMPLE);
- sal_Bool bOnlyNotBecauseOfMatrix;
+ bool bOnlyNotBecauseOfMatrix;
sal_Bool bEditable = pTabViewShell->SelectionEditable( &bOnlyNotBecauseOfMatrix );
ScDocument* pDoc = GetViewData()->GetDocument();
ScDocShell* pDocShell = GetViewData()->GetDocShell();
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 727910bff842..d23aebe1b18d 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2946,7 +2946,7 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
sal_Bool bColorOnly )
{
// Not editable only due to a matrix? Attribute is ok anyhow.
- sal_Bool bOnlyNotBecauseOfMatrix;
+ bool bOnlyNotBecauseOfMatrix;
if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
{
ErrorMessage(STR_PROTECTIONERR);
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 5bd56f919fac..2187a736d850 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -283,9 +283,9 @@ sal_uInt16 ScViewFunc::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, sal_Bool bFor
return nTwips;
}
-sal_Bool ScViewFunc::SelectionEditable( sal_Bool* pOnlyNotBecauseOfMatrix /* = NULL */ )
+sal_Bool ScViewFunc::SelectionEditable( bool* pOnlyNotBecauseOfMatrix /* = NULL */ )
{
- sal_Bool bRet;
+ bool bRet;
ScDocument* pDoc = GetViewData()->GetDocument();
ScMarkData& rMark = GetViewData()->GetMarkData();
if (rMark.IsMarked() || rMark.IsMultiMarked())
@@ -1037,7 +1037,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
sal_Bool bRecord )
{
// nur wegen Matrix nicht editierbar? Attribute trotzdem ok
- sal_Bool bOnlyNotBecauseOfMatrix;
+ bool bOnlyNotBecauseOfMatrix;
if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
{
ErrorMessage(STR_PROTECTIONERR);
@@ -1150,7 +1150,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet,
void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem )
{
// nur wegen Matrix nicht editierbar? Attribute trotzdem ok
- sal_Bool bOnlyNotBecauseOfMatrix;
+ bool bOnlyNotBecauseOfMatrix;
if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
{
ErrorMessage(STR_PROTECTIONERR);
@@ -1425,7 +1425,7 @@ void ScViewFunc::ApplyUserItemSet( const SfxItemSet& rItemSet )
{
// ItemSet from UI, may have different pool
- sal_Bool bOnlyNotBecauseOfMatrix;
+ bool bOnlyNotBecauseOfMatrix;
if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
{
ErrorMessage(STR_PROTECTIONERR);
@@ -1463,7 +1463,7 @@ const SfxStyleSheet* ScViewFunc::GetStyleSheetFromMarked()
void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, sal_Bool bRecord )
{
// nur wegen Matrix nicht editierbar? Attribute trotzdem ok
- sal_Bool bOnlyNotBecauseOfMatrix;
+ bool bOnlyNotBecauseOfMatrix;
if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
{
ErrorMessage(STR_PROTECTIONERR);
@@ -1915,7 +1915,7 @@ void ScViewFunc::DeleteContents( sal_uInt16 nFlags, sal_Bool bRecord )
pViewData->GetViewShell()->UpdateCopySourceOverlay();
// nur wegen Matrix nicht editierbar? Attribute trotzdem ok
- sal_Bool bOnlyNotBecauseOfMatrix;
+ bool bOnlyNotBecauseOfMatrix;
sal_Bool bEditable = SelectionEditable( &bOnlyNotBecauseOfMatrix );
if ( !bEditable )
{
@@ -2111,12 +2111,12 @@ void ScViewFunc::SetWidthOrHeight( sal_Bool bWidth, SCCOLROW nRangeCnt, SCCOLROW
ScDocShellModificator aModificator( *pDocSh );
- sal_Bool bAllowed = sal_True;
+ bool bAllowed = true;
ScMarkData::iterator itr = pMarkData->begin(), itrEnd = pMarkData->end();
for (; itr != itrEnd && bAllowed; ++itr)
for ( SCCOLROW i=0; i<nRangeCnt && bAllowed; i++ )
{
- sal_Bool bOnlyMatrix;
+ bool bOnlyMatrix;
if (bWidth)
bAllowed = pDoc->IsBlockEditable( *itr,
static_cast<SCCOL>(pRanges[2*i]),0,
@@ -2429,7 +2429,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, sal_Bool bOptimal )
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScDocument* pDoc = pDocSh->GetDocument();
- sal_Bool bAllowed, bOnlyMatrix;
+ bool bAllowed, bOnlyMatrix;
if ( eDir == DIR_LEFT || eDir == DIR_RIGHT )
bAllowed = pDoc->IsBlockEditable( nTab, nCol,0, nCol,MAXROW, &bOnlyMatrix );
else
@@ -2665,7 +2665,7 @@ void ScViewFunc::ReplaceNote( const ScAddress& rPos, const String& rNoteText, co
void ScViewFunc::SetNumberFormat( short nFormatType, sal_uLong nAdd )
{
// nur wegen Matrix nicht editierbar? Attribute trotzdem ok
- sal_Bool bOnlyNotBecauseOfMatrix;
+ bool bOnlyNotBecauseOfMatrix;
if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
{
ErrorMessage(STR_PROTECTIONERR);
@@ -2701,7 +2701,7 @@ void ScViewFunc::SetNumberFormat( short nFormatType, sal_uLong nAdd )
void ScViewFunc::SetNumFmtByStr( const String& rCode )
{
// nur wegen Matrix nicht editierbar? Attribute trotzdem ok
- sal_Bool bOnlyNotBecauseOfMatrix;
+ bool bOnlyNotBecauseOfMatrix;
if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
{
ErrorMessage(STR_PROTECTIONERR);
@@ -2749,7 +2749,7 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode )
void ScViewFunc::ChangeNumFmtDecimals( sal_Bool bIncrement )
{
// nur wegen Matrix nicht editierbar? Attribute trotzdem ok
- sal_Bool bOnlyNotBecauseOfMatrix;
+ bool bOnlyNotBecauseOfMatrix;
if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix )
{
ErrorMessage(STR_PROTECTIONERR);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-04 20:08:32 +0000