summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2013-05-16 09:16:53 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2013-05-16 09:20:41 +0900
commit0a330eb7405f75c82707a73d2c2e404326a48554 (patch)
tree8547ce28a88cbcd7025ca816cd2a62f43a08fff1 /vcl
parentbc2fe616febbaccb3cda16f66101d393e91232cd (diff)
sal_Bool to bool
Change-Id: I0247e462b648b0dc7fc9ea12723415fbf6dcaff5
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/control/fixed.cxx4
-rw-r--r--vcl/source/control/ilstbox.cxx40
-rw-r--r--vcl/source/control/imgctrl.cxx2
-rw-r--r--vcl/source/control/longcurr.cxx32
-rw-r--r--vcl/source/control/lstbox.cxx4
-rw-r--r--vcl/source/control/scrbar.cxx22
-rw-r--r--vcl/source/control/slider.cxx4
-rw-r--r--vcl/source/control/spinbtn.cxx4
8 files changed, 56 insertions, 56 deletions
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index c92685696899..a7a1ba8a9a87 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -281,8 +281,8 @@ void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
pDev->SetTextColor( GetTextColor() );
pDev->SetTextFillColor();
- sal_Bool bBorder = !(nFlags & WINDOW_DRAW_NOBORDER ) && (GetStyle() & WB_BORDER);
- sal_Bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && IsControlBackground();
+ bool bBorder = !(nFlags & WINDOW_DRAW_NOBORDER ) && (GetStyle() & WB_BORDER);
+ bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && IsControlBackground();
if ( bBorder || bBackground )
{
Rectangle aRect( aPos, aSize );
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 4be1c118131e..2fc66bb5fd55 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -307,7 +307,7 @@ sal_uInt16 ImplEntryList::FindMatchingEntry( const XubString& rStr, sal_uInt16 n
n--;
ImplEntryType* pImplEntry = GetEntry( n );
- sal_Bool bMatch = bLazy ? rI18nHelper.MatchString( rStr, pImplEntry->maStr ) != 0 : ( rStr.Match( pImplEntry->maStr ) == STRING_MATCH );
+ bool bMatch = bLazy ? rI18nHelper.MatchString( rStr, pImplEntry->maStr ) != 0 : ( rStr.Match( pImplEntry->maStr ) == STRING_MATCH );
if ( bMatch )
{
nPos = n;
@@ -658,8 +658,8 @@ void ImplListBoxWindow::SetUserItemSize( const Size& rSz )
struct ImplEntryMetrics
{
- sal_Bool bText;
- sal_Bool bImage;
+ bool bText;
+ bool bImage;
long nEntryWidth;
long nEntryHeight;
long nTextWidth;
@@ -672,7 +672,7 @@ struct ImplEntryMetrics
void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry )
{
ImplEntryMetrics aMetrics;
- aMetrics.bText = !rEntry.maStr.isEmpty() ? sal_True : sal_False;
+ aMetrics.bText = !rEntry.maStr.isEmpty();
aMetrics.bImage = !!rEntry.maImage;
aMetrics.nEntryWidth = 0;
aMetrics.nEntryHeight = 0;
@@ -1089,7 +1089,7 @@ void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, sal_Bool bSelect )
sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift, sal_Bool bCtrl )
{
- sal_Bool bFocusChanged = sal_False;
+ bool bFocusChanged = false;
sal_Bool bSelectionChanged = sal_False;
if( IsEnabled() && mpEntryList->IsEntrySelectable( nSelect ) )
@@ -1102,7 +1102,7 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE
{
SelectEntry( nSelect, sal_True );
mpEntryList->SetLastSelected( nSelect );
- bFocusChanged = sal_True;
+ bFocusChanged = true;
bSelectionChanged = sal_True;
}
}
@@ -1116,7 +1116,7 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE
if ( mpEntryList->IsEntryPosSelected( nPos ) != bSelect )
{
SelectEntry( nPos, bSelect );
- bFocusChanged = sal_True;
+ bFocusChanged = true;
bSelectionChanged = sal_True;
}
}
@@ -1150,14 +1150,14 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE
mpEntryList->SetSelectionAnchor( mbStackMode ? 0 : nSelect );
if ( !mpEntryList->IsEntryPosSelected( nSelect ) )
mpEntryList->SetSelectionAnchor( LISTBOX_ENTRY_NOTFOUND );
- bFocusChanged = sal_True;
+ bFocusChanged = true;
bSelectionChanged = sal_True;
}
else if( ( ( eLET == LET_TRACKING ) && ( nSelect != mnCurrentPos ) ) ||
( (bShift||mbStackMode) && ( ( eLET == LET_KEYMOVE ) || ( eLET == LET_MBDOWN ) ) ) )
{
mnCurrentPos = nSelect;
- bFocusChanged = sal_True;
+ bFocusChanged = true;
sal_uInt16 nAnchor = mpEntryList->GetSelectionAnchor();
if( ( nAnchor == LISTBOX_ENTRY_NOTFOUND ) && ( mpEntryList->GetSelectEntryCount() || mbStackMode ) )
@@ -1212,12 +1212,12 @@ sal_Bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLE
{
ImplHideFocusRect();
ImplPaint( nSelect, sal_True );
- bFocusChanged = sal_True;
+ bFocusChanged = true;
}
}
else if( bShift )
{
- bFocusChanged = sal_True;
+ bFocusChanged = true;
}
if( bSelectionChanged )
@@ -2395,7 +2395,7 @@ IMPL_LINK( ImplListBox, ScrollBarHdl, ScrollBar*, pSB )
void ImplListBox::ImplCheckScrollBars()
{
- sal_Bool bArrange = sal_False;
+ bool bArrange = false;
Size aOutSz = GetOutputSizePixel();
sal_uInt16 nEntries = GetEntryList()->GetEntryCount();
@@ -2405,7 +2405,7 @@ void ImplListBox::ImplCheckScrollBars()
if( nEntries > nMaxVisEntries )
{
if( !mbVScroll )
- bArrange = sal_True;
+ bArrange = true;
mbVScroll = sal_True;
// check of the scrolled-out region
@@ -2418,7 +2418,7 @@ void ImplListBox::ImplCheckScrollBars()
else
{
if( mbVScroll )
- bArrange = sal_True;
+ bArrange = true;
mbVScroll = sal_False;
SetTopEntry( 0 );
}
@@ -2434,7 +2434,7 @@ void ImplListBox::ImplCheckScrollBars()
if( nWidth < nMaxWidth )
{
if( !mbHScroll )
- bArrange = sal_True;
+ bArrange = true;
mbHScroll = sal_True;
if ( !mbVScroll ) // maybe we do need one now
@@ -2442,7 +2442,7 @@ void ImplListBox::ImplCheckScrollBars()
nMaxVisEntries = (sal_uInt16) ( ( aOutSz.Height() - mpHScrollBar->GetSizePixel().Height() ) / GetEntryHeight() );
if( nEntries > nMaxVisEntries )
{
- bArrange = sal_True;
+ bArrange = true;
mbVScroll = sal_True;
// check of the scrolled-out region
@@ -2462,7 +2462,7 @@ void ImplListBox::ImplCheckScrollBars()
else
{
if( mbHScroll )
- bArrange = sal_True;
+ bArrange = true;
mbHScroll = sal_False;
SetLeftIndent( 0 );
}
@@ -2669,7 +2669,7 @@ sal_Bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt )
void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep )
{
- sal_Bool bChanges = GetEntryList()->GetMRUCount() ? sal_True : sal_False;
+ bool bChanges = GetEntryList()->GetMRUCount() ? true : false;
// Remove old MRU entries
for ( sal_uInt16 n = GetEntryList()->GetMRUCount();n; )
@@ -2685,7 +2685,7 @@ void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep )
{
ImplEntryType* pNewEntry = new ImplEntryType( aEntry );
maLBWindow.GetEntryList()->InsertEntry( nMRUCount++, pNewEntry, sal_False );
- bChanges = sal_True;
+ bChanges = true;
}
}
while ( nIndex >= 0 );
@@ -2903,7 +2903,7 @@ void ImplWin::DrawEntry( sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDraw
long nBorder = 1;
Size aOutSz = GetOutputSizePixel();
- sal_Bool bImage = !!maImage;
+ bool bImage = !!maImage;
if( bDrawImage && bImage && !bLayout )
{
sal_uInt16 nStyle = 0;
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 0f0369c26182..40c5d2357777 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -159,7 +159,7 @@ void ImageControl::Paint( const Rectangle& /*rRect*/ )
{
Window *pWin = GetWindow( WINDOW_BORDER );
- sal_Bool bFlat = (GetBorderStyle() == 2);
+ bool bFlat = (GetBorderStyle() == 2);
Rectangle aRect( Point(0,0), pWin->GetOutputSizePixel() );
Color oldLineCol = pWin->GetLineColor();
Color oldFillCol = pWin->GetFillColor();
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 73d164909495..6f070afeccc8 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -94,12 +94,12 @@ static XubString ImplGetCurr( const LocaleDataWrapper& rLocaleDataWrapper, const
return aTemplate;
}
-static sal_Bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt,
+static bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt,
sal_Bool bStrictFormat, sal_Bool bThousandSep,
const LocaleDataWrapper& rLocaleDataWrapper )
{
if ( !bStrictFormat )
- return sal_False;
+ return false;
else
{
sal_Unicode cChar = rKEvt.GetCharCode();
@@ -111,13 +111,13 @@ static sal_Bool ImplNumericProcessKeyInput( Edit*, const KeyEvent& rKEvt,
(bThousandSep && string::equals(rLocaleDataWrapper.getNumThousandSep(), cChar)) ||
(string::equals(rLocaleDataWrapper.getNumDecimalSep(), cChar) ) ||
(cChar == '-') )
- return sal_False;
+ return false;
else
- return sal_True;
+ return true;
}
}
-static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue,
+static bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue,
sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrapper,
sal_Bool bCurrency = sal_False )
{
@@ -129,7 +129,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue,
// On empty string
if ( !rStr.Len() )
- return sal_False;
+ return false;
// Trim leading and trailing spaces
aStr = string::strip(aStr, ' ');
@@ -205,7 +205,7 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue,
}
if (!aStr1.Len() && !aStr2.getLength())
- return sal_False;
+ return false;
if ( !aStr1.Len() )
aStr1.Insert( '0' );
@@ -238,30 +238,30 @@ static sal_Bool ImplNumericGetValue( const XubString& rStr, BigInt& rValue,
rValue = nValue;
- return sal_True;
+ return true;
}
-static sal_Bool ImplLongCurrencyProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
+static bool ImplLongCurrencyProcessKeyInput( Edit* pEdit, const KeyEvent& rKEvt,
sal_Bool, sal_Bool bUseThousandSep, const LocaleDataWrapper& rLocaleDataWrapper )
{
// There's no StrictFormat that makes sense here, thus allow all chars
return ImplNumericProcessKeyInput( pEdit, rKEvt, sal_False, bUseThousandSep, rLocaleDataWrapper );
}
-inline sal_Bool ImplLongCurrencyGetValue( const XubString& rStr, BigInt& rValue,
+inline bool ImplLongCurrencyGetValue( const XubString& rStr, BigInt& rValue,
sal_uInt16 nDecDigits, const LocaleDataWrapper& rLocaleDataWrapper )
{
return ImplNumericGetValue( rStr, rValue, nDecDigits, rLocaleDataWrapper, sal_True );
}
-sal_Bool ImplLongCurrencyReformat( const XubString& rStr, BigInt nMin, BigInt nMax,
+bool ImplLongCurrencyReformat( const XubString& rStr, BigInt nMin, BigInt nMax,
sal_uInt16 nDecDigits,
const LocaleDataWrapper& rLocaleDataWrapper, String& rOutStr,
LongCurrencyFormatter& rFormatter )
{
BigInt nValue;
if ( !ImplNumericGetValue( rStr, nValue, nDecDigits, rLocaleDataWrapper, sal_True ) )
- return sal_True;
+ return true;
else
{
BigInt nTempVal = nValue;
@@ -276,7 +276,7 @@ sal_Bool ImplLongCurrencyReformat( const XubString& rStr, BigInt nMin, BigInt nM
if ( !rFormatter.GetErrorHdl().Call( &rFormatter ) )
{
rFormatter.mnCorrectedValue = 0;
- return sal_False;
+ return false;
}
else
{
@@ -285,7 +285,7 @@ sal_Bool ImplLongCurrencyReformat( const XubString& rStr, BigInt nMin, BigInt nM
}
rOutStr = ImplGetCurr( rLocaleDataWrapper, nTempVal, nDecDigits, rFormatter.GetCurrencySymbol(), rFormatter.IsUseThousandSep() );
- return sal_True;
+ return true;
}
}
@@ -380,7 +380,7 @@ void LongCurrencyFormatter::Reformat()
return;
XubString aStr;
- sal_Bool bOK = ImplLongCurrencyReformat( GetField()->GetText(), mnMin, mnMax,
+ bool bOK = ImplLongCurrencyReformat( GetField()->GetText(), mnMin, mnMax,
GetDecimalDigits(), GetLocaleDataWrapper(), aStr, *this );
if ( !bOK )
return;
@@ -437,7 +437,7 @@ void ImplNewLongCurrencyFieldValue( LongCurrencyField* pField, BigInt nNewValue
Selection aSelect = pField->GetSelection();
aSelect.Justify();
XubString aText = pField->GetText();
- sal_Bool bLastSelected = ((xub_StrLen)aSelect.Max() == aText.Len()) ? sal_True : sal_False;
+ bool bLastSelected = ((xub_StrLen)aSelect.Max() == aText.Len());
BigInt nOldLastValue = pField->mnLastValue;
pField->SetUserValue( nNewValue );
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 0ee0cfce13a5..6278f8e66f78 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -380,8 +380,8 @@ void ListBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sa
// Border/Background
pDev->SetLineColor();
pDev->SetFillColor();
- sal_Bool bBorder = !(nFlags & WINDOW_DRAW_NOBORDER ) && (GetStyle() & WB_BORDER);
- sal_Bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && IsControlBackground();
+ bool bBorder = !(nFlags & WINDOW_DRAW_NOBORDER ) && (GetStyle() & WB_BORDER);
+ bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && IsControlBackground();
if ( bBorder || bBackground )
{
Rectangle aRect( aPos, aSize );
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index b3bc40906139..b32691500806 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -74,7 +74,7 @@
struct ImplScrollBarData
{
AutoTimer maTimer; // Timer
- sal_Bool mbHide;
+ bool mbHide;
Rectangle maTrackRect; // TODO: move to ScrollBar class when binary incompatibility of ScrollBar class is no longer problematic
};
@@ -102,7 +102,7 @@ void ScrollBar::ImplInit( Window* pParent, WinBits nStyle )
{
mpData = new ImplScrollBarData;
mpData->maTimer.SetTimeoutHdl( LINK( this, ScrollBar, ImplAutoTimerHdl ) );
- mpData->mbHide = sal_False;
+ mpData->mbHide = false;
}
ImplInitStyle( nStyle );
@@ -500,7 +500,7 @@ sal_Bool ScrollBar::ImplDrawNative( sal_uInt16 nDrawFlags )
sal_Bool bNativeOK = IsNativeControlSupported(CTRL_SCROLLBAR, PART_ENTIRE_CONTROL);
if( bNativeOK )
{
- sal_Bool bHorz = (GetStyle() & WB_HORZ ? true : false);
+ bool bHorz = (GetStyle() & WB_HORZ ? true : false);
// Draw the entire background if the control supports it
if( IsNativeControlSupported(CTRL_SCROLLBAR, bHorz ? PART_DRAW_BACKGROUND_HORZ : PART_DRAW_BACKGROUND_VERT) )
@@ -820,7 +820,7 @@ void ScrollBar::ImplDoMouseAction( const Point& rMousePos, sal_Bool bCallAction
{
sal_uInt16 nOldStateFlags = mnStateFlags;
sal_Bool bAction = sal_False;
- sal_Bool bHorizontal = ( GetStyle() & WB_HORZ )? sal_True: sal_False;
+ bool bHorizontal = ( GetStyle() & WB_HORZ )? true: false;
sal_Bool bIsInside = sal_False;
Point aPoint( 0, 0 );
@@ -930,9 +930,9 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
{
const Point& rMousePos = rMEvt.GetPosPixel();
sal_uInt16 nTrackFlags = 0;
- sal_Bool bHorizontal = ( GetStyle() & WB_HORZ )? sal_True: sal_False;
+ bool bHorizontal = ( GetStyle() & WB_HORZ )? true: false;
sal_Bool bIsInside = sal_False;
- sal_Bool bDragToMouse = sal_False;
+ bool bDragToMouse = false;
Point aPoint( 0, 0 );
Rectangle aControlRegion( aPoint, GetOutputSizePixel() );
@@ -974,7 +974,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
{
if( mpData )
{
- mpData->mbHide = sal_True; // disable focus blinking
+ mpData->mbHide = true; // disable focus blinking
if( HasFocus() )
ImplDraw( SCRBAR_DRAW_THUMB, this ); // paint without focus
}
@@ -988,7 +988,7 @@ void ScrollBar::MouseButtonDown( const MouseEvent& rMEvt )
// calculate mouse offset
if (bWarp && (!bThumbHit || !bPrimaryWarping))
{
- bDragToMouse = sal_True;
+ bDragToMouse = true;
if ( GetStyle() & WB_HORZ )
mnMouseOff = maThumbRect.GetWidth()/2;
else
@@ -1089,7 +1089,7 @@ void ScrollBar::Tracking( const TrackingEvent& rTEvt )
meScrollType = SCROLL_DONTKNOW;
if( mpData )
- mpData->mbHide = sal_False; // re-enable focus blinking
+ mpData->mbHide = false; // re-enable focus blinking
}
else
{
@@ -1194,7 +1194,7 @@ void ScrollBar::GetFocus()
{
mpData = new ImplScrollBarData;
mpData->maTimer.SetTimeoutHdl( LINK( this, ScrollBar, ImplAutoTimerHdl ) );
- mpData->mbHide = sal_False;
+ mpData->mbHide = false;
}
ImplInvert(); // react immediately
mpData->maTimer.SetTimeout( GetSettings().GetStyleSettings().GetCursorBlinkTime() );
@@ -1266,7 +1266,7 @@ void ScrollBar::DataChanged( const DataChangedEvent& rDCEvt )
Rectangle* ScrollBar::ImplFindPartRect( const Point& rPt )
{
- sal_Bool bHorizontal = ( GetStyle() & WB_HORZ )? sal_True: sal_False;
+ bool bHorizontal = ( GetStyle() & WB_HORZ )? true: false;
sal_Bool bIsInside = sal_False;
Point aPoint( 0, 0 );
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 5d1b7c8ebd47..df31de0311dc 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -250,7 +250,7 @@ long Slider::ImplCalcThumbPosPix( long nPos )
void Slider::ImplCalc( sal_Bool bUpdate )
{
- sal_Bool bInvalidateAll = sal_False;
+ bool bInvalidateAll = false;
if ( mbCalcSize )
{
@@ -301,7 +301,7 @@ void Slider::ImplCalc( sal_Bool bUpdate )
(nOldChannelPixRange != mnChannelPixRange) ||
(nOldChannelPixTop != mnChannelPixTop) ||
(nOldChannelPixBottom != mnChannelPixBottom) )
- bInvalidateAll = sal_True;
+ bInvalidateAll = true;
mbCalcSize = sal_False;
}
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 897c04216f61..9b38c13cda20 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -307,7 +307,7 @@ void SpinButton::KeyInput( const KeyEvent& rKEvt )
case KEY_LEFT:
case KEY_RIGHT:
{
- sal_Bool bUp = KEY_RIGHT == rKEvt.GetKeyCode().GetCode();
+ bool bUp = KEY_RIGHT == rKEvt.GetKeyCode().GetCode();
if ( mbHorz && !ImplMoveFocus( bUp ) )
bUp ? Up() : Down();
}
@@ -316,7 +316,7 @@ void SpinButton::KeyInput( const KeyEvent& rKEvt )
case KEY_UP:
case KEY_DOWN:
{
- sal_Bool bUp = KEY_UP == rKEvt.GetKeyCode().GetCode();
+ bool bUp = KEY_UP == rKEvt.GetKeyCode().GetCode();
if ( !mbHorz && !ImplMoveFocus( KEY_UP == rKEvt.GetKeyCode().GetCode() ) )
bUp ? Up() : Down();
}