summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-23 18:30:45 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-23 18:39:07 +0200
commit22401181774dfb3882e7ad0335f1267d7885ff48 (patch)
treecc31d4ef17eef1e76458e47cef8675458c8719ea /toolkit
parent6425f7ff616f9aaad8b4e279385ed3f5ab65bfe2 (diff)
Improved loplugin:literaltoboolconversion looking into cond. exprs.
...automatic rewriter fixes Change-Id: I6b04ca80f08f8a71ff94e309fd52f44d736751ee
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/awt/vclxfont.cxx2
-rw-r--r--toolkit/source/awt/vclxwindows.cxx6
-rw-r--r--toolkit/source/controls/unocontrolmodel.cxx2
-rw-r--r--toolkit/source/helper/property.cxx2
-rw-r--r--toolkit/source/helper/unopropertyarrayhelper.cxx2
-rw-r--r--toolkit/source/helper/unowrapper.cxx2
6 files changed, 8 insertions, 8 deletions
diff --git a/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index f7e3fe6d0ad4..a0628c0f22b3 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.cxx
@@ -66,7 +66,7 @@ bool VCLXFont::ImplAssertValidFontMetric()
pOutDev->SetFont( aOldFont );
}
}
- return mpFontMetric ? sal_True : sal_False;
+ return mpFontMetric ? true : false;
}
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index a30695d5afd5..e0cedc4963ff 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -1140,7 +1140,7 @@ void VCLXRadioButton::setProperty( const OUString& PropertyName, const ::com::su
sal_Int16 n = sal_Int16();
if ( Value >>= n )
{
- bool b = n ? sal_True : sal_False;
+ bool b = n ? true : false;
if ( pButton->IsRadioCheckEnabled() )
pButton->Check( b );
else
@@ -1807,7 +1807,7 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
if( pListBox )
{
- bool bDropDown = ( pListBox->GetStyle() & WB_DROPDOWN ) ? sal_True : sal_False;
+ bool bDropDown = ( pListBox->GetStyle() & WB_DROPDOWN ) ? true : false;
if ( bDropDown && !IsSynthesizingVCLEvent() && maActionListeners.getLength() )
{
// Call ActionListener on DropDown event
@@ -4690,7 +4690,7 @@ void VCLXFormattedSpinField::setStrictFormat( bool bStrict )
bool VCLXFormattedSpinField::isStrictFormat()
{
FormatterBase* pFormatter = GetFormatter();
- return pFormatter ? pFormatter->IsStrictFormat() : sal_False;
+ return pFormatter ? pFormatter->IsStrictFormat() : false;
}
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index b4b4bc911942..8d7ec07416c4 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -150,7 +150,7 @@ bool UnoControlModel::ImplHasProperty( sal_uInt16 nPropId ) const
if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )
nPropId = BASEPROPERTY_FONTDESCRIPTOR;
- return maData.find( nPropId ) != maData.end() ? sal_True : sal_False;
+ return maData.find( nPropId ) != maData.end() ? true : false;
}
::com::sun::star::uno::Any UnoControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
diff --git a/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index 0dd5367ce96e..e1144e463b4f 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.cxx
@@ -385,7 +385,7 @@ bool DoesDependOnOthers( sal_uInt16 nPropertyId )
{
const ImplPropertyInfo* pImplPropertyInfo = ImplGetImplPropertyInfo( nPropertyId );
DBG_ASSERT( pImplPropertyInfo, "Invalid PropertyId!" );
- return pImplPropertyInfo ? pImplPropertyInfo->bDependsOnOthers : sal_False;
+ return pImplPropertyInfo ? pImplPropertyInfo->bDependsOnOthers : false;
}
bool CompareProperties( const ::com::sun::star::uno::Any& r1, const ::com::sun::star::uno::Any& r2 )
diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx
index 14b7dec3189c..d8658952590a 100644
--- a/toolkit/source/helper/unopropertyarrayhelper.cxx
+++ b/toolkit/source/helper/unopropertyarrayhelper.cxx
@@ -46,7 +46,7 @@ bool UnoPropertyArrayHelper::ImplHasProperty( sal_uInt16 nPropId ) const
if ( ( nPropId >= BASEPROPERTY_FONTDESCRIPTORPART_START ) && ( nPropId <= BASEPROPERTY_FONTDESCRIPTORPART_END ) )
nPropId = BASEPROPERTY_FONTDESCRIPTOR;
- return maIDs.find( nPropId ) != maIDs.end() ? sal_True : sal_False;
+ return maIDs.find( nPropId ) != maIDs.end() ? true : false;
}
// ::cppu::IPropertyArrayHelper
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 6087476da18f..5cdcbfe0e120 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -212,7 +212,7 @@ static bool lcl_ImplIsParent( vcl::Window* pParentWindow, vcl::Window* pPossible
while ( pWindow && ( pWindow != pParentWindow ) )
pWindow = pWindow->GetParent();
- return pWindow ? sal_True : sal_False;
+ return pWindow ? true : false;
}
void UnoWrapper::WindowDestroyed( vcl::Window* pWindow )