summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-02-17 09:38:58 +0200
committerNoel Grandin <noel@peralex.com>2014-02-18 10:07:55 +0200
commitd6d922be5e6a9faf8ebc684109aa9cba8d00ca87 (patch)
tree1aba7d973e9b210552a12ffcb86e1d346084990e /sc
parenta21ecc1611dce99a70dc6e9ee219f743c75cadc5 (diff)
sal_Bool->bool
Change-Id: Ie801378efed378a9daead57cb637a96fb51cf49a
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/app/scmod.cxx4
-rw-r--r--sc/source/ui/inc/dbfunc.hxx48
-rw-r--r--sc/source/ui/undo/undodat.cxx16
-rw-r--r--sc/source/ui/vba/vbarange.cxx2
-rw-r--r--sc/source/ui/view/cellsh.cxx4
-rw-r--r--sc/source/ui/view/cellsh1.cxx2
-rw-r--r--sc/source/ui/view/cellsh2.cxx10
-rw-r--r--sc/source/ui/view/dbfunc.cxx10
-rw-r--r--sc/source/ui/view/dbfunc2.cxx2
-rw-r--r--sc/source/ui/view/dbfunc3.cxx58
-rw-r--r--sc/source/ui/view/dbfunc4.cxx2
11 files changed, 79 insertions, 79 deletions
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 29722fad0595..41e1c7b4549c 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1344,9 +1344,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
WaitObject aWait( pDocSh->GetActiveDialogParent() );
pDoc->CalcAll();
if ( pViewSh )
- pViewSh->UpdateCharts( sal_True );
+ pViewSh->UpdateCharts( true );
else
- ScDBFunc::DoUpdateCharts( ScAddress(), pDoc, sal_True );
+ ScDBFunc::DoUpdateCharts( ScAddress(), pDoc, true );
if (pBindings)
pBindings->Invalidate( SID_ATTR_SIZE ); //SvxPosSize-StatusControl-Update
}
diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx
index 0720ce5bd835..91f17b00591d 100644
--- a/sc/source/ui/inc/dbfunc.hxx
+++ b/sc/source/ui/inc/dbfunc.hxx
@@ -50,21 +50,21 @@ public:
// only UISort repeat the partial results if necessary
void UISort( const ScSortParam& rSortParam,
- sal_Bool bRecord = sal_True );
+ bool bRecord = true );
void Sort( const ScSortParam& rSortParam,
- sal_Bool bRecord = sal_True, sal_Bool bPaint = sal_True );
+ bool bRecord = true, bool bPaint = true );
SC_DLLPUBLIC void Query( const ScQueryParam& rQueryParam,
- const ScRange* pAdvSource, sal_Bool bRecord );
- void DoSubTotals( const ScSubTotalParam& rParam, sal_Bool bRecord = sal_True,
+ const ScRange* pAdvSource, bool bRecord );
+ void DoSubTotals( const ScSubTotalParam& rParam, bool bRecord = true,
const ScSortParam* pForceNewSort = NULL );
void ToggleAutoFilter();
void HideAutoFilter();
- void RepeatDB( sal_Bool bRecord = sal_True );
+ void RepeatDB( bool bRecord = true );
- sal_Bool ImportData( const ScImportParam& rParam, sal_Bool bRecord = sal_True );
+ bool ImportData( const ScImportParam& rParam, bool bRecord = true );
void GotoDBArea( const OUString& rDBName );
@@ -74,7 +74,7 @@ public:
void NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std::vector<ScRange> &rDelAreaList );
- void Consolidate( const ScConsolidateParam& rParam, sal_Bool bRecord = sal_True );
+ void Consolidate( const ScConsolidateParam& rParam, bool bRecord = true );
bool MakePivotTable(
const ScDPSaveData& rData, const ScRange& rDest, bool bNewTable,
@@ -91,7 +91,7 @@ public:
void DataPilotInput( const ScAddress& rPos, const OUString& rString );
bool DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16* pUserListId = NULL );
- sal_Bool DataPilotMove( const ScRange& rSource, const ScAddress& rDest );
+ bool DataPilotMove( const ScRange& rSource, const ScAddress& rDest );
bool HasSelectionForDrillDown( sal_uInt16& rOrientation );
void SetDataPilotDetails(bool bShow, const OUString* pNewDimensionName = NULL);
@@ -99,27 +99,27 @@ public:
void ShowDataPilotSourceData( ScDPObject& rDPObj,
const ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::DataPilotFieldFilter >& rFilters );
- void MakeOutline( sal_Bool bColumns, sal_Bool bRecord = sal_True );
- void RemoveOutline( sal_Bool bColumns, sal_Bool bRecord = sal_True );
- void RemoveAllOutlines( sal_Bool bRecord = sal_True );
- void TestRemoveOutline( sal_Bool& rCol, sal_Bool& rRow );
+ void MakeOutline( bool bColumns, bool bRecord = true );
+ void RemoveOutline( bool bColumns, bool bRecord = true );
+ void RemoveAllOutlines( bool bRecord = true );
+ void TestRemoveOutline( bool& rCol, bool& rRow );
- void AutoOutline( sal_Bool bRecord = sal_True );
+ void AutoOutline( bool bRecord = true );
- void SelectLevel( sal_Bool bColumns, sal_uInt16 nLevel,
- sal_Bool bRecord = sal_True, sal_Bool bPaint = sal_True );
- void ShowOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry,
- sal_Bool bRecord = sal_True, sal_Bool bPaint = sal_True );
- void HideOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry,
- sal_Bool bRecord = sal_True, sal_Bool bPaint = sal_True );
+ void SelectLevel( bool bColumns, sal_uInt16 nLevel,
+ bool bRecord = true, bool bPaint = true );
+ void ShowOutline( bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry,
+ bool bRecord = true, bool bPaint = true );
+ void HideOutline( bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry,
+ bool bRecord = true, bool bPaint = true );
- void ShowMarkedOutlines( sal_Bool bRecord = sal_True );
- void HideMarkedOutlines( sal_Bool bRecord = sal_True );
- sal_Bool OutlinePossible(sal_Bool bHide);
+ void ShowMarkedOutlines( bool bRecord = true );
+ void HideMarkedOutlines( bool bRecord = true );
+ bool OutlinePossible(bool bHide);
- void UpdateCharts(sal_Bool bAllCharts = false); // Default: am Cursor
+ void UpdateCharts(bool bAllCharts = false); // Default: am Cursor
- static sal_uInt16 DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, sal_Bool bAllCharts );
+ static sal_uInt16 DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAllCharts );
};
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 40474aef7142..56a2e1c27a37 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -229,9 +229,9 @@ void ScUndoMakeOutline::Repeat(SfxRepeatTarget& rTarget)
ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell();
if (bMake)
- rViewShell.MakeOutline( bColumns, sal_True );
+ rViewShell.MakeOutline( bColumns, true );
else
- rViewShell.RemoveOutline( bColumns, sal_True );
+ rViewShell.RemoveOutline( bColumns, true );
}
}
@@ -318,7 +318,7 @@ void ScUndoOutlineLevel::Redo()
void ScUndoOutlineLevel::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
- ((ScTabViewTarget&)rTarget).GetViewShell()->SelectLevel( bColumns, nLevel, sal_True );
+ ((ScTabViewTarget&)rTarget).GetViewShell()->SelectLevel( bColumns, nLevel, true );
}
bool ScUndoOutlineLevel::CanRepeat(SfxRepeatTarget& rTarget) const
@@ -418,9 +418,9 @@ void ScUndoOutlineBlock::Repeat(SfxRepeatTarget& rTarget)
ScTabViewShell& rViewShell = *((ScTabViewTarget&)rTarget).GetViewShell();
if (bShow)
- rViewShell.ShowMarkedOutlines( sal_True );
+ rViewShell.ShowMarkedOutlines( true );
else
- rViewShell.HideMarkedOutlines( sal_True );
+ rViewShell.HideMarkedOutlines( true );
}
}
@@ -506,7 +506,7 @@ void ScUndoRemoveAllOutlines::Redo()
void ScUndoRemoveAllOutlines::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
- ((ScTabViewTarget&)rTarget).GetViewShell()->RemoveAllOutlines( sal_True );
+ ((ScTabViewTarget&)rTarget).GetViewShell()->RemoveAllOutlines( true );
}
bool ScUndoRemoveAllOutlines::CanRepeat(SfxRepeatTarget& rTarget) const
@@ -609,7 +609,7 @@ void ScUndoAutoOutline::Redo()
void ScUndoAutoOutline::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
- ((ScTabViewTarget&)rTarget).GetViewShell()->AutoOutline( sal_True );
+ ((ScTabViewTarget&)rTarget).GetViewShell()->AutoOutline( true );
}
bool ScUndoAutoOutline::CanRepeat(SfxRepeatTarget& rTarget) const
@@ -1538,7 +1538,7 @@ void ScUndoRepeatDB::Redo()
void ScUndoRepeatDB::Repeat(SfxRepeatTarget& rTarget)
{
if (rTarget.ISA(ScTabViewTarget))
- ((ScTabViewTarget&)rTarget).GetViewShell()->RepeatDB( sal_True );
+ ((ScTabViewTarget&)rTarget).GetViewShell()->RepeatDB( true );
}
bool ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 39848d493f8a..26b88434c3c4 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -4302,7 +4302,7 @@ static void lcl_SelectAll( ScDocShell* pDocShell, ScQueryParam& aParam )
if ( pViewData )
{
OSL_TRACE("Pushing out SelectAll query");
- pViewData->GetView()->Query( aParam, NULL, sal_True );
+ pViewData->GetView()->Query( aParam, NULL, true );
}
}
}
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 90feae4b3302..6b5dfe57a3be 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -849,7 +849,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
{
//! test for data pilot operation
}
- else if (!pTabViewShell->OutlinePossible(sal_True))
+ else if (!pTabViewShell->OutlinePossible(true))
rSet.DisableItem( nWhich );
break;
@@ -862,7 +862,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
}
else
{
- sal_Bool bCol, bRow;
+ bool bCol, bRow;
pTabViewShell->TestRemoveOutline( bCol, bRow );
if ( !bCol && !bRow )
rSet.DisableItem( nWhich );
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index aeba2eaed805..513828df0fc4 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1159,7 +1159,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
else // Dialog only when removal for rows and columns is possible
{
- sal_Bool bColPoss, bRowPoss;
+ bool bColPoss, bRowPoss;
pTabViewShell->TestRemoveOutline( bColPoss, bRowPoss );
if ( bColPoss && bRowPoss )
{
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index d2f92d4301c6..28feb3404507 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -551,7 +551,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
{
OSL_FAIL("SID_FILTER with arguments?");
pTabViewShell->Query( ((const ScQueryItem&)
- pArgs->Get( SCITEM_QUERYDATA )).GetQueryData(), NULL, sal_True );
+ pArgs->Get( SCITEM_QUERYDATA )).GetQueryData(), NULL, true );
rReq.Done();
}
else
@@ -572,7 +572,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
{
OSL_FAIL("SID_SPECIAL_FILTER with arguments?");
pTabViewShell->Query( ((const ScQueryItem&)
- pArgs->Get( SCITEM_QUERYDATA )).GetQueryData(), NULL, sal_True );
+ pArgs->Get( SCITEM_QUERYDATA )).GetQueryData(), NULL, true );
rReq.Done();
}
else
@@ -608,9 +608,9 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScRange aAdvSource;
if (rQueryItem.GetAdvancedQuerySource(aAdvSource))
- pTabViewShell->Query( rQueryItem.GetQueryData(), &aAdvSource, sal_True );
+ pTabViewShell->Query( rQueryItem.GetQueryData(), &aAdvSource, true );
else
- pTabViewShell->Query( rQueryItem.GetQueryData(), NULL, sal_True );
+ pTabViewShell->Query( rQueryItem.GetQueryData(), NULL, true );
rReq.Done( *pReqArgs );
}
}
@@ -626,7 +626,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
for (SCSIZE i=0; i<nEC; i++)
aParam.GetEntry(i).bDoQuery = false;
aParam.bDuplicate = true;
- pTabViewShell->Query( aParam, NULL, sal_True );
+ pTabViewShell->Query( aParam, NULL, true );
rReq.Done();
}
break;
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index bf34b8040db1..d2d8aad41169 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -246,7 +246,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std::
// Sort
-void ScDBFunc::UISort( const ScSortParam& rSortParam, sal_Bool bRecord )
+void ScDBFunc::UISort( const ScSortParam& rSortParam, bool bRecord )
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScDocument* pDoc = pDocSh->GetDocument();
@@ -273,7 +273,7 @@ void ScDBFunc::UISort( const ScSortParam& rSortParam, sal_Bool bRecord )
}
}
-void ScDBFunc::Sort( const ScSortParam& rSortParam, sal_Bool bRecord, sal_Bool bPaint )
+void ScDBFunc::Sort( const ScSortParam& rSortParam, bool bRecord, bool bPaint )
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
SCTAB nTab = GetViewData()->GetTabNo();
@@ -294,7 +294,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, sal_Bool bRecord, sal_Bool b
// filters
-void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource, sal_Bool bRecord )
+void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource, bool bRecord )
{
ScDocShell* pDocSh = GetViewData()->GetDocShell();
SCTAB nTab = GetViewData()->GetTabNo();
@@ -392,7 +392,7 @@ void ScDBFunc::ToggleAutoFilter()
for (SCSIZE i=0; i<nEC; i++)
aParam.GetEntry(i).bDoQuery = false;
aParam.bDuplicate = true;
- Query( aParam, NULL, sal_True );
+ Query( aParam, NULL, true );
pDocSh->GetUndoManager()->LeaveListAction();
@@ -492,7 +492,7 @@ void ScDBFunc::HideAutoFilter()
// Re-Import
-sal_Bool ScDBFunc::ImportData( const ScImportParam& rParam, sal_Bool bRecord )
+bool ScDBFunc::ImportData( const ScImportParam& rParam, bool bRecord )
{
ScDocument* pDoc = GetViewData()->GetDocument();
ScEditableTester aTester( pDoc, GetViewData()->GetTabNo(), rParam.nCol1,rParam.nRow1,
diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx
index 20cfc64b3db0..58b5d93993dc 100644
--- a/sc/source/ui/view/dbfunc2.cxx
+++ b/sc/source/ui/view/dbfunc2.cxx
@@ -26,7 +26,7 @@
//==================================================================
-void ScDBFunc::UpdateCharts( sal_Bool bAllCharts )
+void ScDBFunc::UpdateCharts( bool bAllCharts )
{
sal_uInt16 nFound = 0;
ScViewData* pViewData = GetViewData();
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 8c9ae202319e..50cfc2e4d32a 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -96,7 +96,7 @@ using ::std::vector;
// Outline-Gruppierung erzeugen
-void ScDBFunc::MakeOutline( sal_Bool bColumns, sal_Bool bRecord )
+void ScDBFunc::MakeOutline( bool bColumns, bool bRecord )
{
ScRange aRange;
if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
@@ -111,7 +111,7 @@ void ScDBFunc::MakeOutline( sal_Bool bColumns, sal_Bool bRecord )
// Outline-Gruppierung loeschen
-void ScDBFunc::RemoveOutline( sal_Bool bColumns, sal_Bool bRecord )
+void ScDBFunc::RemoveOutline( bool bColumns, bool bRecord )
{
ScRange aRange;
if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
@@ -126,10 +126,10 @@ void ScDBFunc::RemoveOutline( sal_Bool bColumns, sal_Bool bRecord )
// Menue-Status: Outlines loeschen
-void ScDBFunc::TestRemoveOutline( sal_Bool& rCol, sal_Bool& rRow )
+void ScDBFunc::TestRemoveOutline( bool& rCol, bool& rRow )
{
- sal_Bool bColFound = false;
- sal_Bool bRowFound = false;
+ bool bColFound = false;
+ bool bRowFound = false;
SCCOL nStartCol, nEndCol;
SCROW nStartRow, nEndRow;
@@ -145,8 +145,8 @@ void ScDBFunc::TestRemoveOutline( sal_Bool& rCol, sal_Bool& rRow )
ScOutlineEntry* pEntry;
SCCOLROW nStart;
SCCOLROW nEnd;
- sal_Bool bColMarked = ( nStartRow == 0 && nEndRow == MAXROW );
- sal_Bool bRowMarked = ( nStartCol == 0 && nEndCol == MAXCOL );
+ bool bColMarked = ( nStartRow == 0 && nEndRow == MAXROW );
+ bool bRowMarked = ( nStartCol == 0 && nEndCol == MAXCOL );
// Spalten
@@ -159,7 +159,7 @@ void ScDBFunc::TestRemoveOutline( sal_Bool& rCol, sal_Bool& rRow )
nStart = pEntry->GetStart();
nEnd = pEntry->GetEnd();
if ( nStartCol<=static_cast<SCCOL>(nEnd) && nEndCol>=static_cast<SCCOL>(nStart) )
- bColFound = sal_True;
+ bColFound = true;
}
}
@@ -174,7 +174,7 @@ void ScDBFunc::TestRemoveOutline( sal_Bool& rCol, sal_Bool& rRow )
nStart = pEntry->GetStart();
nEnd = pEntry->GetEnd();
if ( nStartRow<=nEnd && nEndRow>=nStart )
- bRowFound = sal_True;
+ bRowFound = true;
}
}
}
@@ -184,13 +184,13 @@ void ScDBFunc::TestRemoveOutline( sal_Bool& rCol, sal_Bool& rRow )
rRow = bRowFound;
}
-void ScDBFunc::RemoveAllOutlines( sal_Bool bRecord )
+void ScDBFunc::RemoveAllOutlines( bool bRecord )
{
SCTAB nTab = GetViewData()->GetTabNo();
ScDocShell* pDocSh = GetViewData()->GetDocShell();
ScOutlineDocFunc aFunc(*pDocSh);
- sal_Bool bOk = aFunc.RemoveAllOutlines( nTab, bRecord, false );
+ bool bOk = aFunc.RemoveAllOutlines( nTab, bRecord, false );
if (bOk)
UpdateScrollBars();
@@ -198,7 +198,7 @@ void ScDBFunc::RemoveAllOutlines( sal_Bool bRecord )
// Auto-Outlines
-void ScDBFunc::AutoOutline( sal_Bool bRecord )
+void ScDBFunc::AutoOutline( bool bRecord )
{
SCTAB nTab = GetViewData()->GetTabNo();
ScRange aRange( 0,0,nTab, MAXCOL,MAXROW,nTab ); // ganze Tabelle, wenn nichts markiert
@@ -216,7 +216,7 @@ void ScDBFunc::AutoOutline( sal_Bool bRecord )
// Outline-Ebene auswaehlen
-void ScDBFunc::SelectLevel( sal_Bool bColumns, sal_uInt16 nLevel, sal_Bool bRecord, sal_Bool bPaint )
+void ScDBFunc::SelectLevel( bool bColumns, sal_uInt16 nLevel, bool bRecord, bool bPaint )
{
SCTAB nTab = GetViewData()->GetTabNo();
ScDocShell* pDocSh = GetViewData()->GetDocShell();
@@ -230,7 +230,7 @@ void ScDBFunc::SelectLevel( sal_Bool bColumns, sal_uInt16 nLevel, sal_Bool bReco
// einzelne Outline-Gruppe einblenden
-void ScDBFunc::ShowOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, sal_Bool bRecord, sal_Bool bPaint )
+void ScDBFunc::ShowOutline( bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, bool bRecord, bool bPaint )
{
SCTAB nTab = GetViewData()->GetTabNo();
ScDocShell* pDocSh = GetViewData()->GetDocShell();
@@ -244,7 +244,7 @@ void ScDBFunc::ShowOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEn
// einzelne Outline-Gruppe ausblenden
-void ScDBFunc::HideOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, sal_Bool bRecord, sal_Bool bPaint )
+void ScDBFunc::HideOutline( bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, bool bRecord, bool bPaint )
{
SCTAB nTab = GetViewData()->GetTabNo();
ScDocShell* pDocSh = GetViewData()->GetDocShell();
@@ -258,9 +258,9 @@ void ScDBFunc::HideOutline( sal_Bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEn
// Menue-Status: markierten Bereich ein-/ausblenden
-sal_Bool ScDBFunc::OutlinePossible(sal_Bool bHide)
+bool ScDBFunc::OutlinePossible(bool bHide)
{
- sal_Bool bEnable = false;
+ bool bEnable = false;
SCCOL nStartCol;
SCROW nStartRow;
@@ -293,13 +293,13 @@ sal_Bool ScDBFunc::OutlinePossible(sal_Bool bHide)
{
if ( nStartCol<=static_cast<SCCOL>(nEnd) && nEndCol>=static_cast<SCCOL>(nStart) )
if (!pEntry->IsHidden())
- bEnable = sal_True;
+ bEnable = true;
}
else
{
if ( nStart>=nStartCol && nEnd<=nEndCol )
if (pEntry->IsHidden())
- bEnable = sal_True;
+ bEnable = true;
}
}
@@ -315,13 +315,13 @@ sal_Bool ScDBFunc::OutlinePossible(sal_Bool bHide)
{
if ( nStartRow<=nEnd && nEndRow>=nStart )
if (!pEntry->IsHidden())
- bEnable = sal_True;
+ bEnable = true;
}
else
{
if ( nStart>=nStartRow && nEnd<=nEndRow )
if (pEntry->IsHidden())
- bEnable = sal_True;
+ bEnable = true;
}
}
}
@@ -332,7 +332,7 @@ sal_Bool ScDBFunc::OutlinePossible(sal_Bool bHide)
// markierten Bereich einblenden
-void ScDBFunc::ShowMarkedOutlines( sal_Bool bRecord )
+void ScDBFunc::ShowMarkedOutlines( bool bRecord )
{
ScRange aRange;
if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
@@ -349,7 +349,7 @@ void ScDBFunc::ShowMarkedOutlines( sal_Bool bRecord )
// markierten Bereich ausblenden
-void ScDBFunc::HideMarkedOutlines( sal_Bool bRecord )
+void ScDBFunc::HideMarkedOutlines( bool bRecord )
{
ScRange aRange;
if (GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE)
@@ -370,7 +370,7 @@ void ScDBFunc::HideMarkedOutlines( sal_Bool bRecord )
// Teilergebnisse
//
-void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, sal_Bool bRecord,
+void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord,
const ScSortParam* pForceNewSort )
{
sal_Bool bDo = !rParam.bRemoveOnly; // sal_False = nur loeschen
@@ -544,7 +544,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, sal_Bool bRecord,
// Consolidate
//
-void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, sal_Bool bRecord )
+void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, bool bRecord )
{
ScDocShell* pDocShell = GetViewData()->GetDocShell();
pDocShell->DoConsolidate( rParam, bRecord );
@@ -1770,9 +1770,9 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16
return aFunc.DataPilotUpdate(pDPObj, pNewObj.get(), true, false);
}
-sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
+bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest )
{
- sal_Bool bRet = false;
+ bool bRet = false;
ScDocument* pDoc = GetViewData()->GetDocument();
ScDPObject* pDPObj = pDoc->GetDPAtCursor( rSource.aStart.Col(), rSource.aStart.Row(), rSource.aStart.Tab() );
if ( pDPObj && pDPObj == pDoc->GetDPAtCursor( rDest.Col(), rDest.Row(), rDest.Tab() ) )
@@ -1858,7 +1858,7 @@ sal_Bool ScDBFunc::DataPilotMove( const ScRange& rSource, const ScAddress& rDest
Unmark(); // entry was moved - no use in leaving the old cell selected
- bRet = sal_True;
+ bRet = true;
}
}
}
@@ -2079,7 +2079,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet
// DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen
//
-void ScDBFunc::RepeatDB( sal_Bool bRecord )
+void ScDBFunc::RepeatDB( bool bRecord )
{
SCCOL nCurX = GetViewData()->GetCurX();
SCROW nCurY = GetViewData()->GetCurY();
diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx
index 8ca6ee7679ae..7142f812cdda 100644
--- a/sc/source/ui/view/dbfunc4.cxx
+++ b/sc/source/ui/view/dbfunc4.cxx
@@ -31,7 +31,7 @@ using namespace com::sun::star;
//==================================================================
-sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, sal_Bool bAllCharts )
+sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAllCharts )
{
ScDrawLayer* pModel = pDoc->GetDrawLayer();
if (!pModel)