summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-07-16 13:54:14 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-07-16 14:00:20 +0200
commitb36e8678bc6e6b272cc116dcd4fbdb90dca12e28 (patch)
tree2077d7fb53cf0c986a47ae966694816354737226 /sd
parent35279a7e2d9bb18373c69c6922c240447be92104 (diff)
loplugin:simplifybool
Change-Id: Id87047cb49eabe0c5ef3463f437e47f0eeeae990
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/EffectMigration.cxx2
-rw-r--r--sd/source/core/annotations/AnnotationEnumeration.cxx2
-rw-r--r--sd/source/core/stlfamily.cxx2
-rw-r--r--sd/source/core/stlsheet.cxx4
-rw-r--r--sd/source/filter/html/pubdlg.cxx4
-rw-r--r--sd/source/filter/ppt/pptinanimations.cxx4
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx2
-rw-r--r--sd/source/ui/unoidl/unopage.cxx2
9 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index cc5c20c74857..abfa32106465 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -1350,7 +1350,7 @@ void createVisibilityOnOffNode(Reference< XTimeContainer >& rxParentContainer, S
xAnimate->setAttributeName(OUString("Visibility"));
// set attribute value
- aAny <<= bVisible ? sal_True : sal_False;
+ aAny <<= bVisible;
xAnimate->setTo(aAny);
// ad set node to par node
diff --git a/sd/source/core/annotations/AnnotationEnumeration.cxx b/sd/source/core/annotations/AnnotationEnumeration.cxx
index 838995e1c514..efa3e57c9fc4 100644
--- a/sd/source/core/annotations/AnnotationEnumeration.cxx
+++ b/sd/source/core/annotations/AnnotationEnumeration.cxx
@@ -65,7 +65,7 @@ AnnotationEnumeration::AnnotationEnumeration( const AnnotationVector& rAnnotatio
// ::com::sun::star::office::XAnnotationEnumeration:
sal_Bool SAL_CALL AnnotationEnumeration::hasMoreElements() throw (css::uno::RuntimeException, std::exception)
{
- return maIter != maAnnotations.end() ? sal_True : sal_False;
+ return maIter != maAnnotations.end();
}
css::uno::Reference< css::office::XAnnotation > SAL_CALL AnnotationEnumeration::nextElement() throw (css::uno::RuntimeException, css::container::NoSuchElementException, std::exception)
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 7f52b4ce758b..fa239534f71d 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -271,7 +271,7 @@ sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(Runtim
{
PresStyleMap& rStyleSheets = mpImpl->getStyleSheets();
PresStyleMap::iterator iter( rStyleSheets.find(aName) );
- return ( iter != rStyleSheets.end() ) ? sal_True : sal_False;
+ return iter != rStyleSheets.end();
}
else
{
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 050b1c0a7204..fb0fd7fa4015 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -895,14 +895,14 @@ sal_Bool SAL_CALL SdStyleSheet::isUserDefined() throw(RuntimeException, std::exc
{
SolarMutexGuard aGuard;
throwIfDisposed();
- return IsUserDefined() ? sal_True : sal_False;
+ return IsUserDefined();
}
sal_Bool SAL_CALL SdStyleSheet::isInUse() throw(RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
throwIfDisposed();
- return IsUsed() ? sal_True : sal_False;
+ return IsUsed();
}
OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException, std::exception)
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 9bdf9cf915f0..099d3fedd100 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -854,11 +854,11 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
aProps.push_back( aValue );
aValue.Name = "SlideSound";
- aValue.Value <<= pPage3_SldSound->IsChecked() ? sal_True : sal_False;
+ aValue.Value <<= pPage3_SldSound->IsChecked();
aProps.push_back( aValue );
aValue.Name = "HiddenSlides";
- aValue.Value <<= pPage3_HiddenSlides->IsChecked() ? sal_True : sal_False;
+ aValue.Value <<= pPage3_HiddenSlides->IsChecked();
aProps.push_back( aValue );
// Page 4
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index f1e8b2202515..3783d7e85008 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -999,7 +999,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
OUString aString;
if( rValue >>= aString )
{
- rValue <<= aString == "visible" ? sal_True : sal_False;
+ rValue <<= aString == "visible";
bRet = true;
}
}
@@ -1687,7 +1687,7 @@ void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom
if( nBits & 2 )
{
- xAnimate->setAccumulate( (nAccumulate == 0) ? sal_True : sal_False );
+ xAnimate->setAccumulate( nAccumulate == 0 );
}
}
}
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index f6446ae0d1b4..aece524ddcbf 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1075,7 +1075,7 @@ STLPropertySet* CustomAnimationPane::createSelectionSet()
}
addValue( pSet, nHandleHasAfterEffect, makeAny( pEffect->hasAfterEffect() ) );
- addValue( pSet, nHandleAfterEffectOnNextEffect, makeAny( pEffect->IsAfterEffectOnNext() ? sal_True : sal_False ) );
+ addValue( pSet, nHandleAfterEffectOnNextEffect, makeAny( pEffect->IsAfterEffectOnNext() ) );
addValue( pSet, nHandleDimColor, pEffect->getDimColor() );
addValue( pSet, nHandleIterateType, makeAny( pEffect->getIterateType() ) );
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 6abb3ac2963b..e83929f67cbe 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2767,7 +2767,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn)
Sequence< beans::PropertyValue > aArgs(1);
aArgs[0].Name = "AutoSaveState";
- aArgs[0].Value <<= bOn ? sal_True : sal_False;
+ aArgs[0].Value <<= bOn;
uno::Reference< frame::XDispatch > xAutoSave = frame::theAutoRecovery::get(xContext);
xAutoSave->dispatch(aURL, aArgs);
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 0455f55e6474..57c957b06526 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2664,7 +2664,7 @@ Type SAL_CALL SdNavigationOrderAccess::getElementType( ) throw (RuntimeExceptio
sal_Bool SAL_CALL SdNavigationOrderAccess::hasElements( ) throw (RuntimeException, std::exception)
{
- return maShapes.empty() ? sal_False : sal_True;
+ return !maShapes.empty();
}
Any SdGenericDrawPage::getNavigationOrder()