summaryrefslogtreecommitdiff
path: root/sc/source/ui/miscdlgs
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-23 11:08:48 +0200
committerNoel Grandin <noel@peralex.com>2014-04-23 11:11:51 +0200
commit6dda3d45c902d64323a085ea1604a993521f313d (patch)
tree9b964839510ac36762733bd99951539040f8ffc0 /sc/source/ui/miscdlgs
parente32da7783686f088fa83cdae209bcf1c81d82f1e (diff)
sc: sal_Bool->bool
Change-Id: I70aad0b38979f45a313b8ac36890fb6c64d11bb0
Diffstat (limited to 'sc/source/ui/miscdlgs')
-rw-r--r--sc/source/ui/miscdlgs/autofmt.cxx4
-rw-r--r--sc/source/ui/miscdlgs/conflictsdlg.cxx6
-rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx24
-rw-r--r--sc/source/ui/miscdlgs/filldlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/inscldlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/optsolver.cxx6
-rw-r--r--sc/source/ui/miscdlgs/redcom.cxx4
-rw-r--r--sc/source/ui/miscdlgs/scuiautofmt.cxx2
-rw-r--r--sc/source/ui/miscdlgs/solveroptions.cxx2
-rw-r--r--sc/source/ui/miscdlgs/tabopdlg.cxx4
10 files changed, 28 insertions, 28 deletions
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 67920b735475..239efd81f79d 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -189,7 +189,7 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
OUString cellString;
- sal_Bool bNumFormat = pCurData->GetIncludeValueFormat();
+ bool bNumFormat = pCurData->GetIncludeValueFormat();
sal_uLong nNum;
double nVal;
Color* pDummy = NULL;
@@ -248,7 +248,7 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
Rectangle cellRect = maArray.GetCellRect( nCol, nRow );
Point aPos = cellRect.TopLeft();
sal_uInt16 nRightX = 0;
- sal_Bool bJustify = pCurData->GetIncludeJustify();
+ bool bJustify = pCurData->GetIncludeJustify();
SvxHorJustifyItem aHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY );
SvxCellHorJustify eJustification;
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 3d0024219fda..82aa38f88b1a 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -575,7 +575,7 @@ IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl)
ScTabView* pTabView = mpViewData->GetView();
pTabView->DoneBlockMode();
- sal_Bool bContMark = false;
+ bool bContMark = false;
SvTreeListEntry* pEntry = maLbConflicts.FirstSelected();
while ( pEntry )
{
@@ -591,9 +591,9 @@ IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl)
const ScBigRange& rBigRange = ( static_cast< const ScChangeAction* >( pAction ) )->GetBigRange();
if ( rBigRange.IsValid( mpOwnDoc ) )
{
- sal_Bool bSetCursor = !maLbConflicts.NextSelected( pEntry );
+ bool bSetCursor = !maLbConflicts.NextSelected( pEntry );
pTabView->MarkRange( rBigRange.MakeRange(), bSetCursor, bContMark );
- bContMark = sal_True;
+ bContMark = true;
}
}
}
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index aea36217f07f..7c01a7059225 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -211,7 +211,7 @@ void ScColRowNameRangesDlg::Init()
void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange, bool bRef)
{
theCurData = theCurArea = rLabelRange;
- sal_Bool bValid = sal_True;
+ bool bValid = true;
SCCOL nCol1 = theCurArea.aStart.Col();
SCCOL nCol2 = theCurArea.aEnd.Col();
SCROW nRow1 = theCurArea.aStart.Row();
@@ -608,11 +608,11 @@ void ScColRowNameRangesDlg::UpdateNames()
void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, bool bColName )
{
ScRangePair* pPair = NULL;
- sal_Bool bFound = false;
+ bool bFound = false;
if ( bColName && (pPair = xColNameRanges->Find( rRange )) != NULL )
- bFound = sal_True;
+ bFound = true;
else if ( !bColName && (pPair = xRowNameRanges->Find( rRange )) != NULL )
- bFound = sal_True;
+ bFound = true;
if ( bFound )
{
@@ -745,7 +745,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl)
{
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
ScRange aRange1, aRange2;
- sal_Bool bOk1;
+ bool bOk1;
if ( (bOk1 = ((aRange1.ParseAny( aNewArea, pDoc, eConv ) & SCA_VALID) == SCA_VALID))
&& ((aRange2.ParseAny( aNewData, pDoc, eConv ) & SCA_VALID) == SCA_VALID) )
{
@@ -812,7 +812,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl)
{
OUString aRangeStr = pLbRange->GetSelectEntry();
sal_uInt16 nSelectPos = pLbRange->GetSelectEntryPos();
- sal_Bool bColName =
+ bool bColName =
((sal_uLong)pLbRange->GetEntryData( nSelectPos ) == nEntryDataCol);
NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr);
if (itr == aRangeMap.end())
@@ -820,11 +820,11 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl)
const ScRange& rRange = itr->second;
ScRangePair* pPair = NULL;
- sal_Bool bFound = false;
+ bool bFound = false;
if ( bColName && (pPair = xColNameRanges->Find( rRange )) != NULL )
- bFound = sal_True;
+ bFound = true;
else if ( !bColName && (pPair = xRowNameRanges->Find( rRange )) != NULL )
- bFound = sal_True;
+ bFound = true;
if ( bFound )
{
OUString aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY );
@@ -918,7 +918,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl)
NameRangeMap::const_iterator itr = aRangeMap.find(aRangeStr);
if ( itr != aRangeMap.end() )
{
- sal_Bool bColName =
+ bool bColName =
((sal_uLong)pLbRange->GetEntryData( nSelectPos ) == nEntryDataCol);
UpdateRangeData( itr->second, bColName );
pBtnAdd->Disable();
@@ -974,14 +974,14 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl)
IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl)
{
OUString aNewArea( pEdAssign->GetText() );
- sal_Bool bValid = false;
+ bool bValid = false;
if (!aNewArea.isEmpty() && pDoc)
{
ScRange aRange;
if ( (aRange.ParseAny( aNewArea, pDoc, pDoc->GetAddressConvention() ) & SCA_VALID) == SCA_VALID )
{
SetColRowData( aRange );
- bValid = sal_True;
+ bValid = true;
}
}
if ( bValid )
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 92240884d089..aa654deb2978 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -291,7 +291,7 @@ IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl)
else if ( m_pBtnMonth->IsChecked() ) theFillDateCmd = FILL_MONTH;
else if ( m_pBtnYear->IsChecked() ) theFillDateCmd = FILL_YEAR;
- sal_Bool bAllOk = true;
+ bool bAllOk = true;
Edit* pEdWrong = NULL;
if ( !CheckStartVal() )
{
diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx
index 37e864c38ab1..3a44f7b264af 100644
--- a/sc/source/ui/miscdlgs/inscldlg.cxx
+++ b/sc/source/ui/miscdlgs/inscldlg.cxx
@@ -29,7 +29,7 @@
static sal_uInt8 nInsItemChecked=0;
-ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) :
+ScInsertCellDlg::ScInsertCellDlg( Window* pParent,bool bDisallowCellMove) :
ModalDialog ( pParent, "InsertCellsDialog", "modules/scalc/ui/insertcells.ui")
{
get(m_pBtnCellsDown, "down");
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 3423988e890c..a72a0fe6bf5b 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -599,7 +599,7 @@ IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn )
for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow )
if( pBtn == mpDelButton[nRow] )
{
- sal_Bool bHadFocus = pBtn->HasFocus();
+ bool bHadFocus = pBtn->HasFocus();
ReadConditions();
long nVecPos = nScrollPos + nRow;
@@ -893,7 +893,7 @@ bool ScOptSolverDlg::CallSolver() // return true -> close dialog after cal
}
}
- sal_Bool bMaximize = m_pRbMax->IsChecked();
+ bool bMaximize = m_pRbMax->IsChecked();
if ( m_pRbValue->IsChecked() )
{
// handle "value of" with an additional constraint (and then minimize)
@@ -969,7 +969,7 @@ bool ScOptSolverDlg::CallSolver() // return true -> close dialog after cal
}
xSolver->solve();
- sal_Bool bSuccess = xSolver->getSuccess();
+ bool bSuccess = xSolver->getSuccess();
aProgress.Hide();
bool bClose = false;
diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx
index 50c8d0e57c68..4f5034b48617 100644
--- a/sc/source/ui/miscdlgs/redcom.cxx
+++ b/sc/source/ui/miscdlgs/redcom.cxx
@@ -106,8 +106,8 @@ void ScRedComDialog::ReInit(ScChangeAction *pAction)
pDlg->SetText(aTitle);
aComment=pChangeAction->GetComment();
- sal_Bool bNext=FindNext(pChangeAction)!=NULL;
- sal_Bool bPrev=FindPrev(pChangeAction)!=NULL;
+ bool bNext=FindNext(pChangeAction)!=NULL;
+ bool bPrev=FindPrev(pChangeAction)!=NULL;
pDlg->EnableTravel(bNext,bPrev);
OUString aAuthor = pChangeAction->GetUser();
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 83c97b4c3d05..8618f7aac695 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -309,7 +309,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl)
IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl)
{
- sal_Bool bOk = false;
+ bool bOk = false;
while( !bOk )
{
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index d31634370481..ca7f83ff05b1 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -370,7 +370,7 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl)
IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl)
{
- sal_Bool bCheckbox = false;
+ bool bCheckbox = false;
SvTreeListEntry* pEntry = m_pLbSettings->GetCurEntry();
if (pEntry)
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index 5d6c82ad1986..cd1b77c19953 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -209,10 +209,10 @@ void ScTabOpDlg::RaiseError( ScTabOpErr eError )
pEd->GrabFocus();
}
-static sal_Bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCurTab,
+static bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCurTab,
ScRefAddress& rStart, ScRefAddress& rEnd )
{
- sal_Bool bRet = false;
+ bool bRet = false;
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
if ( rString.indexOf(':') != -1 )
bRet = ConvertDoubleRef( pDoc, rString, nCurTab, rStart, rEnd, eConv );