diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-03-01 22:06:20 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-03-01 22:06:24 +0200 |
| commit | 5594a09339f9468e9f57b3c1ac5f0134bfac3fe5 (patch) | |
| tree | 6acddaff43185c5eb2ca47398e079e49d0e5de2e /sd | |
| parent | 59b83de4ee0c1ba0a842ca36e3fa253fcf3cdf22 (diff) | |
WaE: implicit conversion (IntegralToBoolean) of literal of type 'sal_Bool' ...
... (aka 'unsigned char') to 'bool'.
Change-Id: I7b6ed29c750ad26925f4875c0a38cb800a9f693f
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/epptso.cxx | 4 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-epptbase.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptx-text.cxx | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index ad85bc0c0b08..f4fae7749cbe 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -990,7 +990,7 @@ bool PPTWriter::ImplGetText() { mnTextSize = mXText->getString().getLength(); ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ), sal_True ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ), true ) ) aAny >>= mbFontIndependentLineSpacing; } return ( mnTextSize != 0 ); @@ -3674,7 +3674,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc mnTextSize = mXText->getString().getLength(); ::com::sun::star::uno::Any aAny; - if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ), sal_True ) ) + if ( GetPropertyValue( aAny, mXPropSet, OUString( "FontIndependentLineSpacing" ), true ) ) aAny >>= mbFontIndependentLineSpacing; EscherPropertyContainer aPropOptSp; diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index d97930da203f..a01f5c1573cc 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -439,7 +439,7 @@ sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference { ::com::sun::star::uno::Any aAny; sal_Int32 nLayout = 20; - if ( GetPropertyValue( aAny, rXPropSet, OUString( "Layout" ), sal_True ) ) + if ( GetPropertyValue( aAny, rXPropSet, OUString( "Layout" ), true ) ) aAny >>= nLayout; DBG(printf("GetLayoutOffset %" SAL_PRIdINT32 "\n", nLayout)); diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index d906f81a9a5a..361ee37e975d 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -515,13 +515,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com OUString aFieldKind( aXTextField->getPresentation( sal_True ) ); if ( aFieldKind == "Date" ) { - if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), sal_True ) ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), true ) ) { bool bBool = false; aAny >>= bBool; if ( !bBool ) // Fixed DateFields does not exist in PPT { - if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ), sal_True ) ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ), true ) ) { nFormat = *(sal_Int32*)aAny.getValue(); switch ( nFormat ) @@ -543,7 +543,7 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com } else if ( aFieldKind == "URL" ) { - if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "URL" ), sal_True ) ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "URL" ), true ) ) rURL = *(OUString*)aAny.getValue(); nRetValue = 4 << 28; } @@ -557,13 +557,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com } else if ( aFieldKind == "Time" ) { - if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), sal_True ) ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), true ) ) { bool bBool = false; aAny >>= bBool; if ( !bBool ) { - if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), sal_True ) ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), true ) ) { nFormat = *(sal_Int32*)aAny.getValue(); nRetValue |= ( ( ( 2 << 4 ) | nFormat ) << 24 ) | 0x800000; @@ -581,13 +581,13 @@ sal_uInt32 PortionObj::ImplGetTextField( ::com::sun::star::uno::Reference< ::com } else if ( aFieldKind == "ExtTime" ) { - if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), sal_True ) ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "IsFix" ), true ) ) { bool bBool = false; aAny >>= bBool; if ( !bBool ) { - if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ), sal_True ) ) + if ( GetPropertyValue( aAny, xFieldPropSet, OUString( "Format" ), true ) ) { nFormat = *(sal_Int32*)aAny.getValue(); switch ( nFormat ) |