diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:16:58 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:25:41 +0200 |
commit | 07ea0e64f26ae4ba0a0474352df0bffb4409bd16 (patch) | |
tree | 72e4b909dc6b0660427e802cb31601edab335f89 /filter | |
parent | 2ee796ba49a13c38c1eb1e98c5e8b78d1ce18b64 (diff) |
loplugin:salbool: Automatic rewrite of sal_False/True
Change-Id: I887a9161107e58c9343d240c2b54e02f4e59567f
Diffstat (limited to 'filter')
-rw-r--r-- | filter/source/config/cache/filtercache.cxx | 12 | ||||
-rw-r--r-- | filter/source/flash/swffilter.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/actimpr.cxx | 14 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 | ||||
-rw-r--r-- | filter/source/odfflatxml/OdfFlatXml.cxx | 12 | ||||
-rw-r--r-- | filter/source/pdf/pdfexport.cxx | 12 | ||||
-rw-r--r-- | filter/source/placeware/filter.cxx | 2 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 4 | ||||
-rw-r--r-- | filter/source/xsltfilter/XSLTFilter.cxx | 14 |
9 files changed, 39 insertions, 39 deletions
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 7a6323eff56e..b9d15cf94f39 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -514,8 +514,8 @@ void FilterCache::addStatePropsToItem( EItemType eType, (sItem.equals(sDefaultFrameLoader) ) ) { - rItem[PROPNAME_FINALIZED] <<= sal_True; - rItem[PROPNAME_MANDATORY] <<= sal_True; + rItem[PROPNAME_FINALIZED] <<= true; + rItem[PROPNAME_MANDATORY] <<= true; return; } /* <-- HACK */ @@ -557,8 +557,8 @@ void FilterCache::addStatePropsToItem( EItemType eType, => mark item as FINALIZED / MANDATORY, we don't support writing to the old format */ - rItem[PROPNAME_FINALIZED] <<= sal_True; - rItem[PROPNAME_MANDATORY] <<= sal_True; + rItem[PROPNAME_FINALIZED] <<= true; + rItem[PROPNAME_MANDATORY] <<= true; } // <- SAFE @@ -2048,9 +2048,9 @@ void FilterCache::impl_interpretDataVal4Type(const OUString& sValue, // Preferred case 0: { if (sValue.toInt32() == 1) - rItem[PROPNAME_PREFERRED] = css::uno::makeAny(sal_True); + rItem[PROPNAME_PREFERRED] = css::uno::makeAny(true); else - rItem[PROPNAME_PREFERRED] = css::uno::makeAny(sal_False); + rItem[PROPNAME_PREFERRED] = css::uno::makeAny(false); } break; // MediaType diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx index ff6b13870861..f6cfaf43e116 100644 --- a/filter/source/flash/swffilter.cxx +++ b/filter/source/flash/swffilter.cxx @@ -235,7 +235,7 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const css::uno::Sequence< css::bean aFilterData = findPropertyValue<Sequence< PropertyValue > >(aDescriptor, "FilterData", aFilterData); // #i56084# check if selection shall be exported only; if yes, get the selected page and the selection itself - if(findPropertyValue<sal_Bool>(aDescriptor, "SelectionOnly", sal_False)) + if(findPropertyValue<sal_Bool>(aDescriptor, "SelectionOnly", false)) { Reference< XDesktop2 > xDesktop(Desktop::create(mxContext)); @@ -295,7 +295,7 @@ sal_Bool SAL_CALL FlashExportFilter::filter( const css::uno::Sequence< css::bean if( mxStatusIndicator.is() ) mxStatusIndicator->end(); - return sal_True; + return true; } diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index 3a8eba18408b..0fbfb402f3bd 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -788,7 +788,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha } if ( nWidth == -1 ) { - sal_Bool bTrue( sal_True ); + sal_Bool bTrue( true ); aAny.setValue( &bTrue, cppu::UnoType<sal_Bool>::get()); maXPropSet->setPropertyValue( "TextAutoGrowWidth", aAny ); @@ -812,7 +812,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha } if ( nHeight == -1 ) { - sal_Bool bTrue = sal_True; + sal_Bool bTrue = true; aAny.setValue( &bTrue, cppu::UnoType<sal_Bool>::get()); maXPropSet->setPropertyValue( "TextAutoGrowHeight", aAny ); } @@ -824,7 +824,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha uno::Reference< text::XTextCursor > aXTextCursor( xText->createTextCursor() ); { - aXTextCursor->gotoEnd( sal_False ); + aXTextCursor->gotoEnd( false ); uno::Reference< text::XTextRange > aCursorText; uno::Any aSecondQuery( aXTextCursor->queryInterface( cppu::UnoType<text::XTextRange>::get())); if ( aSecondQuery >>= aCursorText ) @@ -854,12 +854,12 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha } if ( nWidth > 0 && nHeight > 0 ) // restricted text { - sal_Bool bTrue = sal_True; + sal_Bool bTrue = true; aAny.setValue( &bTrue, cppu::UnoType<sal_Bool>::get()); maXPropSet->setPropertyValue( "TextFitToSize", aAny ); } aCursorText->setString( aStr ); - aXTextCursor->gotoEnd( sal_True ); + aXTextCursor->gotoEnd( true ); ImplSetTextBundle( aCursorPropSet ); } } @@ -888,7 +888,7 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla uno::Reference< text::XTextCursor > aXTextCursor( xText->createTextCursor() ); if ( aXTextCursor.is() ) { - aXTextCursor->gotoEnd( sal_False ); + aXTextCursor->gotoEnd( false ); uno::Reference< text::XTextRange > aCursorText; uno::Any aSecondQuery(aXTextCursor->queryInterface( cppu::UnoType<text::XTextRange>::get())); if ( aSecondQuery >>= aCursorText ) @@ -898,7 +898,7 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla if( aQuery >>= aPropSet ) { aCursorText->setString( aStr ); - aXTextCursor->gotoEnd( sal_True ); + aXTextCursor->gotoEnd( true ); ImplSetTextBundle( aPropSet ); } } diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index eb3262a4144a..c9e44c6fd293 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -7582,9 +7582,9 @@ void ApplyCellLineAttributes( const SdrObject* pLine, Reference< XTable >& xTabl if ( nFlags & LinePositionBottom ) xPropSet->setPropertyValue( sBottomBorder, Any( aBorderLine ) ); if ( nFlags & LinePositionTLBR ) - xPropSet->setPropertyValue( sDiagonalTLBR, Any( sal_True ) ); + xPropSet->setPropertyValue( sDiagonalTLBR, Any( true ) ); if ( nFlags & LinePositionBLTR ) - xPropSet->setPropertyValue( sDiagonalBLTR, Any( sal_True ) ); + xPropSet->setPropertyValue( sDiagonalBLTR, Any( true ) ); ++aIter; } } diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index 3d9409dcdd24..f8744ee191f8 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -134,7 +134,7 @@ OdfFlatXml::importer( OSL_ASSERT(inputStream.is()); if (!inputStream.is()) - return sal_False; + return false; Reference<XParser> saxParser = Parser::create(m_xContext); @@ -156,9 +156,9 @@ OdfFlatXml::importer( SAL_WARN( "filter.odfflatxml", "caught exception \"" << exc.Message << "\""); - return sal_False; + return false; } - return sal_True; + return true; } sal_Bool @@ -190,13 +190,13 @@ OdfFlatXml::exporter(const Sequence< PropertyValue >& sourceData, Reference<XActiveDataSource> dataSource(getDelegate(), UNO_QUERY); OSL_ASSERT(dataSource.is()); if (!dataSource.is()) - return sal_False; + return false; OSL_ASSERT(outputStream.is()); if (!outputStream.is()) - return sal_False; + return false; dataSource->setOutputStream(outputStream); - return sal_True; + return true; } diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 0f5ce3e281c7..b19129f80e87 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -215,7 +215,7 @@ bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, const sal_Int32 nCurrentRenderer = *aIter; ++aIter; if ( pLastPage && aIter == aEnd ) - *pLastPage <<= sal_True; + *pLastPage <<= true; rRenderable->render( nCurrentRenderer, rSelection, rRenderOptions ); @@ -231,7 +231,7 @@ bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, if ( mxStatusIndicator.is() ) mxStatusIndicator->setValue( mnProgressValue ); if ( pFirstPage ) - *pFirstPage <<= sal_False; + *pFirstPage <<= false; ++mnProgressValue; ++nCurrentPage; @@ -826,12 +826,12 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& aRenderOptions[ 0 ].Name = "RenderDevice"; aRenderOptions[ 0 ].Value <<= Reference< awt::XDevice >( pXDevice ); aRenderOptions[ 1 ].Name = "ExportNotesPages"; - aRenderOptions[ 1 ].Value <<= sal_False; + aRenderOptions[ 1 ].Value <<= false; Any& rExportNotesValue = aRenderOptions[ 1 ].Value; aRenderOptions[ 2 ].Name = "IsFirstPage"; - aRenderOptions[ 2 ].Value <<= sal_True; + aRenderOptions[ 2 ].Value <<= true; aRenderOptions[ 3 ].Name = "IsLastPage"; - aRenderOptions[ 3 ].Value <<= sal_False; + aRenderOptions[ 3 ].Value <<= false; aRenderOptions[ 4 ].Name = "IsSkipEmptyPages"; aRenderOptions[ 4 ].Value <<= mbSkipEmptyPages; aRenderOptions[ 5 ].Name = "PageRange"; @@ -910,7 +910,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& if ( bRet && bExportNotesPages ) { - rExportNotesValue <<= sal_True; + rExportNotesValue <<= true; bRet = ExportSelection( *pPDFWriter, xRenderable, aSelection, aRangeEnum, aRenderOptions, nPageCount ); } if ( mxStatusIndicator.is() ) diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx index abcf09bb0e22..5cac30c3d1f7 100644 --- a/filter/source/placeware/filter.cxx +++ b/filter/source/placeware/filter.cxx @@ -108,7 +108,7 @@ sal_Bool SAL_CALL PlaceWareExportFilter::filter( const css::uno::Sequence< css:: if ( !xOutputStream.is() ) { OSL_ASSERT ( false ); - return sal_False; + return false; } PlaceWareExporter aExporter( mxContext ); diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index e3ea5b170319..3730b5350b17 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -1128,7 +1128,7 @@ bool SVGTextWriter::nextTextPortion() } #if OSL_DEBUG_LEVEL > 0 - sInfo += "text field type: " + sFieldName + "; content: " + xTextField->getPresentation( /* show command: */ sal_False ) + "; "; + sInfo += "text field type: " + sFieldName + "; content: " + xTextField->getPresentation( /* show command: */ false ) + "; "; #endif if( sFieldName == "DateTime" || sFieldName == "Header" || sFieldName == "Footer" || sFieldName == "PageNumber" ) @@ -1529,7 +1529,7 @@ void SVGTextWriter::writeTextPortion( const Point& rPos, { Reference < XPropertySet > xPropSet( mrCurrentTextPortion, UNO_QUERY ); Reference < XTextField > xTextField( xPropSet->getPropertyValue( "TextField" ), UNO_QUERY ); - sContent = xTextField->getPresentation( /* show command: */ sal_False ); + sContent = xTextField->getPresentation( /* show command: */ false ); if( sContent.isEmpty() ) OSL_FAIL( "SVGTextWriter::writeTextPortion: content of URL TextField is empty." ); } diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx index f39f366ca894..615b4c11fd0b 100644 --- a/filter/source/xsltfilter/XSLTFilter.cxx +++ b/filter/source/xsltfilter/XSLTFilter.cxx @@ -270,7 +270,7 @@ namespace XSLT OUString>& msUserData) throw (RuntimeException, std::exception) { if (msUserData.getLength() < 5) - return sal_False; + return false; OUString udStyleSheet = rel2abs(msUserData[4]); @@ -297,7 +297,7 @@ namespace XSLT } OSL_ASSERT(xInputStream.is()); if (!xInputStream.is()) - return sal_False; + return false; // create SAX parser that will read the document file // and provide events to xHandler passed to this call @@ -397,12 +397,12 @@ namespace XSLT { // something went wrong OSL_FAIL(OUStringToOString(exc.Message, RTL_TEXTENCODING_ASCII_US).getStr()); - return sal_False; + return false; } } else { - return sal_False; + return false; } } @@ -411,7 +411,7 @@ namespace XSLT const Sequence<OUString>& msUserData) throw (RuntimeException, std::exception) { if (msUserData.getLength() < 6) - return sal_False; + return false; // get interesting values from user data OUString udStyleSheet = rel2abs(msUserData[5]); @@ -496,11 +496,11 @@ namespace XSLT // we will start receiving events after returning 'true'. // we will start the transformation as soon as we receive the startDocument // event. - return sal_True; + return true; } else { - return sal_False; + return false; } } |