summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-21 12:53:51 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-21 12:53:51 +0100
commite8f8f24c8415898c787bbfb629247ed62e73a2b9 (patch)
treedae18a3acbf29c192118e7c003f80df8da8e21ae /toolkit
parent1c8402465cfd4df862409dc310f5f099d044c4d8 (diff)
vcl: sal_Bool -> bool
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/vclxaccessiblecomponent.cxx4
-rw-r--r--toolkit/source/awt/vclxcontainer.cxx4
-rw-r--r--toolkit/source/awt/vclxtoolkit.cxx16
-rw-r--r--toolkit/source/awt/vclxwindow.cxx16
-rw-r--r--toolkit/source/awt/vclxwindows.cxx22
5 files changed, 31 insertions, 31 deletions
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 4fbc9df25349..c20492a85652 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -213,9 +213,9 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind
{
Window* pWindow = (Window*) rVclWindowEvent.GetData();
DBG_ASSERT( pWindow, "VCLEVENT_WINDOW_CHILDDESTROYED - Window=?" );
- if ( pWindow->GetAccessible( sal_False ).is() )
+ if ( pWindow->GetAccessible( false ).is() )
{
- aOldValue <<= pWindow->GetAccessible( sal_False );
+ aOldValue <<= pWindow->GetAccessible( false );
NotifyAccessibleEvent( accessibility::AccessibleEventId::CHILD, aOldValue, aNewValue );
}
}
diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index d82381b6acaa..fcc4e887549e 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.cxx
@@ -157,9 +157,9 @@ void VCLXContainer::setTabOrder( const ::com::sun::star::uno::Sequence< ::com::s
if ( bGroupControl )
{
if ( n == 0 )
- pWin->SetDialogControlStart( sal_True );
+ pWin->SetDialogControlStart( true );
else
- pWin->SetDialogControlStart( sal_False );
+ pWin->SetDialogControlStart( false );
}
pPrevWin = pWin;
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index e2cfd8cadfca..8c5be7dc6032 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -831,7 +831,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
break;
case WINDOW_CURRENCYFIELD:
pNewWindow = new CurrencyField( pParent, nWinBits );
- static_cast<CurrencyField*>(pNewWindow)->EnableEmptyFieldValue( sal_True );
+ static_cast<CurrencyField*>(pNewWindow)->EnableEmptyFieldValue( true );
*ppNewComp = new VCLXNumericField;
((VCLXFormattedSpinField*)*ppNewComp)->SetFormatter( (FormatterBase*)(CurrencyField*)pNewWindow );
break;
@@ -840,7 +840,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
break;
case WINDOW_DATEFIELD:
pNewWindow = new DateField( pParent, nWinBits );
- static_cast<DateField*>(pNewWindow)->EnableEmptyFieldValue( sal_True );
+ static_cast<DateField*>(pNewWindow)->EnableEmptyFieldValue( true );
*ppNewComp = new VCLXDateField;
((VCLXFormattedSpinField*)*ppNewComp)->SetFormatter( (FormatterBase*)(DateField*)pNewWindow );
break;
@@ -889,7 +889,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
*ppNewComp = new VCLXFrame;
// Frame control needs to receive
// Mouse events
- pGroupBox->SetMouseTransparent( sal_False );
+ pGroupBox->SetMouseTransparent( false );
}
}
break;
@@ -965,7 +965,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
break;
case WINDOW_NUMERICFIELD:
pNewWindow = new NumericField( pParent, nWinBits );
- static_cast<NumericField*>(pNewWindow)->EnableEmptyFieldValue( sal_True );
+ static_cast<NumericField*>(pNewWindow)->EnableEmptyFieldValue( true );
*ppNewComp = new VCLXNumericField;
((VCLXFormattedSpinField*)*ppNewComp)->SetFormatter( (FormatterBase*)(NumericField*)pNewWindow );
break;
@@ -1002,7 +1002,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
// is not really valid: the controls are grouped after they have been created, but we're still in
// the creation process, so the RadioButton::Check relies on invalid grouping information.
// 07.08.2001 - #87254# - frank.schoenheit@sun.com
- static_cast<RadioButton*>(pNewWindow)->EnableRadioCheck( sal_False );
+ static_cast<RadioButton*>(pNewWindow)->EnableRadioCheck( false );
break;
case WINDOW_SCROLLBAR:
pNewWindow = new ScrollBar( pParent, nWinBits );
@@ -1050,7 +1050,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
break;
case WINDOW_TIMEFIELD:
pNewWindow = new TimeField( pParent, nWinBits );
- static_cast<TimeField*>(pNewWindow)->EnableEmptyFieldValue( sal_True );
+ static_cast<TimeField*>(pNewWindow)->EnableEmptyFieldValue( true );
*ppNewComp = new VCLXTimeField;
((VCLXFormattedSpinField*)*ppNewComp)->SetFormatter( (FormatterBase*)(TimeField*)pNewWindow );
break;
@@ -1236,7 +1236,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
#else
"svt",
#endif
- sal_True );
+ true );
hSvToolsLib = osl_loadModuleRelative(
&thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hSvToolsLib )
@@ -1261,7 +1261,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
if ( pNewWindow )
{
- pNewWindow->SetCreatedWithToolkit( sal_True );
+ pNewWindow->SetCreatedWithToolkit( true );
//pNewWindow->SetPosPixel( Point() ); // do not force (0,0) position, keep default pos instead
if ( rDescriptor.WindowAttributes & ::com::sun::star::awt::WindowAttribute::MINSIZE )
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index fa29d4fb82ae..a8b8981bed99 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1065,7 +1065,7 @@ void VCLXWindow::addWindowListener( const ::com::sun::star::uno::Reference< ::co
// #100119# Get all resize events, even if height or width 0, or invisible
if ( GetWindow() )
- GetWindow()->EnableAllResize( sal_True );
+ GetWindow()->EnableAllResize( true );
}
void VCLXWindow::removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException)
@@ -1627,7 +1627,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
// support transparency only for special controls
pWindow->SetBackground();
pWindow->SetControlBackground();
- pWindow->SetPaintTransparent( sal_True );
+ pWindow->SetPaintTransparent( true );
break;
}
@@ -1660,7 +1660,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
case WINDOW_RADIOBUTTON:
case WINDOW_GROUPBOX:
case WINDOW_FIXEDLINE:
- pWindow->SetPaintTransparent( sal_False );
+ pWindow->SetPaintTransparent( false );
default: ;
}
pWindow->Invalidate(); // Invalidate if control does not respond to it
@@ -1862,7 +1862,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
break;
case BASEPROPERTY_AUTOMNEMONICS:
{
- sal_Bool bAutoMnemonics = false;
+ bool bAutoMnemonics = false;
Value >>= bAutoMnemonics;
AllSettings aSettings = pWindow->GetSettings();
StyleSettings aStyleSettings = aSettings.GetStyleSettings();
@@ -2314,9 +2314,9 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno:
pWindow->Show();
pWindow->Update();
- pWindow->SetParentUpdateMode( sal_False );
+ pWindow->SetParentUpdateMode( false );
pWindow->Hide();
- pWindow->SetParentUpdateMode( sal_True );
+ pWindow->SetParentUpdateMode( true );
pWindow->SetPosPixel( aOldPos );
if ( bWasVisible )
@@ -2341,10 +2341,10 @@ void VCLXWindow::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno:
{
sal_Bool bOldNW =pWindow->IsNativeWidgetEnabled();
if( bOldNW )
- pWindow->EnableNativeWidget(sal_False);
+ pWindow->EnableNativeWidget(false);
pWindow->PaintToDevice( pDev, aP, aSz );
if( bOldNW )
- pWindow->EnableNativeWidget(sal_True);
+ pWindow->EnableNativeWidget(true);
}
}
}
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 9df857685c46..623c5eb0cecf 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -1301,11 +1301,11 @@ void VCLXRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
aEvent.ActionCommand = maActionCommand;
maActionListeners.actionPerformed( aEvent );
}
- ImplClickedOrToggled( sal_False );
+ ImplClickedOrToggled( false );
break;
case VCLEVENT_RADIOBUTTON_TOGGLE:
- ImplClickedOrToggled( sal_True );
+ ImplClickedOrToggled( true );
break;
default:
@@ -1314,7 +1314,7 @@ void VCLXRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
}
}
-void VCLXRadioButton::ImplClickedOrToggled( sal_Bool bToggled )
+void VCLXRadioButton::ImplClickedOrToggled( bool bToggled )
{
// In the formulars, RadioChecked is not enabled, call itemStateChanged only for click
// In the dialog editor, RadioChecked is enabled, call itemStateChanged only for bToggled
@@ -1324,7 +1324,7 @@ void VCLXRadioButton::ImplClickedOrToggled( sal_Bool bToggled )
::com::sun::star::awt::ItemEvent aEvent;
aEvent.Source = (::cppu::OWeakObject*)this;
aEvent.Highlighted = sal_False;
- aEvent.Selected = pRadioButton->IsChecked();
+ aEvent.Selected = pRadioButton->IsChecked() ? 1 : 0;
maItemListeners.itemStateChanged( aEvent );
}
}
@@ -1678,7 +1678,7 @@ void VCLXListBox::selectItemPos( sal_Int16 nPos, sal_Bool bSelect ) throw(::com:
SolarMutexGuard aGuard;
ListBox* pBox = (ListBox*) GetWindow();
- if ( pBox && ( pBox->IsEntryPosSelected( nPos ) != bSelect ) )
+ if ( pBox && ( pBox->IsEntryPosSelected( nPos ) != bool(bSelect) ) )
{
pBox->SelectEntryPos( nPos, bSelect );
@@ -1703,7 +1703,7 @@ void VCLXListBox::selectItemsPos( const ::com::sun::star::uno::Sequence<sal_Int1
for ( sal_uInt16 n = (sal_uInt16)aPositions.getLength(); n; )
{
sal_uInt16 nPos = (sal_uInt16) aPositions.getConstArray()[--n];
- if ( pBox->IsEntryPosSelected( nPos ) != bSelect )
+ if ( pBox->IsEntryPosSelected( nPos ) != bool(bSelect) )
{
pBox->SelectEntryPos( nPos, bSelect );
bChanged = sal_True;
@@ -1898,7 +1898,7 @@ void VCLXListBox::setProperty( const OUString& PropertyName, const ::com::sun::s
if ( Value >>= aItems )
{
for ( sal_uInt16 n = pListBox->GetEntryCount(); n; )
- pListBox->SelectEntryPos( --n, sal_False );
+ pListBox->SelectEntryPos( --n, false );
if ( aItems.getLength() )
selectItemsPos( aItems, sal_True );
@@ -4835,7 +4835,7 @@ void VCLXDateField::setProperty( const OUString& PropertyName, const ::com::sun:
{
if ( bVoid )
{
- ((DateField*)GetWindow())->EnableEmptyFieldValue( sal_True );
+ ((DateField*)GetWindow())->EnableEmptyFieldValue( true );
((DateField*)GetWindow())->SetEmptyFieldValue();
}
else
@@ -5319,7 +5319,7 @@ void VCLXTimeField::setProperty( const OUString& PropertyName, const ::com::sun:
{
if ( bVoid )
{
- ((TimeField*)GetWindow())->EnableEmptyFieldValue( sal_True );
+ ((TimeField*)GetWindow())->EnableEmptyFieldValue( true );
((TimeField*)GetWindow())->SetEmptyFieldValue();
}
else
@@ -5649,7 +5649,7 @@ void VCLXNumericField::setProperty( const OUString& PropertyName, const ::com::s
{
if ( bVoid )
{
- ((NumericField*)GetWindow())->EnableEmptyFieldValue( sal_True );
+ ((NumericField*)GetWindow())->EnableEmptyFieldValue( true );
((NumericField*)GetWindow())->SetEmptyFieldValue();
}
else
@@ -6245,7 +6245,7 @@ void VCLXCurrencyField::setProperty( const OUString& PropertyName, const ::com::
{
if ( bVoid )
{
- ((LongCurrencyField*)GetWindow())->EnableEmptyFieldValue( sal_True );
+ ((LongCurrencyField*)GetWindow())->EnableEmptyFieldValue( true );
((LongCurrencyField*)GetWindow())->SetEmptyFieldValue();
}
else