summaryrefslogtreecommitdiff
path: root/vcl/source/control
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-28 19:59:13 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-28 20:26:19 +0100
commitc1d37365c42a0627a66310c46d4beb2337633654 (patch)
tree5eccb263b481a3112c8d400054120cbd5db2963f /vcl/source/control
parent946f6132f9172fc7f79a1d99051011426767bf90 (diff)
bool improvements
Change-Id: Iede12ed1e35581cf48d64b898f22949d0c1aa6de
Diffstat (limited to 'vcl/source/control')
-rw-r--r--vcl/source/control/button.cxx4
-rw-r--r--vcl/source/control/combobox.cxx2
-rw-r--r--vcl/source/control/ctrl.cxx6
-rw-r--r--vcl/source/control/ilstbox.cxx2
-rw-r--r--vcl/source/control/lstbox.cxx4
-rw-r--r--vcl/source/control/tabctrl.cxx12
6 files changed, 15 insertions, 15 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 9634a310bc7b..57d817e78dce 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -622,7 +622,7 @@ bool Button::set_property(const OString &rKey, const OString &rValue)
void PushButton::ImplInitPushButtonData()
{
- mpWindowImpl->mbPushButton = sal_True;
+ mpWindowImpl->mbPushButton = true;
meSymbol = SYMBOL_NOSYMBOL;
meState = STATE_NOCHECK;
@@ -3235,7 +3235,7 @@ void CheckBox::ImplInvalidateOrDrawCheckBoxState()
void CheckBox::ImplDrawCheckBoxState()
{
- bool bNativeOK = sal_True;
+ bool bNativeOK = true;
if ( (bNativeOK=IsNativeControlSupported(CTRL_CHECKBOX, PART_ENTIRE_CONTROL)) )
{
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index aa34972a2b55..95708f367127 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -211,7 +211,7 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle )
if ( mpFloatWin )
mpFloatWin->SetImplListBox( mpImplLB );
else
- mpImplLB->GetMainWindow()->AllowGrabFocus( sal_True );
+ mpImplLB->GetMainWindow()->AllowGrabFocus( true );
ImplCalcEditHeight();
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index e312c18bb402..47ff23ead0e5 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -38,7 +38,7 @@ using namespace vcl;
void Control::ImplInitControlData()
{
- mbHasControlFocus = sal_False;
+ mbHasControlFocus = false;
mpControlData = new ImplControlData;
}
@@ -286,7 +286,7 @@ bool Control::Notify( NotifyEvent& rNEvt )
{
if ( !mbHasControlFocus )
{
- mbHasControlFocus = sal_True;
+ mbHasControlFocus = true;
StateChanged( STATE_CHANGE_CONTROL_FOCUS );
if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_GETFOCUS, maGetFocusHdl, this ) )
// been destroyed within the handler
@@ -300,7 +300,7 @@ bool Control::Notify( NotifyEvent& rNEvt )
Window* pFocusWin = Application::GetFocusWindow();
if ( !pFocusWin || !ImplIsWindowOrChild( pFocusWin ) )
{
- mbHasControlFocus = sal_False;
+ mbHasControlFocus = false;
StateChanged( STATE_CHANGE_CONTROL_FOCUS );
if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_LOSEFOCUS, maLoseFocusHdl, this ) )
// been destroyed within the handler
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 445ec1e1d63d..c72a2940e317 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -3274,7 +3274,7 @@ void ImplListBoxFloatingWindow::StartFloat( sal_Bool bStartTracking )
mpImplLB->ShowProminentEntry( nPos );
if( bStartTracking )
- mpImplLB->GetMainWindow()->EnableMouseMoveSelect( sal_True );
+ mpImplLB->GetMainWindow()->EnableMouseMoveSelect( true );
if ( mpImplLB->GetMainWindow()->IsGrabFocusAllowed() )
mpImplLB->GetMainWindow()->GrabFocus();
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 551382d8493d..ea5bd1e4148e 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -177,7 +177,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
mpImplLB->SetSelectionChangedHdl( LINK( this, ListBox, ImplSelectionChangedHdl ) );
}
else
- mpImplLB->GetMainWindow()->AllowGrabFocus( sal_True );
+ mpImplLB->GetMainWindow()->AllowGrabFocus( true );
SetCompoundControl( sal_True );
}
@@ -905,7 +905,7 @@ void ListBox::StateChanged( StateChangedType nType )
bool ListBox::PreNotify( NotifyEvent& rNEvt )
{
- bool nDone = 0;
+ bool nDone = false;
if ( mpImplLB )
{
if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && ( rNEvt.GetWindow() == mpImplWin ) )
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 2c9a2da557e0..9e4646204d76 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -58,7 +58,7 @@ struct ImplTabItem
ImplTabItem()
: mnId( 0 ), mpTabPage( NULL ),
- mnLine( 0 ), mbFullVisible( sal_False ), mbEnabled( true )
+ mnLine( 0 ), mbFullVisible( false ), mbEnabled( true )
{}
};
@@ -406,7 +406,7 @@ namespace MinimumRaggednessWrap
// optimal solution
size_t j = nWidthsCount - 1;
- while (1)
+ while (true)
{
aSolution.push_front(j);
if (!aWrapPoints[j])
@@ -526,7 +526,7 @@ Rectangle TabControl::ImplGetTabRect( sal_uInt16 nItemPos, long nWidth, long nHe
mbSmallInvalidate = sal_False;
it->maRect = aNewRect;
it->mnLine = nLines;
- it->mbFullVisible = sal_True;
+ it->mbFullVisible = true;
nLineWidthAry[nLines] += aSize.Width();
nX += aSize.Width();
@@ -1287,7 +1287,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
if( !rRect.IsEmpty() )
aClipRgn.Intersect( rRect );
if( bLayout || !aClipRgn.IsEmpty() )
- ImplDrawItem( pItem, aCurRect, bLayout, (pItem==pFirstTab), (pItem==pLastTab), sal_False );
+ ImplDrawItem( pItem, aCurRect, bLayout, (pItem==pFirstTab), (pItem==pLastTab), false );
}
if ( bDrawTabsRTL )
@@ -1303,7 +1303,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
if( !rRect.IsEmpty() )
aClipRgn.Intersect( rRect );
if( bLayout || !aClipRgn.IsEmpty() )
- ImplDrawItem( pCurItem, aCurRect, bLayout, (pCurItem==pFirstTab), (pCurItem==pLastTab), sal_True );
+ ImplDrawItem( pCurItem, aCurRect, bLayout, (pCurItem==pFirstTab), (pCurItem==pLastTab), true );
}
}
@@ -1796,7 +1796,7 @@ void TabControl::InsertPage( sal_uInt16 nPageId, const OUString& rText,
pItem->mnId = nPageId;
pItem->mpTabPage = NULL;
pItem->maText = rText;
- pItem->mbFullVisible = sal_False;
+ pItem->mbFullVisible = false;
mbFormat = sal_True;
if ( IsUpdateMode() )