summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-21 17:59:02 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-21 18:24:06 +0100
commit1246f374e6777a7f59574ea5ded7a5e1d812e802 (patch)
tree4f26d5d55d606898f1dbcf4b5123829876912333 /svtools
parent60e6f9fc61cd4ade02c6771a5325e5ca6e05faf4 (diff)
bool improvements
Change-Id: Id1a0df17a28372f9d7c3a88424cf7656fed46f9a
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/config/menuoptions.cxx2
-rw-r--r--svtools/source/config/miscopt.cxx4
-rw-r--r--svtools/source/config/optionsdrawinglayer.cxx2
-rw-r--r--svtools/source/config/slidesorterbaropt.cxx4
-rw-r--r--svtools/source/config/toolpanelopt.cxx4
-rw-r--r--svtools/source/hatchwindow/hatchwindow.cxx2
-rw-r--r--svtools/source/misc/xwindowitem.cxx2
7 files changed, 10 insertions, 10 deletions
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 8089c5c912d3..4c90a1ec81c7 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -237,7 +237,7 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
{
// Safe impossible cases.
// Check any for valid value.
- DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nInvalid property value for property detected!\n" );
+ DBG_ASSERT( seqValues[nProperty].hasValue(), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nInvalid property value for property detected!\n" );
if (!seqValues[nProperty].hasValue())
continue;
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 555a9d4a8bf8..9a0b250227f0 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -289,7 +289,7 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
sal_Int32 nPropertyCount = seqValues.getLength();
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
- if (seqValues[nProperty].hasValue()==sal_False)
+ if (!seqValues[nProperty].hasValue())
continue;
switch( nProperty )
{
@@ -435,7 +435,7 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
sal_Int32 nPropertyCount = seqValues.getLength();
for( sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
- if (seqValues[nProperty].hasValue()==sal_False)
+ if (!seqValues[nProperty].hasValue())
continue;
switch( lcl_MapPropertyName(rPropertyNames[nProperty], aInternalPropertyNames) )
{
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 31a84c28e4e6..d3c4a5517fc2 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -339,7 +339,7 @@ SvtOptionsDrawinglayer_Impl::SvtOptionsDrawinglayer_Impl() :
sal_Int32 nPropertyCount = seqValues.getLength();
for(sal_Int32 nProperty=0; nProperty<nPropertyCount; ++nProperty )
{
- if (seqValues[nProperty].hasValue()==sal_False)
+ if (!seqValues[nProperty].hasValue())
continue;
switch( nProperty )
diff --git a/svtools/source/config/slidesorterbaropt.cxx b/svtools/source/config/slidesorterbaropt.cxx
index 9ef89c8191ed..4ae14c40633d 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -129,7 +129,7 @@ SvtSlideSorterBarOptions_Impl::SvtSlideSorterBarOptions_Impl()
// Copy values from list in right order to our internal member.
for( sal_Int32 nProperty=0; nProperty<seqValues.getLength(); ++nProperty )
{
- if (seqValues[nProperty].hasValue()==sal_False)
+ if (!seqValues[nProperty].hasValue())
continue;
switch( nProperty )
{
@@ -207,7 +207,7 @@ void SvtSlideSorterBarOptions_Impl::Load( const Sequence< OUString >& rPropertyN
// Copy values from list in right order to our internal member.
for( sal_Int32 nProperty=0; nProperty<seqValues.getLength(); ++nProperty )
{
- if (seqValues[nProperty].hasValue()==sal_False)
+ if (!seqValues[nProperty].hasValue())
continue;
switch( lcl_MapPropertyName(rPropertyNames[nProperty], aInternalPropertyNames) )
{
diff --git a/svtools/source/config/toolpanelopt.cxx b/svtools/source/config/toolpanelopt.cxx
index 7c527356d5b8..ccc975543886 100644
--- a/svtools/source/config/toolpanelopt.cxx
+++ b/svtools/source/config/toolpanelopt.cxx
@@ -133,7 +133,7 @@ SvtToolPanelOptions_Impl::SvtToolPanelOptions_Impl()
// Copy values from list in right order to our internal member.
for( sal_Int32 nProperty=0; nProperty<seqValues.getLength(); ++nProperty )
{
- if (seqValues[nProperty].hasValue()==sal_False)
+ if (!seqValues[nProperty].hasValue())
continue;
switch( nProperty )
{
@@ -205,7 +205,7 @@ void SvtToolPanelOptions_Impl::Load( const Sequence< OUString >& rPropertyNames
// Copy values from list in right order to our internal member.
for( sal_Int32 nProperty=0; nProperty<seqValues.getLength(); ++nProperty )
{
- if (seqValues[nProperty].hasValue()==sal_False)
+ if (!seqValues[nProperty].hasValue())
continue;
switch( lcl_MapPropertyName(rPropertyNames[nProperty], aInternalPropertyNames) )
{
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index 7ea016d663df..a2f6413d90d8 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.cxx
@@ -116,7 +116,7 @@ uno::Any SAL_CALL VCLXHatchWindow::queryInterface( const uno::Type & rType )
uno::Any aReturn( ::cppu::queryInterface( rType,
static_cast< embed::XHatchWindow* >( this ) ) );
- if ( aReturn.hasValue() == sal_True )
+ if ( aReturn.hasValue() )
{
return aReturn ;
}
diff --git a/svtools/source/misc/xwindowitem.cxx b/svtools/source/misc/xwindowitem.cxx
index ed81d04dead2..a22a3f9825e4 100644
--- a/svtools/source/misc/xwindowitem.cxx
+++ b/svtools/source/misc/xwindowitem.cxx
@@ -59,7 +59,7 @@ bool XWindowItem::operator == ( const SfxPoolItem & rAttr ) const
DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
const XWindowItem * pItem = dynamic_cast< const XWindowItem * >(&rAttr);
- return pItem ? m_xWin == pItem->m_xWin : 0;
+ return pItem && m_xWin == pItem->m_xWin;
}