diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-23 18:30:45 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-23 18:39:07 +0200 |
commit | 22401181774dfb3882e7ad0335f1267d7885ff48 (patch) | |
tree | cc31d4ef17eef1e76458e47cef8675458c8719ea /filter/source | |
parent | 6425f7ff616f9aaad8b4e279385ed3f5ab65bfe2 (diff) |
Improved loplugin:literaltoboolconversion looking into cond. exprs.
...automatic rewriter fixes
Change-Id: I6b04ca80f08f8a71ff94e309fd52f44d736751ee
Diffstat (limited to 'filter/source')
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 | ||||
-rw-r--r-- | filter/source/pdf/impdialog.cxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgexport.cxx | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index a3a3a5b08d5a..fdf5806daf01 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -967,14 +967,14 @@ void EscherPropertyContainer::CreateLineProperties( bSwapLineEnds = true; } } - if ( GetLineArrow( bSwapLineEnds ? sal_False : sal_True, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) ) + if ( GetLineArrow( bSwapLineEnds ? false : true, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) ) { AddOpt( ESCHER_Prop_lineStartArrowLength, nArrowLength ); AddOpt( ESCHER_Prop_lineStartArrowWidth, nArrowWidth ); AddOpt( ESCHER_Prop_lineStartArrowhead, eLineEnd ); nLineFlags |= 0x100010; } - if ( GetLineArrow( bSwapLineEnds ? sal_True : sal_False, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) ) + if ( GetLineArrow( bSwapLineEnds ? true : false, rXPropSet, eLineEnd, nArrowLength, nArrowWidth ) ) { AddOpt( ESCHER_Prop_lineEndArrowLength, nArrowLength ); AddOpt( ESCHER_Prop_lineEndArrowWidth, nArrowWidth ); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index c1be035f3257..3f99bf1fb4e5 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -1508,7 +1508,7 @@ void DffPropertyReader::ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const rSet.Put( makeSdrTextUpperDistItem( nTextTop ) ); rSet.Put( makeSdrTextLowerDistItem( nTextBottom ) ); - rSet.Put( makeSdrTextWordWrapItem( (MSO_WrapMode)GetPropertyValue( DFF_Prop_WrapText, mso_wrapSquare ) != mso_wrapNone ? sal_True : sal_False ) ); + rSet.Put( makeSdrTextWordWrapItem( (MSO_WrapMode)GetPropertyValue( DFF_Prop_WrapText, mso_wrapSquare ) != mso_wrapNone ? true : false ) ); rSet.Put( makeSdrTextAutoGrowHeightItem( ( GetPropertyValue( DFF_Prop_FitTextToShape ) & 2 ) != 0 ) ); } @@ -5992,7 +5992,7 @@ bool SvxMSDffManager::GetShapeContainerData( SvStream& rSt, // Can the shape be replaced with a frame? // (provided that it is a TextBox and the text is not rotated) - bool bCanBeReplaced = (ULONG_MAX > nPosGroup) ? sal_False : sal_True; + bool bCanBeReplaced = (ULONG_MAX > nPosGroup) ? false : true; // we don't know yet whether it's a TextBox MSO_SPT eShapeType = mso_sptNil; diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index c47f9d546856..823a583d54ba 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -3671,7 +3671,7 @@ bool PPTNumberFormatCreator::GetNumberFormat( SdrPowerPointImport& rManager, Svx break; } } - return ( nHardCount ) ? sal_True : sal_False; + return ( nHardCount ) ? true : false; } void PPTNumberFormatCreator::ImplGetNumberFormat( SdrPowerPointImport& rManager, SvxNumberFormat& rNumberFormat, sal_uInt32 /*nLevel*/) diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 64224bddcaa3..00fd14ddee70 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -885,7 +885,7 @@ void ImpPDFTabOpnFtrPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) else if( mpRbPgLyContinueFacing->IsChecked() ) paParent->mnPageLayout = 3; - paParent->mbFirstPageLeft = ( mbUseCTLFont ) ? mpCbPgLyFirstOnLeft->IsChecked() : sal_False; + paParent->mbFirstPageLeft = ( mbUseCTLFont ) ? mpCbPgLyFirstOnLeft->IsChecked() : false; } diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 7ed8a0a617ef..049b6fc0bbe8 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -341,8 +341,8 @@ SVGExport::SVGExport( const char* pSVGDisableFontEmbedding = getenv( "SVG_DISABLE_FONT_EMBEDDING" ); OUString aEmbedFontEnv("${SVG_DISABLE_FONT_EMBEDDING}"); rtl::Bootstrap::expandMacros(aEmbedFontEnv); - mbIsEmbedFonts=pSVGDisableFontEmbedding ? sal_False : ( - aEmbedFontEnv.getLength() ? sal_False : sal_True); + mbIsEmbedFonts=pSVGDisableFontEmbedding ? false : ( + aEmbedFontEnv.getLength() ? false : true); } else { @@ -351,7 +351,7 @@ SVGExport::SVGExport( } // Native Decoration - mbIsUseNativeTextDecoration = mbIsUseTinyProfile ? sal_False : aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_NATIVEDECORATION, false); + mbIsUseNativeTextDecoration = mbIsUseTinyProfile ? false : aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_NATIVEDECORATION, false); // Tiny Opacity (supported from SVG Tiny 1.2) mbIsUseOpacity = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_OPACITY, true); |