[Libreoffice-commits] .: 3 commits - sc/inc sc/qa sc/source
Markus Mohrhard
mmohrhard at kemper.freedesktop.org
Thu Aug 25 03:47:39 PDT 2011
sc/inc/document.hxx | 14 +
sc/inc/olinetab.hxx | 4
sc/inc/table.hxx | 256 ++++++++++++++++++------------------
sc/qa/unit/ucalc.cxx | 103 ++++++++++++++
sc/source/core/data/cell.cxx | 7
sc/source/core/data/dociter.cxx | 2
sc/source/core/data/document.cxx | 12 -
sc/source/core/data/olinetab.cxx | 24 +--
sc/source/core/data/table1.cxx | 178 ++++++++++++-------------
sc/source/core/data/table2.cxx | 198 +++++++++++++--------------
sc/source/core/data/table3.cxx | 170 +++++++++++------------
sc/source/core/data/table4.cxx | 111 +++++++--------
sc/source/core/data/table5.cxx | 32 ++--
sc/source/core/data/table6.cxx | 98 ++++++-------
sc/source/core/tool/consoli.cxx | 2
sc/source/filter/excel/exctools.cxx | 2
sc/source/filter/xml/xmlcoli.cxx | 4
sc/source/filter/xml/xmlrowi.cxx | 4
sc/source/ui/docshell/docfunc.cxx | 10 -
sc/source/ui/docshell/editable.cxx | 6
sc/source/ui/docshell/olinefun.cxx | 4
sc/source/ui/inc/viewfunc.hxx | 2
sc/source/ui/view/cellsh.cxx | 2
sc/source/ui/view/viewfun2.cxx | 2
sc/source/ui/view/viewfunc.cxx | 26 +--
25 files changed, 689 insertions(+), 584 deletions(-)
New commits:
commit 32d1f978dda4910c7947de1e097fe12b8381403e
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Thu Aug 25 12:28:13 2011 +0200
add local range names for local range names
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 26e75fa..5c9b292 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2235,7 +2235,7 @@ void Test::testCopyPaste()
//check values after copying
String aString;
m_pDoc->GetValue(1,1,1, aValue);
- CPPUNIT_ASSERT_MESSAGE("copied formula should return 3", aValue == 2);
+ CPPUNIT_ASSERT_MESSAGE("copied formula should return 2", aValue == 2);
m_pDoc->GetFormula(1,1,1, aString);
CPPUNIT_ASSERT_MESSAGE("formula string was not copied correctly", rtl::OUString(aString) == aFormulaString);
m_pDoc->GetValue(0,1,1, aValue);
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index d2700c0..943842f 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -169,7 +169,6 @@ void adjustRangeName(ScToken* pToken, ScDocument& rNewDoc, const ScDocument* pOl
//search global range names
if (!pRangeData)
{
- //even if it is not in the global scope we'll have a global range name
bNewGlobal = true;
pRangeName = rNewDoc.GetRangeName();
if (pRangeName)
@@ -178,8 +177,12 @@ void adjustRangeName(ScToken* pToken, ScDocument& rNewDoc, const ScDocument* pOl
//if no range name was found copy it
if (!pRangeData)
{
+ bNewGlobal = bOldGlobal;
pRangeData = new ScRangeData(*pOldRangeData, &rNewDoc);
- rNewDoc.GetRangeName()->insert(pRangeData);
+ if (bNewGlobal)
+ rNewDoc.GetRangeName()->insert(pRangeData);
+ else
+ rNewDoc.GetRangeName(aNewTab)->insert(pRangeData);
}
sal_Int32 nIndex = pRangeData->GetIndex();
pToken->SetIndex(nIndex);
commit 7dbc196e1de895959fe3a2b9c4cdc89069f263e9
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Thu Aug 25 11:33:20 2011 +0200
sal_Bool -> bool in ScTable
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 11b87fe..b10bb31 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 d1cf025..9dcdf0c 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 1a595ce..dc8706c 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 3ad343c..76a254f 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 8de3fbb..75cb424 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 2b23191..056f148 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 e122124..2abaf37 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 3530631..10f0e9f 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,
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list