diff options
Diffstat (limited to 'chart2/source/tools')
21 files changed, 62 insertions, 62 deletions
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index ae9c58ee5fab..140b523f9ade 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -81,7 +81,7 @@ void AxisHelper::removeExplicitScaling( ScaleData& rScaleData ) { uno::Any aEmpty; rScaleData.Minimum = rScaleData.Maximum = rScaleData.Origin = aEmpty; - rScaleData.Scaling = 0; + rScaleData.Scaling = nullptr; ScaleData aDefaultScale( createDefaultScale() ); rScaleData.IncrementData = aDefaultScale.IncrementData; rScaleData.TimeIncrement = aDefaultScale.TimeIncrement; @@ -155,7 +155,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis( { bool bFormatSet = false; //check whether we have a percent scale -> use percent format - ChartModel* pModel = NULL; + ChartModel* pModel = nullptr; if( xNumberFormatsSupplier.is() ) { pModel = dynamic_cast<ChartModel*>( xChartDoc.get() ); @@ -344,9 +344,9 @@ Reference< XAxis > AxisHelper::createAxis( , ReferenceSizeProvider * pRefSizeProvider ) { if( !xContext.is() || !xCooSys.is() ) - return NULL; + return nullptr; if( nDimensionIndex >= xCooSys->getDimension() ) - return NULL; + return nullptr; Reference< XAxis > xAxis( xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.chart2.Axis", xContext ), uno::UNO_QUERY ); @@ -411,7 +411,7 @@ Reference< XAxis > AxisHelper::createAxis( sal_Int32 nDimensionIndex, bool bMain { OSL_ENSURE( xContext.is(), "need a context to create an axis" ); if( !xContext.is() ) - return NULL; + return nullptr; sal_Int32 nAxisIndex = bMainAxis ? MAIN_AXIS_INDEX : SECONDARY_AXIS_INDEX; sal_Int32 nCooSysIndex = 0; @@ -589,11 +589,11 @@ Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemByIndex( { Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY ); if(!xCooSysContainer.is()) - return NULL; + return nullptr; Sequence< Reference< XCoordinateSystem > > aCooSysList = xCooSysContainer->getCoordinateSystems(); if(0<=nIndex && nIndex<aCooSysList.getLength()) return aCooSysList[nIndex]; - return NULL; + return nullptr; } Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, bool bMainAxis @@ -668,7 +668,7 @@ Reference< XAxis > AxisHelper::getParallelAxis( const Reference< XAxis >& xAxis catch( const uno::RuntimeException& ) { } - return 0; + return nullptr; } bool AxisHelper::isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index fc63b1111750..5ef5adcfb0d1 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -87,7 +87,7 @@ uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference< uno::Reference< XChartDocument > xChartDoc( xModel, uno::UNO_QUERY ); if( xChartDoc.is()) return ChartModelHelper::findDiagram( xChartDoc ); - return NULL; + return nullptr; } uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference< chart2::XChartDocument >& xChartDoc ) @@ -101,7 +101,7 @@ uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference< { ASSERT_EXCEPTION( ex ); } - return NULL; + return nullptr; } uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem( ChartModel& rModel ) diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index f008eeefce55..a65bb0d3d8eb 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -44,7 +44,7 @@ bool ChartTypeHelper::isSupportingAxisSideBySide( { bool bFound=false; bool bAmbiguous=false; - StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 ); + StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, nullptr ); if( eStackMode == StackMode_NONE && !bAmbiguous ) { OUString aChartTypeName = xChartType->getChartType(); @@ -222,7 +222,7 @@ bool ChartTypeHelper::isSupportingBarConnectors( bool bFound=false; bool bAmbiguous=false; - StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 ); + StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, nullptr ); if( eStackMode != StackMode_Y_STACKED || bAmbiguous ) return false; @@ -573,7 +573,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments( bool bFound=false; bool bAmbiguous=false; - StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 ); + StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, nullptr ); bool bStacked = bFound && (StackMode_Y_STACKED == eStackMode); OUString aChartTypeName = xChartType->getChartType(); diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index c4817bf1ae46..c38e6d21c5f3 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -650,9 +650,9 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries( , const uno::Reference< XDataSeries >& xGivenDataSeries ) { if( !xGivenDataSeries.is() ) - return 0; + return nullptr; if(!xDiagram.is()) - return 0; + return nullptr; //iterate through the model to find the given xSeries //the found parent indicates the charttype @@ -660,7 +660,7 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries( //iterate through all coordinate systems uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY ); if( !xCooSysContainer.is()) - return 0; + return nullptr; uno::Sequence< uno::Reference< XCoordinateSystem > > aCooSysList( xCooSysContainer->getCoordinateSystems() ); for( sal_Int32 nCS = 0; nCS < aCooSysList.getLength(); ++nCS ) @@ -691,7 +691,7 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries( } } } - return 0; + return nullptr; } ::std::vector< Reference< XDataSeries > > @@ -1206,7 +1206,7 @@ sal_Int32 DiagramHelper::getDateTimeInputNumberFormat( const Reference< util::XN // Obtain best matching date, time or datetime format. nRet = pNumFormatter->GuessDateTimeFormat( nType, fNumber, LANGUAGE_SYSTEM); // Obtain the corresponding edit format. - nRet = pNumFormatter->GetEditFormat( fNumber, nRet, nType, LANGUAGE_SYSTEM, NULL); + nRet = pNumFormatter->GetEditFormat( fNumber, nRet, nType, LANGUAGE_SYSTEM, nullptr); } return nRet; } diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index c7c588b699c9..b661046d9560 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -137,7 +137,7 @@ Reference< chart2::data::XDataSequence > ExplicitCategoriesProvider::getOriginal { if( m_xOriginalCategories.is() ) return m_xOriginalCategories->getValues(); - return 0; + return nullptr; } bool ExplicitCategoriesProvider::hasComplexCategories() const @@ -548,7 +548,7 @@ const std::vector<ComplexCategory>* ExplicitCategoriesProvider::getCategoriesByL sal_Int32 nMaxIndex = m_aComplexCats.size()-1; if (nLevel >= 0 && nLevel <= nMaxIndex) return &m_aComplexCats[nMaxIndex-nLevel]; - return NULL; + return nullptr; } OUString ExplicitCategoriesProvider::getCategoryByIndex( diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx index 239a9c4bb9c0..7658d817a671 100644 --- a/chart2/source/tools/ImplOPropertySet.cxx +++ b/chart2/source/tools/ImplOPropertySet.cxx @@ -162,7 +162,7 @@ bool ImplOPropertySet::GetPropertyValueByHandle( void ImplOPropertySet::SetPropertyValueByHandle( sal_Int32 nHandle, const Any & rValue, Any * pOldValue ) { - if( pOldValue != NULL ) + if( pOldValue != nullptr ) { tPropertyMap::const_iterator aFoundIter( m_aProperties.find( nHandle ) ); if( m_aProperties.end() != aFoundIter ) diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx index ca7e5f0266f9..0da1ca6f9a78 100644 --- a/chart2/source/tools/ImplOPropertySet.hxx +++ b/chart2/source/tools/ImplOPropertySet.hxx @@ -63,7 +63,7 @@ public: void SetPropertyValueByHandle( sal_Int32 nHandle, const ::com::sun::star::uno::Any & rValue, - ::com::sun::star::uno::Any * pOldValue = NULL ); + ::com::sun::star::uno::Any * pOldValue = nullptr ); bool SetStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > & xStyle ); ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index f05cae23712e..44b386cc1922 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -515,7 +515,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co const sal_Unicode* p = rArrayStr.getStr(); const sal_Unicode* pEnd = p + rArrayStr.getLength(); - const sal_Unicode* pElem = NULL; + const sal_Unicode* pElem = nullptr; OUString aElem; std::vector<OUString> aRawElems; @@ -542,7 +542,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co if (pElem) aElem = OUString(pElem, p-pElem); aRawElems.push_back(aElem); - pElem = NULL; + pElem = nullptr; aElem.clear(); ++p; // Skip '"'. @@ -560,7 +560,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co if (pElem) aElem = OUString(pElem, p-pElem); aRawElems.push_back(aElem); - pElem = NULL; + pElem = nullptr; aElem.clear(); } else if (!pElem) @@ -758,7 +758,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData if( aDataVec[nOldIndex].is() ) { aResultLSeqVec.push_back( aDataVec[nOldIndex] ); - aDataVec[nOldIndex] = 0; + aDataVec[nOldIndex] = nullptr; } } } diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx index 6ed419984fd8..6ca8e3f43de1 100644 --- a/chart2/source/tools/LegendHelper.cxx +++ b/chart2/source/tools/LegendHelper.cxx @@ -65,7 +65,7 @@ Reference< chart2::XLegend > LegendHelper::showLegend( ChartModel& rModel void LegendHelper::hideLegend( ChartModel& rModel ) { - uno::Reference< chart2::XLegend > xLegend = LegendHelper::getLegend( rModel, 0 ); + uno::Reference< chart2::XLegend > xLegend = LegendHelper::getLegend( rModel, nullptr ); uno::Reference< beans::XPropertySet > xProp( xLegend, uno::UNO_QUERY ); if( xProp.is()) { diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 3c40abf9810e..10e4058c52ab 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -333,7 +333,7 @@ void CloseableLifeTimeManager::impl_doClose() NegativeGuard< osl::Mutex > aNegativeGuard( m_aAccessMutex ); //mutex is not acquired, mutex will be reacquired at the end of this method automatically - uno::Reference< util::XCloseable > xCloseable=NULL; + uno::Reference< util::XCloseable > xCloseable=nullptr; try { xCloseable.set(m_pCloseable); diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx index 1450b82946b0..622825462357 100644 --- a/chart2/source/tools/ModifyListenerCallBack.cxx +++ b/chart2/source/tools/ModifyListenerCallBack.cxx @@ -56,7 +56,7 @@ private: ModifyListenerCallBack_impl::ModifyListenerCallBack_impl( const Link<void*,void>& rCallBack ) : ModifyListenerCallBack_Base( m_aMutex ) , m_aLink( rCallBack ) - , m_xBroadcaster(0) + , m_xBroadcaster(nullptr) { } @@ -67,7 +67,7 @@ ModifyListenerCallBack_impl::~ModifyListenerCallBack_impl() //XModifyListener void SAL_CALL ModifyListenerCallBack_impl::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException, std::exception) { - m_aLink.Call(0); + m_aLink.Call(nullptr); } //XEventListener diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index 13b7ed18716b..52c6a5250a55 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -51,7 +51,7 @@ OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLa NumberFormatterWrapper::NumberFormatterWrapper( const uno::Reference< util::XNumberFormatsSupplier >& xSupplier ) : m_xNumberFormatsSupplier(xSupplier) - , m_pNumberFormatter(NULL) + , m_pNumberFormatter(nullptr) { uno::Reference<beans::XPropertySet> xProp(m_xNumberFormatsSupplier,uno::UNO_QUERY); @@ -91,7 +91,7 @@ OUString NumberFormatterWrapper::getFormattedString( sal_Int32 nNumberFormatKey, sal_Int32& rLabelColor, bool& rbColorChanged ) const { OUString aText; - Color* pTextColor = NULL; + Color* pTextColor = nullptr; if( !m_pNumberFormatter ) { OSL_FAIL("Need a NumberFormatter"); diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index 1fda7e31f384..a64d893e715b 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -269,7 +269,7 @@ void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); OUString aName; - rPH.fillPropertyMembersByHandle( &aName, 0, nHandle ); + rPH.fillPropertyMembersByHandle( &aName, nullptr, nHandle ); OSL_ENSURE( rValue.isExtractableTo( rPH.getPropertyByName( aName ).Type ), "Property type is wrong" ); } diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index cac87c78e4de..072e3a5c9aaf 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -124,12 +124,12 @@ Reference<XChartType> lcl_getFirstStockChartType( const Reference< frame::XModel { Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); if(!xDiagram.is()) - return 0; + return nullptr; //iterate through all coordinate systems Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY ); if( !xCooSysContainer.is()) - return 0; + return nullptr; uno::Sequence< Reference< XCoordinateSystem > > aCooSysList( xCooSysContainer->getCoordinateSystems() ); for( sal_Int32 nCS = 0; nCS < aCooSysList.getLength(); ++nCS ) @@ -150,7 +150,7 @@ Reference<XChartType> lcl_getFirstStockChartType( const Reference< frame::XModel return xChartType; } } - return 0; + return nullptr; } OUString lcl_getIndexStringAfterString( const OUString& rString, const OUString& rSearchString ) @@ -238,13 +238,13 @@ void lcl_getDiagramAndCooSys( const OUString& rObjectCID ObjectIdentifier::ObjectIdentifier() :m_aObjectCID( OUString() ) - ,m_xAdditionalShape( 0 ) + ,m_xAdditionalShape( nullptr ) { } ObjectIdentifier::ObjectIdentifier( const OUString& rObjectCID ) :m_aObjectCID( rObjectCID ) - ,m_xAdditionalShape( 0 ) + ,m_xAdditionalShape( nullptr ) { } @@ -256,7 +256,7 @@ ObjectIdentifier::ObjectIdentifier( const Reference< drawing::XShape >& rxShape ObjectIdentifier::ObjectIdentifier( const Any& rAny ) :m_aObjectCID( OUString() ) - ,m_xAdditionalShape( 0 ) + ,m_xAdditionalShape( nullptr ) { const uno::Type& rType = rAny.getValueType(); if ( rType == cppu::UnoType<OUString>::get() ) @@ -1242,11 +1242,11 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet( { //return the model object that is indicated by rObjectCID if(rObjectCID.isEmpty()) - return NULL; + return nullptr; if(!xChartModel.is()) - return NULL; + return nullptr; - Reference< beans::XPropertySet > xObjectProperties = NULL; + Reference< beans::XPropertySet > xObjectProperties = nullptr; try { ObjectType eObjectType = ObjectIdentifier::getObjectType( rObjectCID ); @@ -1442,7 +1442,7 @@ Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID( const OUString& rObjectCID , const Reference< frame::XModel >& xChartModel ) { - Reference< XDataSeries > xSeries(NULL); + Reference< XDataSeries > xSeries(nullptr); Reference< XDiagram > xDiagram; Reference< XCoordinateSystem > xCooSys; diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index 124d0989b762..4681a7cfad61 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -488,7 +488,7 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getFirstCurveN const Reference< XRegressionCurveContainer > & xRegCnt ) { if( !xRegCnt.is()) - return NULL; + return nullptr; try { @@ -507,7 +507,7 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getFirstCurveN ASSERT_EXCEPTION( ex ); } - return NULL; + return nullptr; } uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getRegressionCurveAtIndex( @@ -515,7 +515,7 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getRegressionC sal_Int32 aIndex ) { if( !xCurveContainer.is()) - return NULL; + return nullptr; try { @@ -531,7 +531,7 @@ uno::Reference< chart2::XRegressionCurve > RegressionCurveHelper::getRegressionC ASSERT_EXCEPTION( ex ); } - return NULL; + return nullptr; } SvxChartRegress RegressionCurveHelper::getRegressionType( diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index 0ddc2c97bd7f..35ca0c880ea6 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -191,7 +191,7 @@ RegressionEquation::RegressionEquation( const RegressionEquation & rOther ) : impl::RegressionEquation_Base(), ::property::OPropertySet( rOther, m_aMutex ), m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder()), - m_xContext( NULL ) + m_xContext( nullptr ) {} RegressionEquation::~RegressionEquation() diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx index 42dbcbeee944..3f3fb615697a 100644 --- a/chart2/source/tools/ResourceManager.cxx +++ b/chart2/source/tools/ResourceManager.cxx @@ -27,7 +27,7 @@ namespace chart ResMgr & ResourceManager::getResourceManager() { // not threadsafe - static ResMgr * pResourceManager = 0; + static ResMgr * pResourceManager = nullptr; if( ! pResourceManager ) pResourceManager = ResMgr::CreateResMgr("chartcontroller"); OSL_ASSERT( pResourceManager ); diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx index 158486c3975c..49ed57513e41 100644 --- a/chart2/source/tools/SceneProperties.cxx +++ b/chart2/source/tools/SceneProperties.cxx @@ -318,7 +318,7 @@ void SceneProperties::AddDefaultsToMap( ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_SHADE_MODE, drawing::ShadeMode_SMOOTH ); ::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( - rOutMap, PROP_SCENE_AMBIENT_COLOR, ChartTypeHelper::getDefaultAmbientLightColor(false,0)); + rOutMap, PROP_SCENE_AMBIENT_COLOR, ChartTypeHelper::getDefaultAmbientLightColor(false,nullptr)); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_TWO_SIDED_LIGHTING, true ); @@ -342,7 +342,7 @@ void SceneProperties::AddDefaultsToMap( uno::Any aDefaultLightDirection( uno::makeAny( drawing::Direction3D( 0.0, 0.0, 1.0 ) ) ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_1, aDefaultLightDirection ); - ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_2, ChartTypeHelper::getDefaultSimpleLightDirection(0)); + ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_2, ChartTypeHelper::getDefaultSimpleLightDirection(nullptr)); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_3, aDefaultLightDirection ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_4, aDefaultLightDirection ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_5, aDefaultLightDirection ); @@ -351,7 +351,7 @@ void SceneProperties::AddDefaultsToMap( ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_DIRECTION_8, aDefaultLightDirection ); uno::Any aDefaultLightColor; - aDefaultLightColor <<= ChartTypeHelper::getDefaultDirectLightColor(false,0); + aDefaultLightColor <<= ChartTypeHelper::getDefaultDirectLightColor(false,nullptr); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_COLOR_1, aDefaultLightColor ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_COLOR_2, aDefaultLightColor ); ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCENE_LIGHT_COLOR_3, aDefaultLightColor ); diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 3c58947ae8b2..86efbac5db51 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -146,7 +146,7 @@ uno::Reference< XTitle > TitleHelper::getTitle( TitleHelper::eTitleType nTitleIn uno::Reference< XTitled > xTitled( lcl_getTitleParent( nTitleIndex, xDiagram ) ); if( xTitled.is()) return xTitled->getTitleObject(); - return NULL; + return nullptr; } uno::Reference< XTitle > TitleHelper::getTitle( TitleHelper::eTitleType nTitleIndex @@ -167,7 +167,7 @@ uno::Reference< XTitle > TitleHelper::getTitle( TitleHelper::eTitleType nTitleIn } if( xTitled.is()) return xTitled->getTitleObject(); - return NULL; + return nullptr; } uno::Reference< XTitle > TitleHelper::createTitle( @@ -345,7 +345,7 @@ void TitleHelper::setCompleteString( const OUString& rNewText xFormattedString->setString( aNewText ); aNewStringList[0].set( xFormattedString ); - if( pDefaultCharHeight != 0 ) + if( pDefaultCharHeight != nullptr ) { try { @@ -370,7 +370,7 @@ void TitleHelper::removeTitle( TitleHelper::eTitleType nTitleIndex uno::Reference< XTitled > xTitled( lcl_getTitleParent( nTitleIndex, xModel ) ); if( xTitled.is()) { - xTitled->setTitleObject(NULL); + xTitled->setTitleObject(nullptr); } } diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index 4ef8e8738279..06b98987555b 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -32,9 +32,9 @@ using ::com::sun::star::uno::Any; WrappedPropertySet::WrappedPropertySet() : MutexContainer() - , m_xInfo(0) - , m_pPropertyArrayHelper(0) - , m_pWrappedPropertyMap(0) + , m_xInfo(nullptr) + , m_pPropertyArrayHelper(nullptr) + , m_pWrappedPropertyMap(nullptr) { } WrappedPropertySet::~WrappedPropertySet() @@ -65,7 +65,7 @@ void WrappedPropertySet::clearWrappedPropertySet() DELETEZ(m_pPropertyArrayHelper); DELETEZ(m_pWrappedPropertyMap); - m_xInfo = NULL; + m_xInfo = nullptr; } //XPropertySet @@ -334,7 +334,7 @@ const WrappedProperty* WrappedPropertySet::getWrappedProperty( sal_Int32 nHandle tWrappedPropertyMap::const_iterator aFound( getWrappedPropertyMap().find( nHandle ) ); if( aFound != getWrappedPropertyMap().end() ) return (*aFound).second; - return 0; + return nullptr; } Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( const Sequence< OUString >& rNameSeq ) diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx index 2022d605faa8..52db5ab2c7c4 100644 --- a/chart2/source/tools/XMLRangeHelper.cxx +++ b/chart2/source/tools/XMLRangeHelper.cxx @@ -72,7 +72,7 @@ private: void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, OUStringBuffer * output ) { - OSL_ASSERT(output != 0); + OSL_ASSERT(output != nullptr); if( rCell.empty()) return; |