diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:15:21 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-20 17:25:36 +0200 |
commit | 08bb436ff9661fb4c2df156ee4c8b4be80b9369c (patch) | |
tree | d2ccc629bcb9ad0823b840b35c59d4240a565772 /chart2/source/model | |
parent | a30148d3fca38da4b97730eddb93af5e3a59f0dc (diff) |
loplugin:salbool: Automatic rewrite of sal_False/True
Change-Id: I1230a1785c61b8ef5dab97176e7c06600ac95a5b
Diffstat (limited to 'chart2/source/model')
11 files changed, 40 insertions, 40 deletions
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index db3a0d970b0c..8cac9e21c29d 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -710,8 +710,8 @@ sal_Int32 XMLFilter::impl_ExportStream( if(xStreamProp.is()) try { xStreamProp->setPropertyValue( "MediaType", uno::makeAny( OUString("text/xml") ) ); - xStreamProp->setPropertyValue( "Compressed", uno::makeAny( sal_True ) );//@todo? - xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", uno::makeAny( sal_True ) ); + xStreamProp->setPropertyValue( "Compressed", uno::makeAny( true ) );//@todo? + xStreamProp->setPropertyValue( "UseCommonStoragePasswordEncryption", uno::makeAny( true ) ); } catch (const uno::Exception& rEx) { diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 6e2c06ed288d..f57da883577b 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -362,11 +362,11 @@ sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) - return sal_False; //behave passive if already disposed or closed or throw exception @todo? + return false; //behave passive if already disposed or closed or throw exception @todo? //mutex is acquired if(!m_aResource.isEmpty())//we have a resource already //@todo? or is setting a new resource allowed? - return sal_False; + return false; m_aResource = rURL; m_aMediaDescriptor = rMediaDescriptor; @@ -374,7 +374,7 @@ sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL //@todo ? evaluate m_aMediaDescriptor; //@todo ? ... ??? --> nothing, this method is only for setting information - return sal_True; + return true; } OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException, std::exception) @@ -481,7 +481,7 @@ sal_Bool SAL_CALL ChartModel::hasControllersLocked() throw(uno::RuntimeException { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) - return sal_False; //behave passive if already disposed or closed or throw exception @todo? + return false; //behave passive if already disposed or closed or throw exception @todo? return ( m_nControllerLockCount != 0 ) ; } @@ -752,7 +752,7 @@ void SAL_CALL ChartModel::setFirstDiagram( const uno::Reference< chart2::XDiagra //don't keep the mutex locked while calling out ModifyListenerHelper::removeListener( xOldDiagram, xListener ); ModifyListenerHelper::addListener( xDiagram, xListener ); - setModified( sal_True ); + setModified( true ); } Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData() @@ -766,7 +766,7 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData() //init internal dataprovider { uno::Sequence< uno::Any > aArgs(1); - beans::NamedValue aParam( "CreateDefaultData" ,uno::makeAny(sal_True) ); + beans::NamedValue aParam( "CreateDefaultData" ,uno::makeAny(true) ); aArgs[0] <<= aParam; xIni->initialize(aArgs); } @@ -811,7 +811,7 @@ void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingDat m_xInternalDataProvider = ChartModelHelper::createInternalDataProvider( Reference<XChartDocument>(), true ); m_xDataProvider.set( m_xInternalDataProvider ); } - setModified( sal_True ); + setModified( true ); } sal_Bool SAL_CALL ChartModel::hasInternalDataProvider() @@ -852,7 +852,7 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data //the numberformatter is kept independent of the data provider! } - setModified( sal_True ); + setModified( true ); } void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< util::XNumberFormatsSupplier >& xNewSupplier ) @@ -882,7 +882,7 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti m_xNumberFormatsSupplier.set( xNewSupplier ); m_xOwnNumberFormatsSupplier.clear(); } - setModified( sal_True ); + setModified( true ); } void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& aArguments ) @@ -921,7 +921,7 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& } unlockControllers(); } - setModified( sal_True ); + setModified( true ); } Sequence< OUString > SAL_CALL ChartModel::getUsedRangeRepresentations() @@ -964,7 +964,7 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XCh MutexGuard aGuard( m_aModelMutex ); m_xChartTypeManager = xNewManager; } - setModified( sal_True ); + setModified( true ); } uno::Reference< chart2::XChartTypeManager > SAL_CALL ChartModel::getChartTypeManager() @@ -1011,7 +1011,7 @@ void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle > m_xTitle = xTitle; ModifyListenerHelper::addListener( m_xTitle, this ); } - setModified( sal_True ); + setModified( true ); } // ____ XInterface (for old API wrapper) ____ @@ -1066,7 +1066,7 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz m_aVisualAreaSize = aSize; if( bChanged ) - setModified( sal_True ); + setModified( true ); } else { @@ -1422,7 +1422,7 @@ void ChartModel::getNextTimePoint() { if(!bSet) xTimeBased->setRange(mnStart, mnEnd); - xTimeBased->switchToNext(sal_True); + xTimeBased->switchToNext(true); } } bSet = true; diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index e1e00477eb1c..19e3e7636c53 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -361,7 +361,7 @@ void ChartModel::impl_store( OSL_FAIL( "No filter" ); } - setModified( sal_False ); + setModified( false ); //#i66865# //for data change notification during chart is not loaded: @@ -386,7 +386,7 @@ void ChartModel::impl_store( void ChartModel::insertDefaultChart() { lockControllers(); - createInternalDataProvider( sal_False ); + createInternalDataProvider( false ); try { // create default chart @@ -437,7 +437,7 @@ void ChartModel::insertDefaultChart() Reference< beans::XPropertySet > xDiagramProperties( xDiagram, uno::UNO_QUERY ); if( xDiagramProperties.is() ) { - xDiagramProperties->setPropertyValue( "RightAngledAxes", uno::makeAny( sal_True )); + xDiagramProperties->setPropertyValue( "RightAngledAxes", uno::makeAny( true )); xDiagramProperties->setPropertyValue( "D3DScenePerspective", uno::makeAny( drawing::ProjectionMode_PARALLEL )); ThreeDHelper::setScheme( xDiagram, ThreeDLookScheme_Realistic ); } @@ -475,7 +475,7 @@ void ChartModel::insertDefaultChart() { ASSERT_EXCEPTION( ex ); } - setModified( sal_False ); + setModified( false ); unlockControllers(); } @@ -588,7 +588,7 @@ void ChartModel::impl_load( if( xStorage.is() ) impl_loadGraphics( xStorage ); - setModified( sal_False ); + setModified( false ); // switchToStorage without notifying listeners (which shouldn't exist at // this time, anyway) @@ -732,7 +732,7 @@ void SAL_CALL ChartModel::modified( const lang::EventObject& ) throw (uno::RuntimeException, std::exception) { if( m_nInLoad == 0 ) - setModified( sal_True ); + setModified( true ); } // lang::XEventListener (base of util::XModifyListener) diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx index 20066cd67a51..2dd85a0e78b1 100644 --- a/chart2/source/model/main/DataPointProperties.cxx +++ b/chart2/source/model/main/DataPointProperties.cxx @@ -530,10 +530,10 @@ void DataPointProperties::AddDefaultsToMap( PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_LABEL, chart2::DataPointLabel( - sal_False, // ShowNumber - sal_False, // ShowNumberInPercent - sal_False, // ShowCategoryName - sal_False // ShowLegendSymbol + false, // ShowNumber + false, // ShowNumberInPercent + false, // ShowCategoryName + false // ShowLegendSymbol )); PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_TEXT_WORD_WRAP, false ); diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 910430ad8cff..eef20b1111c8 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -282,7 +282,7 @@ sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible( Reference< data::XDataSource > xSrc( aSeries[i], uno::UNO_QUERY_THROW ); Sequence< Reference< data::XLabeledDataSequence > > aSeq( xSrc->getDataSequences()); if( aSeq.getLength() != 3 ) - return sal_False; + return false; } catch( const uno::Exception & ex ) { @@ -290,7 +290,7 @@ sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible( } } - return sal_True; + return true; } } // namespace chart diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 2c0a7e8ca4c1..313343e761e6 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -181,7 +181,7 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource sal_Bool SAL_CALL ChartTypeTemplate::supportsCategories() throw (css::uno::RuntimeException, ::std::exception) { - return sal_True; + return true; } void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >& xDiagram ) diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index d8ea1c46ce85..a7c0d34bdec9 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -205,7 +205,7 @@ sal_Bool SAL_CALL DataInterpreter::isDataCompatible( Reference< data::XDataSource > xSrc( aSeries[i], uno::UNO_QUERY_THROW ); Sequence< Reference< data::XLabeledDataSequence > > aSeq( xSrc->getDataSequences()); if( aSeq.getLength() != 1 ) - return sal_False; + return false; } catch( const uno::Exception & ex ) { @@ -213,7 +213,7 @@ sal_Bool SAL_CALL DataInterpreter::isDataCompatible( } } - return sal_True; + return true; } namespace diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index b4a59540a19e..0b06f66c1b1f 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -95,7 +95,7 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( { //filled net chart?: if( m_bHasFilledArea ) - return sal_True; + return true; // check symbol-style // for a template with symbols it is ok, if there is at least one series diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index aefdf202a3ec..aecac2e92eec 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -228,7 +228,7 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle( sal_Bool SAL_CALL ScatterChartTypeTemplate::supportsCategories() throw (uno::RuntimeException, std::exception) { - return sal_False; + return false; } sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index 8f4e5587f462..e806ab1ed334 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -280,7 +280,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( // 1. correct number of sub-types if( aInterpretedData.Series.getLength() < (bHasVolume ? 2 : 1 )) - return sal_False; + return false; // 2. a. volume -- use default check if( bHasVolume ) @@ -289,7 +289,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( InterpretedData( Sequence< Sequence< Reference< XDataSeries > > >( aInterpretedData.Series.getConstArray(), 1 ), aInterpretedData.Categories ))) - return sal_False; + return false; } // 2. b. candlestick @@ -297,7 +297,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( OSL_ASSERT( aInterpretedData.Series.getLength() > (bHasVolume ? 1 : 0)); Sequence< Reference< XDataSeries > > aSeries( aInterpretedData.Series[(bHasVolume ? 1 : 0)] ); if(!aSeries.getLength()) - return sal_False; + return false; for( sal_Int32 i=0; i<aSeries.getLength(); ++i ) { try @@ -305,7 +305,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( Reference< data::XDataSource > xSrc( aSeries[i], uno::UNO_QUERY_THROW ); Sequence< Reference< data::XLabeledDataSequence > > aSeq( xSrc->getDataSequences()); if( aSeq.getLength() != nNumberOfNecessarySequences ) - return sal_False; + return false; } catch( const uno::Exception & ex ) { @@ -317,7 +317,7 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( // 2. c. additional series // ignore - return sal_True; + return true; } InterpretedData SAL_CALL StockDataInterpreter::reinterpretDataSeries( diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index e291eafefd16..4eaab59a3039 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -244,7 +244,7 @@ sal_Bool SAL_CALL XYDataInterpreter::isDataCompatible( Reference< data::XDataSource > xSrc( aSeries[i], uno::UNO_QUERY_THROW ); Sequence< Reference< data::XLabeledDataSequence > > aSeq( xSrc->getDataSequences()); if( aSeq.getLength() != 2 ) - return sal_False; + return false; } catch( const uno::Exception & ex ) { @@ -252,7 +252,7 @@ sal_Bool SAL_CALL XYDataInterpreter::isDataCompatible( } } - return sal_True; + return true; } } // namespace chart |