summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-16 22:51:15 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-17 17:55:19 +0100
commit05f742d28b3786f44781af5b069c05c16b84decd (patch)
treedacb340f99ad4e47d20557eee04e6f69f5d15721 /xmloff
parentfaced6b5f72b096800a232749cce6b38a76d5bac (diff)
comphelper: sal_Bool -> bool
Change-Id: I6fc331ae0706f4bb193543011c8d4ae0a385fcc0
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/draw/animimp.cxx4
-rw-r--r--xmloff/source/draw/ximpshap.cxx22
-rw-r--r--xmloff/source/style/NamedBoolPropertyHdl.cxx4
-rw-r--r--xmloff/source/style/PageMasterExportPropMapper.cxx2
-rw-r--r--xmloff/source/style/PageMasterPropHdl.cxx4
5 files changed, 18 insertions, 18 deletions
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 8c5deb9410de..154d61b04cc5 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -605,7 +605,7 @@ void XMLAnimationsEffectContext::EndElement()
{
if( meKind == XMLE_HIDE && !mbTextEffect && meEffect == EK_none )
{
- aAny = bool2any( sal_True );
+ aAny = bool2any( true );
xSet->setPropertyValue( mpImpl->msDimHide, aAny );
}
else
@@ -634,7 +634,7 @@ void XMLAnimationsEffectContext::EndElement()
aAny <<= bool2any( mbPlayFull );
xSet->setPropertyValue( mpImpl->msPlayFull, aAny );
- aAny <<= bool2any( sal_True );
+ aAny <<= bool2any( true );
xSet->setPropertyValue( mpImpl->msSoundOn, aAny );
}
else
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index f4bb6a0c3e0d..30a73d18e2da 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1679,10 +1679,10 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt
if( xPropsInfo.is() )
{
if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject"))
- xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( sal_False ) );
+ xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) );
if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent"))
- xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( sal_False ) );
+ xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) );
}
}
}
@@ -2457,7 +2457,7 @@ void SdXMLGraphicObjectShapeContext::StartElement( const ::com::sun::star::uno::
if( xPropsInfo.is() )
{
if( xPropsInfo->hasPropertyByName("IsPlaceholderDependent"))
- xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( sal_False ) );
+ xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) );
}
}
}
@@ -2568,7 +2568,7 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri
{
uno::Reference< beans::XPropertySetInfo > xPropsInfo( xProps->getPropertySetInfo() );
if( xPropsInfo.is() && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject"))
- xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( sal_False ) );
+ xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) );
uno::Any aAny;
@@ -2595,7 +2595,7 @@ void SdXMLChartShapeContext::StartElement(const uno::Reference< xml::sax::XAttri
if( xPropsInfo.is() )
{
if( xPropsInfo->hasPropertyByName("IsPlaceholderDependent"))
- xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( sal_False ) );
+ xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) );
}
}
}
@@ -2699,10 +2699,10 @@ void SdXMLObjectShapeContext::StartElement( const ::com::sun::star::uno::Referen
if( xPropsInfo.is() )
{
if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject"))
- xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( sal_False ) );
+ xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) );
if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent"))
- xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( sal_False ) );
+ xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) );
}
}
}
@@ -3079,10 +3079,10 @@ void SdXMLPluginShapeContext::StartElement( const ::com::sun::star::uno::Referen
if( xPropsInfo.is() )
{
if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject"))
- xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( sal_False ) );
+ xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) );
if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent"))
- xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( sal_False ) );
+ xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) );
}
}
}
@@ -3886,10 +3886,10 @@ void SdXMLTableShapeContext::StartElement( const ::com::sun::star::uno::Referenc
if( xPropsInfo.is() )
{
if( !mbIsPlaceholder && xPropsInfo->hasPropertyByName("IsEmptyPresentationObject"))
- xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( sal_False ) );
+ xProps->setPropertyValue("IsEmptyPresentationObject", ::cppu::bool2any( false ) );
if( mbIsUserTransformed && xPropsInfo->hasPropertyByName("IsPlaceholderDependent"))
- xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( sal_False ) );
+ xProps->setPropertyValue("IsPlaceholderDependent", ::cppu::bool2any( false ) );
}
}
}
diff --git a/xmloff/source/style/NamedBoolPropertyHdl.cxx b/xmloff/source/style/NamedBoolPropertyHdl.cxx
index 4a26274a13d2..8d3273ef65e9 100644
--- a/xmloff/source/style/NamedBoolPropertyHdl.cxx
+++ b/xmloff/source/style/NamedBoolPropertyHdl.cxx
@@ -39,13 +39,13 @@ bool XMLNamedBoolPropertyHdl::importXML( const OUString& rStrImpValue, Any& rVal
{
if( rStrImpValue == maTrueStr )
{
- rValue = ::cppu::bool2any( sal_True );
+ rValue = ::cppu::bool2any( true );
return true;
}
if( rStrImpValue == maFalseStr )
{
- rValue = ::cppu::bool2any( sal_False );
+ rValue = ::cppu::bool2any( false );
return true;
}
diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx
index 8abdc0a04066..a3396617f622 100644
--- a/xmloff/source/style/PageMasterExportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterExportPropMapper.cxx
@@ -63,7 +63,7 @@ static void lcl_RemoveStateIfZero16( XMLPropertyState* pState )
static void lcl_AddState(::std::vector< XMLPropertyState >& rPropState, sal_Int32 nIndex, const OUString& rProperty, uno::Reference< beans::XPropertySet >& xProps)
{
if(::cppu::any2bool(xProps->getPropertyValue(rProperty)))
- rPropState.push_back(XMLPropertyState (nIndex, cppu::bool2any(sal_True)));
+ rPropState.push_back(XMLPropertyState (nIndex, cppu::bool2any(true)));
}
// helper struct to handle equal XMLPropertyState's for page, header and footer
diff --git a/xmloff/source/style/PageMasterPropHdl.cxx b/xmloff/source/style/PageMasterPropHdl.cxx
index cb5d2902617a..a171f0c274d5 100644
--- a/xmloff/source/style/PageMasterPropHdl.cxx
+++ b/xmloff/source/style/PageMasterPropHdl.cxx
@@ -331,7 +331,7 @@ bool XMLPMPropHdl_CenterHorizontal::importXML(
if (IsXMLToken( rStrImpValue, XML_BOTH) ||
IsXMLToken( rStrImpValue, XML_HORIZONTAL))
{
- rValue = ::cppu::bool2any(sal_True);
+ rValue = ::cppu::bool2any(true);
bRet = true;
}
@@ -372,7 +372,7 @@ bool XMLPMPropHdl_CenterVertical::importXML(
if (IsXMLToken(rStrImpValue, XML_BOTH) ||
IsXMLToken(rStrImpValue, XML_VERTICAL) )
{
- rValue = ::cppu::bool2any(sal_True);
+ rValue = ::cppu::bool2any(true);
bRet = true;
}