diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:29:15 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:32:01 +0100 |
commit | 51b45df6bba163dec7ba91c700de695ad517e5dd (patch) | |
tree | 566633496f4048112c75edbbe250b0f01d86a8dd /xmloff/source/chart | |
parent | 87bae0e188aa3ce3c31d1aa91707c0fad6b81b65 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I8690de2cb68dcfedc9f2239ce66cea06fd94bc16
Diffstat (limited to 'xmloff/source/chart')
21 files changed, 69 insertions, 69 deletions
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index 4a22c479ab7c..e44ccef921a9 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -93,7 +93,7 @@ #define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART, c, SvtSaveOptions::ODFVER_010, false } #define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_010, false } #define MAP_SPECIAL_ODF12( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t|XML_TYPE_PROP_CHART | MID_FLAG_SPECIAL_ITEM, c, SvtSaveOptions::ODFVER_012, false } -#define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0,SvtSaveOptions::ODFVER_010, false } +#define MAP_ENTRY_END { nullptr,0,0,xmloff::token::XML_TOKEN_INVALID,0,0,SvtSaveOptions::ODFVER_010, false } // PropertyMap for Chart properties drawing- and // textproperties are added later using the chaining diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 6b2f271fcce3..67011a5ccb6a 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -171,7 +171,7 @@ const XMLPropertyHandler* XMLChartPropHdlFactory::GetPropertyHandler( sal_Int32 pHdl = new XMLEnumPropertyHdl(aLineStyleMap, cppu::UnoType<drawing::LineStyle>::get()); break; case XML_SCH_TYPE_LABEL_BORDER_OPACITY: - pHdl = new XMLOpacityPropertyHdl(NULL); + pHdl = new XMLOpacityPropertyHdl(nullptr); break; default: ; diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx index 9f8a0dea35c3..8d30f0845024 100644 --- a/xmloff/source/chart/SchXMLAxisContext.cxx +++ b/xmloff/source/chart/SchXMLAxisContext.cxx @@ -634,7 +634,7 @@ SvXMLImportContext* SchXMLAxisContext::CreateChildContext( const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; const SvXMLTokenMap& rTokenMap = theAxisChildTokenMap::get(); switch( rTokenMap.Get( p_nPrefix, rLocalName )) diff --git a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx index 32f61b1babad..7bb876410044 100644 --- a/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx +++ b/xmloff/source/chart/SchXMLCalculationSettingsContext.cxx @@ -53,7 +53,7 @@ SchXMLCalculationSettingsContext::SchXMLCalculationSettingsContext( SvXMLImport& { util::DateTime aNullDate; const OUString sValue = xAttrList->getValueByIndex( i ); - ::sax::Converter::parseDateTime(aNullDate, 0, sValue); + ::sax::Converter::parseDateTime(aNullDate, nullptr, sValue); m_aNullDate <<= aNullDate; } } diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 0637caa9285c..fa953f59dbc8 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -867,7 +867,7 @@ void SchXMLChartContext::EndElement() // set autostyles for series and data points const SvXMLStylesContext* pStylesCtxt = mrImportHelper.GetAutoStylesContext(); - const SvXMLStyleContext* pStyle = NULL; + const SvXMLStyleContext* pStyle = nullptr; OUString sCurrStyleName; if( pStylesCtxt ) @@ -993,7 +993,7 @@ SvXMLImportContext* SchXMLChartContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; const SvXMLTokenMap& rTokenMap = mrImportHelper.GetChartElemTokenMap(); uno::Reference< chart::XChartDocument > xDoc = mrImportHelper.GetChartDocument(); uno::Reference< beans::XPropertySet > xProp( xDoc, uno::UNO_QUERY ); @@ -1115,10 +1115,10 @@ void SchXMLChartContext::InitChart( uno::Reference< chart2::XChartDocument > xNewDoc( mrImportHelper.GetChartDocument(), uno::UNO_QUERY ); if( xNewDoc.is()) { - xNewDoc->setFirstDiagram( 0 ); + xNewDoc->setFirstDiagram( nullptr ); uno::Reference< chart2::XTitled > xTitled( xNewDoc, uno::UNO_QUERY ); if( xTitled.is()) - xTitled->setTitleObject( 0 ); + xTitled->setTitleObject( nullptr ); } // Set the chart type via setting the diagram. @@ -1211,7 +1211,7 @@ SvXMLImportContext* SchXMLTitleContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; if( (nPrefix == XML_NAMESPACE_TEXT || nPrefix == XML_NAMESPACE_LO_EXT) && diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index d7e02b83b873..74a2ee3df26d 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -1193,7 +1193,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >& SvXMLElementExport aSet( mrExport, XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, true, true ); { OUStringBuffer sBuffer; - ::sax::Converter::convertDateTime(sBuffer, aNullDate, 0); + ::sax::Converter::convertDateTime(sBuffer, aNullDate, nullptr); mrExport.AddAttribute( XML_NAMESPACE_TABLE,XML_DATE_VALUE,sBuffer.makeStringAndClear()); SvXMLElementExport aNull( mrExport, XML_NAMESPACE_TABLE, XML_NULL_DATE, true, true ); } @@ -2292,7 +2292,7 @@ void SchXMLExportHelper_Impl::exportAxis( bool bExportContent ) { std::vector< XMLPropertyState > aPropertyStates; - SvXMLElementExport* pAxis = NULL; + SvXMLElementExport* pAxis = nullptr; // get property states for autostyles if( rAxisProps.is() && mxExpPropMapper.is() ) @@ -2337,9 +2337,9 @@ void SchXMLExportHelper_Impl::exportAxis( Reference< chart::XAxis > xAxis( rAxisProps, uno::UNO_QUERY ); if( xAxis.is() ) { - xTitleProps = bHasTitle ? xAxis->getAxisTitle() : 0; - xMajorGridProps = bHasMajorGrid ? xAxis->getMajorGrid() : 0; - xMinorGridProps = bHasMinorGrid ? xAxis->getMinorGrid() : 0; + xTitleProps = bHasTitle ? xAxis->getAxisTitle() : nullptr; + xMajorGridProps = bHasMajorGrid ? xAxis->getMajorGrid() : nullptr; + xMinorGridProps = bHasMinorGrid ? xAxis->getMinorGrid() : nullptr; } // axis-title @@ -2360,7 +2360,7 @@ void SchXMLExportHelper_Impl::exportAxis( { //close axis element delete pAxis; - pAxis = NULL; + pAxis = nullptr; } } @@ -2431,7 +2431,7 @@ void SchXMLExportHelper_Impl::exportAxes( Reference< ::com::sun::star::chart2::XAxis > xNewAxis = lcl_getAxis( xCooSys, XML_X ); if( xNewAxis.is() ) { - Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(0) : 0, uno::UNO_QUERY ); + Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(0) : nullptr, uno::UNO_QUERY ); if( mbHasCategoryLabels && bExportContent ) { Reference< chart2::data::XLabeledDataSequence > xCategories( lcl_getCategories( xNewDiagram ) ); @@ -2456,7 +2456,7 @@ void SchXMLExportHelper_Impl::exportAxes( xNewAxis = lcl_getAxis( xCooSys, XML_X, false ); if( xNewAxis.is() ) { - Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getSecondaryAxis(0) : 0, uno::UNO_QUERY ); + Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getSecondaryAxis(0) : nullptr, uno::UNO_QUERY ); exportAxis( XML_X, XML_SECONDARY_X, xAxisProps, xNewAxis, aCategoriesRange, bHasSecondaryXAxisTitle, false, false, bExportContent ); } @@ -2465,7 +2465,7 @@ void SchXMLExportHelper_Impl::exportAxes( xNewAxis = lcl_getAxis( xCooSys, XML_Y ); if( xNewAxis.is() ) { - Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(1) : 0, uno::UNO_QUERY ); + Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(1) : nullptr, uno::UNO_QUERY ); exportAxis( XML_Y, XML_PRIMARY_Y, xAxisProps, xNewAxis, aCategoriesRange, bHasYAxisTitle, bHasYAxisMajorGrid, bHasYAxisMinorGrid, bExportContent ); } @@ -2474,7 +2474,7 @@ void SchXMLExportHelper_Impl::exportAxes( xNewAxis = lcl_getAxis( xCooSys, XML_Y, false ); if( xNewAxis.is() ) { - Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getSecondaryAxis(1) : 0, uno::UNO_QUERY ); + Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getSecondaryAxis(1) : nullptr, uno::UNO_QUERY ); exportAxis( XML_Y, XML_SECONDARY_Y, xAxisProps, xNewAxis, aCategoriesRange, bHasSecondaryYAxisTitle, false, false, bExportContent ); } @@ -2483,7 +2483,7 @@ void SchXMLExportHelper_Impl::exportAxes( xNewAxis = lcl_getAxis( xCooSys, XML_Z ); if( xNewAxis.is() ) { - Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(2) : 0, uno::UNO_QUERY ); + Reference< beans::XPropertySet > xAxisProps( xAxisSupp.is() ? xAxisSupp->getAxis(2) : nullptr, uno::UNO_QUERY ); exportAxis( XML_Z, XML_PRIMARY_Z, xAxisProps, xNewAxis, aCategoriesRange, bHasZAxisTitle, bHasZAxisMajorGrid, bHasZAxisMinorGrid, bExportContent ); } } @@ -2602,7 +2602,7 @@ void SchXMLExportHelper_Impl::exportSeries( Reference< chart2::data::XDataSource > xSource( aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ); if( xSource.is()) { - SvXMLElementExport* pSeries = NULL; + SvXMLElementExport* pSeries = nullptr; Sequence< Reference< chart2::data::XLabeledDataSequence > > aSeqCnt( xSource->getDataSequences()); sal_Int32 nMainSequenceIndex = -1; @@ -2771,7 +2771,7 @@ void SchXMLExportHelper_Impl::exportSeries( { xYValuesForBubbleChart = xSequence->getValues(); if( !lcl_exportDomainForThisSequence( xYValuesForBubbleChart, aFirstYDomainRange, mrExport ) ) - xYValuesForBubbleChart = 0; + xYValuesForBubbleChart = nullptr; } } if( bIsScatterChart || bIsBubbleChart ) @@ -3160,7 +3160,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_PRIMARY_Y ); SvXMLElementExport aOpenSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true ); // export empty data points - exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent ); + exportDataPoints( nullptr, nSeriesLength, xDiagram, bExportContent ); } // low @@ -3177,7 +3177,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_PRIMARY_Y ); SvXMLElementExport aLowSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true ); // export empty data points - exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent ); + exportDataPoints( nullptr, nSeriesLength, xDiagram, bExportContent ); } // high @@ -3194,7 +3194,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_PRIMARY_Y ); SvXMLElementExport aHighSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true ); // export empty data points - exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent ); + exportDataPoints( nullptr, nSeriesLength, xDiagram, bExportContent ); } // close @@ -3211,7 +3211,7 @@ void SchXMLExportHelper_Impl::exportCandleStickSeries( mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_ATTACHED_AXIS, XML_PRIMARY_Y ); SvXMLElementExport aCloseSeries( mrExport, XML_NAMESPACE_CHART, XML_SERIES, true, true ); // export empty data points - exportDataPoints( 0, nSeriesLength, xDiagram, bExportContent ); + exportDataPoints( nullptr, nSeriesLength, xDiagram, bExportContent ); } } else // autostyles diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index d144a650f899..1190674642be 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -84,21 +84,21 @@ private: // attribute maps SchXMLImportHelper::SchXMLImportHelper() : - mpAutoStyles( 0 ), + mpAutoStyles( nullptr ), - mpChartDocElemTokenMap( 0 ), - mpTableElemTokenMap( 0 ), - mpChartElemTokenMap( 0 ), - mpPlotAreaElemTokenMap( 0 ), - mpSeriesElemTokenMap( 0 ), + mpChartDocElemTokenMap( nullptr ), + mpTableElemTokenMap( nullptr ), + mpChartElemTokenMap( nullptr ), + mpPlotAreaElemTokenMap( nullptr ), + mpSeriesElemTokenMap( nullptr ), - mpChartAttrTokenMap( 0 ), - mpPlotAreaAttrTokenMap( 0 ), - mpAutoStyleAttrTokenMap( 0 ), - mpCellAttrTokenMap( 0 ), - mpSeriesAttrTokenMap( 0 ), - mpPropMappingAttrTokenMap( 0 ), - mpRegEquationAttrTokenMap( 0 ) + mpChartAttrTokenMap( nullptr ), + mpPlotAreaAttrTokenMap( nullptr ), + mpAutoStyleAttrTokenMap( nullptr ), + mpCellAttrTokenMap( nullptr ), + mpSeriesAttrTokenMap( nullptr ), + mpPropMappingAttrTokenMap( nullptr ), + mpRegEquationAttrTokenMap( nullptr ) { } @@ -125,7 +125,7 @@ SvXMLImportContext* SchXMLImportHelper::CreateChartContext( const Reference< frame::XModel >& rChartModel, const Reference< xml::sax::XAttributeList >& ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; Reference< chart::XChartDocument > xDoc( rChartModel, uno::UNO_QUERY ); if( xDoc.is()) @@ -533,7 +533,7 @@ SchXMLImport::~SchXMLImport() throw () SvXMLImportContext *SchXMLImport::CreateContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; // accept <office:document> if( XML_NAMESPACE_OFFICE == nPrefix && diff --git a/xmloff/source/chart/SchXMLParagraphContext.hxx b/xmloff/source/chart/SchXMLParagraphContext.hxx index 1fa28cee100c..b49272a362af 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.hxx +++ b/xmloff/source/chart/SchXMLParagraphContext.hxx @@ -38,7 +38,7 @@ public: SchXMLParagraphContext( SvXMLImport& rImport, const OUString& rLocalName, OUString& rText, - OUString * pOutId = 0 ); + OUString * pOutId = nullptr ); virtual ~SchXMLParagraphContext(); virtual void StartElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ) override; virtual void EndElement() override; diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 9f5b9c0d79b7..a21f7a5f8c06 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -422,7 +422,7 @@ SvXMLImportContext* SchXMLPlotAreaContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; const SvXMLTokenMap& rTokenMap = mrImportHelper.GetPlotAreaElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName )) @@ -1203,7 +1203,7 @@ SvXMLImportContext* SchXMLStatisticsObjectContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; pContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList ); return pContext; } diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx index 8b723e371a9e..d8a765fe9015 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx @@ -89,7 +89,7 @@ SvXMLImportContext* SchXMLRegressionCurveObjectContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; if( nPrefix == XML_NAMESPACE_CHART && IsXMLToken( rLocalName, XML_EQUATION ) ) { diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 871797e34052..4f23d1508f83 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -270,12 +270,12 @@ SchXMLSeries2Context::SchXMLSeries2Context( mrAxes( rAxes ), mrStyleList( rStyleList ), mrRegressionStyleList( rRegressionStyleList ), - m_xSeries(0), + m_xSeries(nullptr), mnSeriesIndex( nSeriesIndex ), mnDataPointIndex( 0 ), m_bStockHasVolume( bStockHasVolume ), m_rGlobalSeriesImportInfo(rGlobalSeriesImportInfo), - mpAttachedAxis( NULL ), + mpAttachedAxis( nullptr ), mnAttachedAxis( 0 ), maGlobalChartTypeName( aGlobalChartTypeName ), maSeriesChartTypeName( aGlobalChartTypeName ), @@ -639,7 +639,7 @@ SvXMLImportContext* SchXMLSeries2Context::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; const SvXMLTokenMap& rTokenMap = mrImportHelper.GetSeriesElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName )) @@ -879,7 +879,7 @@ void SchXMLSeries2Context::setStylesToRegressionCurves( try { OUString aServiceName; - XMLPropStyleContext* pPropStyleContext = NULL; + XMLPropStyleContext* pPropStyleContext = nullptr; if (!rCurrentStyleName.isEmpty()) { @@ -918,7 +918,7 @@ void SchXMLSeries2Context::setStylesToRegressionCurves( if( xRegCurve.is()) { Reference< beans::XPropertySet > xCurveProperties( xRegCurve, uno::UNO_QUERY ); - if( pPropStyleContext != NULL) + if( pPropStyleContext != nullptr) pPropStyleContext->FillPropertySet( xCurveProperties ); xRegCurve->setEquationProperties( iStyle->m_xEquationProperties ); diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx index b2024ff90ed2..e2edd3f725a3 100644 --- a/xmloff/source/chart/SchXMLSeriesHelper.cxx +++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx @@ -96,7 +96,7 @@ uno::Reference< chart2::XChartType > lcl_getChartTypeOfSeries( , const Reference< chart2::XDataSeries >& xSeries ) { if(!xDiagram.is()) - return 0; + return nullptr; //iterate through the model to find the given xSeries //the found parent indicates the charttype @@ -104,7 +104,7 @@ uno::Reference< chart2::XChartType > lcl_getChartTypeOfSeries( //iterate through all coordinate systems uno::Reference< chart2::XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY ); if( !xCooSysContainer.is()) - return 0; + return nullptr; uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > aCooSysList( xCooSysContainer->getCoordinateSystems() ); for( sal_Int32 nCS = 0; nCS < aCooSysList.getLength(); ++nCS ) @@ -137,7 +137,7 @@ uno::Reference< chart2::XChartType > lcl_getChartTypeOfSeries( } } } - return 0; + return nullptr; } } diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index dea1a00f6a06..a895c8e13da6 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -237,7 +237,7 @@ SvXMLImportContext *SchXMLTableContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; const SvXMLTokenMap& rTokenMap = mrImportHelper.GetTableElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName )) @@ -426,7 +426,7 @@ SvXMLImportContext* SchXMLTableColumnsContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; if( nPrefix == XML_NAMESPACE_TABLE && IsXMLToken( rLocalName, XML_TABLE_COLUMN ) ) @@ -520,7 +520,7 @@ SvXMLImportContext* SchXMLTableRowsContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; if( nPrefix == XML_NAMESPACE_TABLE && IsXMLToken( rLocalName, XML_TABLE_ROW ) ) @@ -563,7 +563,7 @@ SvXMLImportContext* SchXMLTableRowContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; // <table:table-cell> element if( nPrefix == XML_NAMESPACE_TABLE && @@ -676,7 +676,7 @@ SvXMLImportContext* SchXMLTableCellContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; // <text:list> element if( nPrefix == XML_NAMESPACE_TEXT && IsXMLToken( rLocalName, XML_LIST ) && mbReadText ) diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx index 632df793811a..786200b9e81d 100644 --- a/xmloff/source/chart/SchXMLTextListContext.cxx +++ b/xmloff/source/chart/SchXMLTextListContext.cxx @@ -71,7 +71,7 @@ SvXMLImportContext* SchXMLListItemContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; if( (nPrefix == XML_NAMESPACE_TEXT || nPrefix == XML_NAMESPACE_LO_EXT) && IsXMLToken( rLocalName, XML_P ) ) pContext = new SchXMLParagraphContext( GetImport(), rLocalName, m_rText ); @@ -110,7 +110,7 @@ SvXMLImportContext* SchXMLTextListContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; if( nPrefix == XML_NAMESPACE_TEXT && IsXMLToken( rLocalName, XML_LIST_ITEM ) ) { m_aTextVector.push_back( OUString() ); diff --git a/xmloff/source/chart/SchXMLTools.hxx b/xmloff/source/chart/SchXMLTools.hxx index ed21ea23932c..004a2ab16bee 100644 --- a/xmloff/source/chart/SchXMLTools.hxx +++ b/xmloff/source/chart/SchXMLTools.hxx @@ -97,7 +97,7 @@ namespace SchXMLTools const OUString & rRangeAddress, sal_Int32 nCooSysIndex, sal_Int32 nDimensionIndex, - tSchXMLLSequencesPerIndex * pLSequencesPerIndex = 0 ); + tSchXMLLSequencesPerIndex * pLSequencesPerIndex = nullptr ); ::com::sun::star::uno::Any getPropertyFromContext( const OUString& rPropertyName, const XMLPropStyleContext * pPropStyleContext, const SvXMLStylesContext* pStylesCtxt ); diff --git a/xmloff/source/chart/XMLChartPropertyContext.cxx b/xmloff/source/chart/XMLChartPropertyContext.cxx index ce1b2ea5a22c..fb2c3c01f69a 100644 --- a/xmloff/source/chart/XMLChartPropertyContext.cxx +++ b/xmloff/source/chart/XMLChartPropertyContext.cxx @@ -49,7 +49,7 @@ SvXMLImportContext* XMLChartPropertyContext::CreateChildContext( ::std::vector< XMLPropertyState > &rProperties, const XMLPropertyState& rProp ) { - SvXMLImportContext *pContext = 0; + SvXMLImportContext *pContext = nullptr; switch( mxMapper->getPropertySetMapper()->GetEntryContextId( rProp.mnIndex ) ) { diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx index b308c6597280..14517754e86e 100644 --- a/xmloff/source/chart/XMLChartStyleContext.cxx +++ b/xmloff/source/chart/XMLChartStyleContext.cxx @@ -115,7 +115,7 @@ SvXMLImportContext *XMLChartStyleContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { - SvXMLImportContext* pContext = NULL; + SvXMLImportContext* pContext = nullptr; if( XML_NAMESPACE_STYLE == nPrefix || XML_NAMESPACE_LO_EXT == nPrefix ) { diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx index bf7a9c3e043a..49eb4f5da6c6 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx @@ -52,7 +52,7 @@ SvXMLImportContext* XMLLabelSeparatorContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & /*xAttrList*/ ) { - SvXMLImportContext* pContext = NULL; + SvXMLImportContext* pContext = nullptr; if( xmloff::token::IsXMLToken( rLocalName, xmloff::token::XML_P ) ) { pContext = new SchXMLParagraphContext( GetImport(), diff --git a/xmloff/source/chart/XMLSymbolImageContext.cxx b/xmloff/source/chart/XMLSymbolImageContext.cxx index b448b922ae4a..92efdfc22336 100644 --- a/xmloff/source/chart/XMLSymbolImageContext.cxx +++ b/xmloff/source/chart/XMLSymbolImageContext.cxx @@ -94,7 +94,7 @@ SvXMLImportContext* XMLSymbolImageContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) { - SvXMLImportContext* pContext = NULL; + SvXMLImportContext* pContext = nullptr; if( xmloff::token::IsXMLToken( rLocalName, xmloff::token::XML_BINARY_DATA ) ) { @@ -126,7 +126,7 @@ void XMLSymbolImageContext::EndElement() else if( mxBase64Stream.is() ) { sResolvedURL = GetImport().ResolveGraphicObjectURLFromBase64( mxBase64Stream ); - mxBase64Stream = 0; + mxBase64Stream = nullptr; } if( !sResolvedURL.isEmpty()) diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx index e2ec978443a1..0090195b228d 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -93,7 +93,7 @@ SvXMLImportContext* SchXMLDocContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; const SvXMLTokenMap& rTokenMap = mrImportHelper.GetDocElemTokenMap(); SvXMLImportFlags nFlags = GetImport().getImportFlags(); @@ -182,7 +182,7 @@ SvXMLImportContext* SchXMLBodyContext::CreateChildContext( const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext = 0; + SvXMLImportContext* pContext = nullptr; // <chart:chart> element if( nPrefix == XML_NAMESPACE_CHART && diff --git a/xmloff/source/chart/transporttypes.hxx b/xmloff/source/chart/transporttypes.hxx index cea1ece5cdff..c32a5428e213 100644 --- a/xmloff/source/chart/transporttypes.hxx +++ b/xmloff/source/chart/transporttypes.hxx @@ -201,7 +201,7 @@ struct DataRowPointStyle , sal_Int32 nAttachedAxis = 0 ) : meType( eType ), m_xSeries( xSeries ), - m_xOldAPISeries( 0 ), + m_xOldAPISeries( nullptr ), m_nPointIndex( nPointIndex ), m_nPointRepeat( nPointRepeat ), msStyleName( sStyleName ), |