diff options
Diffstat (limited to 'chart2')
47 files changed, 51 insertions, 131 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index 977d32f204e6..783764b93fa9 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -56,8 +56,7 @@ AccessibleChartView::AccessibleChartView(SdrView* pView ) : true, // has children true // always transparent ), - m_pSdrView( pView ), - m_pViewForwarder( nullptr ) + m_pSdrView( pView ) { AddState( AccessibleStateType::OPAQUE ); } diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 598466ae70a4..c7ca6380f30a 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -46,7 +46,6 @@ namespace chart AccessibleTextHelper::AccessibleTextHelper( DrawViewWrapper * pDrawViewWrapper ) : impl::AccessibleTextHelper_Base( m_aMutex ), - m_pTextHelper( nullptr ), m_pDrawViewWrapper( pDrawViewWrapper ) {} diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 9c904996ebee..c25f2467ea33 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -44,8 +44,7 @@ Chart2ModelContact::Chart2ModelContact( const Reference< uno::XComponentContext > & xContext ) : m_xContext( xContext ), m_xChartModel( nullptr ), - mpModel( nullptr ), - m_xChartView(nullptr) + mpModel( nullptr ) { } diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 2c54837a80cf..471bb1a8e193 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -910,7 +910,7 @@ void ChartDocumentWrapper::impl_resetAddIn() if( xInit.is() ) { uno::Any aParam; - uno::Reference< css::chart::XChartDocument > xDoc( nullptr ); + uno::Reference< css::chart::XChartDocument > xDoc; aParam <<= xDoc; uno::Sequence< uno::Any > aSeq( &aParam, 1 ); xInit->initialize( aSeq ); diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index c04474627727..8b5d0800b25f 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -447,7 +447,6 @@ DataSeriesPointWrapper::DataSeriesPointWrapper(const std::shared_ptr<Chart2Model , m_nSeriesIndexInNewAPI( -1 ) , m_nPointIndex( -1 ) , m_bLinesAllowed(true) - , m_xDataSeries(nullptr) { //need initialize call afterwards } @@ -487,7 +486,6 @@ DataSeriesPointWrapper::DataSeriesPointWrapper(eType _eType, , m_nSeriesIndexInNewAPI( nSeriesIndexInNewAPI ) , m_nPointIndex( (_eType == DATA_POINT) ? nPointIndex : -1 ) , m_bLinesAllowed( false ) - , m_xDataSeries(nullptr) { } diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 85073ee957fe..6a2f056e785c 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -1494,7 +1494,7 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con DiagramHelper::tTemplateWithServiceName aTemplateAndService = DiagramHelper::getTemplateForDiagram( xDiagram, xFact ); - uno::Reference< chart2::XChartTypeTemplate > xTemplate(nullptr); + uno::Reference< chart2::XChartTypeTemplate > xTemplate; if( aTemplateAndService.second == "com.sun.star.chart2.template.ColumnWithLine" ) { if( nNewValue != 0 ) diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 658f626b83b6..42f140e4beb4 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -155,7 +155,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL MinMaxLineWrapper::getPropert void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) { - Reference< beans::XPropertySet > xPropSet(nullptr); + Reference< beans::XPropertySet > xPropSet; Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); Sequence< Reference< chart2::XChartType > > aTypes( @@ -193,7 +193,7 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rProperty { Any aRet; - Reference< beans::XPropertySet > xPropSet(nullptr); + Reference< beans::XPropertySet > xPropSet; Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); Sequence< Reference< chart2::XChartType > > aTypes( diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index e235e4bd21ee..e59dc5b14b02 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -162,7 +162,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getProperty } void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) { - Reference< beans::XPropertySet > xPropSet(nullptr); + Reference< beans::XPropertySet > xPropSet; Sequence< Reference< chart2::XChartType > > aTypes( ::chart::DiagramHelper::getChartTypesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) ); @@ -185,7 +185,7 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyN { Any aRet; - Reference< beans::XPropertySet > xPropSet(nullptr); + Reference< beans::XPropertySet > xPropSet; Sequence< Reference< chart2::XChartType > > aTypes( ::chart::DiagramHelper::getChartTypesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 233350b4a29a..4002929b6a99 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -149,7 +149,7 @@ css::uno::Any WrappedVolumeProperty::getPropertyValue( const css::uno::Reference uno::Reference< chart2::XChartTypeTemplate > WrappedVolumeProperty::getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const { - uno::Reference< chart2::XChartTypeTemplate > xTemplate(nullptr); + uno::Reference< chart2::XChartTypeTemplate > xTemplate; if(!xFactory.is()) return xTemplate; @@ -213,7 +213,7 @@ css::uno::Any WrappedUpDownProperty::getPropertyValue( const css::uno::Reference } uno::Reference< chart2::XChartTypeTemplate > WrappedUpDownProperty::getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const { - uno::Reference< chart2::XChartTypeTemplate > xTemplate(nullptr); + uno::Reference< chart2::XChartTypeTemplate > xTemplate; if( bNewValue ) //add open series { if( rCurrentTemplate == "com.sun.star.chart2.template.StockLowHighClose" ) diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 2a158f8a7297..6e330aa3d45b 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -262,7 +262,7 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla const ChartTypeParameter& rParameter , const uno::Reference< lang::XMultiServiceFactory >& xTemplateManager ) const { - uno::Reference< XChartTypeTemplate > xTemplate(nullptr); + uno::Reference< XChartTypeTemplate > xTemplate; OUString aServiceName( getServiceNameForParameter( rParameter ) ); if(!aServiceName.isEmpty()) diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 9390c9ffe18b..69004f9bc1c6 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -39,9 +39,7 @@ using namespace ::com::sun::star; CreationWizardUnoDlg::CreationWizardUnoDlg( const uno::Reference< uno::XComponentContext >& xContext ) : OComponentHelper( m_aMutex ) - , m_xChartModel( nullptr ) , m_xCC( xContext ) - , m_xParentWindow( nullptr ) , m_pDialog( nullptr ) , m_bUnlockControllersOnExecute(false) { diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 6d509a41b66e..47315d30a9ce 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -100,7 +100,6 @@ ObjectPropertiesDialogParameter::ObjectPropertiesDialogParameter( const OUString , m_bShowAxisOrigin(false) , m_bIsCrossingAxisIsCategoryAxis(false) , m_aCategories() - , m_xChartDocument( nullptr ) , m_bComplexCategoriesAxis( false ) , m_nNbPoints( 0 ) { @@ -330,8 +329,6 @@ SchAttribTabDlg::SchAttribTabDlg(vcl::Window* pParent, , m_pParameter( pDialogParameter ) , m_pViewElementListProvider( pViewElementListProvider ) , m_pNumberFormatter(nullptr) - , m_pSymbolShapeProperties(nullptr) - , m_pAutoSymbolGraphic(nullptr) , m_fAxisMinorStepWidthForErrorBarDecimals(0.1) , m_bOKPressed(false) { diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 489a60a9343d..fb27b035eb22 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -209,7 +209,6 @@ ThreeD_SceneIllumination_TabPage::ThreeD_SceneIllumination_TabPage( vcl::Window* : TabPage ( pWindow ,"tp_3D_SceneIllumination" ,"modules/schart/ui/tp_3D_SceneIllumination.ui") - , m_pLightSourceInfoList(nullptr) , m_xSceneProperties( xSceneProperties ) , m_aTimerTriggeredControllerLock( xChartModel ) , m_bInCommitToModel( false ) diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index 906ac1986446..38a4dc9a68ea 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -31,7 +31,6 @@ namespace chart SchLayoutTabPage::SchLayoutTabPage(vcl::Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, "tp_ChartType", "modules/schart/ui/tp_ChartType.ui", &rInAttrs) - , m_pGeometryResources(nullptr) { m_pGeometryResources.reset(new BarGeometryResources( this )); } diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index ddd8500423a0..a0776b6fff24 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -69,7 +69,6 @@ RangeChooserTabPage::RangeChooserTabPage( vcl::Window* pParent , m_nChangingControlCalls(0) , m_bIsDirty(false) , m_aLastValidRangeString() - , m_xCurrentChartTypeTemplate(nullptr) , m_pTemplateProvider(pTemplateProvider) , m_rDialogModel( rDialogModel ) , m_pParentDialog( pParentDialog ) diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index 36b22e93860d..6f151d647956 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -52,7 +52,6 @@ using namespace ::com::sun::star; ViewElementListProvider::ViewElementListProvider( DrawModelWrapper* pDrawModelWrapper ) : m_pDrawModelWrapper( pDrawModelWrapper ) - , m_pFontList(nullptr) { } @@ -118,7 +117,7 @@ XPatternListRef ViewElementListProvider::GetPatternList() const SdrObjList* ViewElementListProvider::GetSymbolList() const { SdrObjList* pSymbolList = nullptr; - uno::Reference< drawing::XShapes > xSymbols(nullptr);//@todo this keeps the first drawinglayer alive ... + uno::Reference< drawing::XShapes > xSymbols;//@todo this keeps the first drawinglayer alive ... try { if(!pSymbolList || !pSymbolList->GetObjCount()) diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 64755663375e..9d4fd5669841 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -37,7 +37,6 @@ ItemConverter::ItemConverter( const uno::Reference< beans::XPropertySet > & rPropertySet, SfxItemPool& rItemPool ) : m_xPropertySet( rPropertySet ), - m_xPropertySetInfo( nullptr ), m_rItemPool( rItemPool ) { resetPropertySet( m_xPropertySet ); diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx index f08370c548ae..9439dcc2ceb1 100644 --- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx +++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx @@ -111,7 +111,7 @@ AllDataLabelItemConverter::AllDataLabelItemConverter( for (auto const& series : aSeriesList) { uno::Reference< beans::XPropertySet > xObjectProperties(series, uno::UNO_QUERY); - uno::Reference< uno::XComponentContext> xContext(nullptr);//do not need Context for label properties + uno::Reference< uno::XComponentContext> xContext;//do not need Context for label properties sal_Int32 nNumberFormat=ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel( xObjectProperties, series, -1/*nPointIndex*/, ChartModelHelper::findDiagram( xChartModel ) ); sal_Int32 nPercentNumberFormat=ExplicitValueProvider::getExplicitPercentageNumberFormatKeyForDataLabel( diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 9fbc7b6de301..17a0f12bb6c7 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -108,20 +108,17 @@ ChartController::ChartController(uno::Reference<uno::XComponentContext> const & m_aLifeTimeManager( nullptr ), m_bSuspended( false ), m_xCC(xContext), //@todo is it allowed to hold this context?? - m_xFrame( nullptr ), m_aModelMutex(), m_aModel( nullptr, m_aModelMutex ), m_xViewWindow(), m_xChartView(), m_pDrawModelWrapper(), - m_pDrawViewWrapper(nullptr), m_eDragMode(SdrDragMode::Move), m_bWaitingForDoubleClick(false), m_bWaitingForMouseUp(false), m_bFieldButtonDown(false), m_bConnectingToView(false), m_bDisposed(false), - m_xUndoManager( nullptr ), m_aDispatchContainer( m_xCC ), m_eDrawMode( CHARTDRAW_SELECT ), mpSelectionChangeHandler(new svx::sidebar::SelectionChangeHandler( @@ -138,7 +135,6 @@ ChartController::~ChartController() ChartController::TheModel::TheModel( const uno::Reference< frame::XModel > & xModel ) : m_xModel( xModel ), - m_xCloseable( nullptr ), m_bOwnership( true ) { m_xCloseable = diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index e14a064fcbdd..b55d6ee48f58 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -104,8 +104,8 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyVa } //create the controller(+XWindow) - uno::Reference< frame::XController > xController = nullptr; - uno::Reference< awt::XWindow > xComponentWindow = nullptr; + uno::Reference< frame::XController > xController; + uno::Reference< awt::XWindow > xComponentWindow; { xController.set( m_xCC->getServiceManager()->createInstanceWithContext( diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 91fa80cd8f8a..7c689e72de2a 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -101,13 +101,10 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext) , m_nInLoad(0) , m_bUpdateNotificationsPending(false) , mbTimeBased(false) - , m_pUndoManager( nullptr ) , m_aControllers( m_aModelMutex ) , m_nControllerLockCount(0) , m_xContext( xContext ) , m_aVisualAreaSize( ChartModelHelper::getDefaultPageSize() ) - , m_xDataProvider( nullptr ) - , m_xInternalDataProvider( nullptr ) , m_xPageBackground( new PageBackground ) , m_xXMLNamespaceMap( createNameContainer( ::cppu::UnoType<OUString>::get(), "com.sun.star.xml.NamespaceMap", "com.sun.star.comp.chart.XMLNameSpaceMap" ), uno::UNO_QUERY) @@ -146,8 +143,8 @@ ChartModel::ChartModel( const ChartModel & rOther ) , m_xContext( rOther.m_xContext ) // @note: the old model aggregate must not be shared with other models if it // is, you get mutex deadlocks - , m_xOldModelAgg( nullptr ) //rOther.m_xOldModelAgg ) - , m_xStorage( nullptr ) //rOther.m_xStorage ) + //, m_xOldModelAgg( nullptr ) //rOther.m_xOldModelAgg ) + // m_xStorage( nullptr ) //rOther.m_xStorage ) , m_aVisualAreaSize( rOther.m_aVisualAreaSize ) , m_aGraphicObjectVector( rOther.m_aGraphicObjectVector ) , m_xDataProvider( rOther.m_xDataProvider ) diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 431678e485cd..e9b25fee8dcb 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -326,7 +326,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=nullptr; + uno::Reference< util::XCloseable > xCloseable; try { xCloseable.set(m_pCloseable); diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index c8aca33c28cc..a424dbd29595 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -243,13 +243,11 @@ void lcl_getDiagramAndCooSys( const OUString& rObjectCID ObjectIdentifier::ObjectIdentifier() :m_aObjectCID( OUString() ) - ,m_xAdditionalShape( nullptr ) { } ObjectIdentifier::ObjectIdentifier( const OUString& rObjectCID ) :m_aObjectCID( rObjectCID ) - ,m_xAdditionalShape( nullptr ) { } @@ -261,7 +259,6 @@ ObjectIdentifier::ObjectIdentifier( const Reference< drawing::XShape >& rxShape ObjectIdentifier::ObjectIdentifier( const Any& rAny ) :m_aObjectCID( OUString() ) - ,m_xAdditionalShape( nullptr ) { const uno::Type& rType = rAny.getValueType(); if ( rType == cppu::UnoType<OUString>::get() ) @@ -1212,7 +1209,7 @@ Reference< beans::XPropertySet > ObjectIdentifier::getObjectPropertySet( if(!xChartModel.is()) return nullptr; - Reference< beans::XPropertySet > xObjectProperties = nullptr; + Reference< beans::XPropertySet > xObjectProperties; try { ObjectType eObjectType = ObjectIdentifier::getObjectType( rObjectCID ); @@ -1408,7 +1405,7 @@ Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID( const OUString& rObjectCID , const Reference< frame::XModel >& xChartModel ) { - Reference< XDataSeries > xSeries(nullptr); + Reference< XDataSeries > xSeries; Reference< XDiagram > xDiagram; Reference< XCoordinateSystem > xCooSys; diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index c099bc76dfc6..d195c59a7c29 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -34,9 +34,6 @@ using ::com::sun::star::uno::Any; WrappedPropertySet::WrappedPropertySet() : MutexContainer() - , m_xInfo(nullptr) - , m_pPropertyArrayHelper(nullptr) - , m_pWrappedPropertyMap(nullptr) { } WrappedPropertySet::~WrappedPropertySet() diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index 2fa86b6510e2..33ce421205d3 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -37,7 +37,6 @@ TickInfo::TickInfo( const uno::Reference<chart2::XScaling>& xInverse ) , xInverseScaling( xInverse ) , aTickScreenPosition(0.0,0.0) , bPaintIt( true ) -, xTextShape( nullptr ) , nFactorForLimitedTextWidth(1) { } @@ -91,7 +90,6 @@ TickFactory::TickFactory( const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement ) : m_rScale( rScale ) , m_rIncrement( rIncrement ) - , m_xInverseScaling(nullptr) { //@todo: make sure that the scale is valid for the scaling diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx b/chart2/source/view/axes/Tickmarks_Dates.cxx index 9b1d7a50543e..9fe4c657b5f0 100644 --- a/chart2/source/view/axes/Tickmarks_Dates.cxx +++ b/chart2/source/view/axes/Tickmarks_Dates.cxx @@ -37,7 +37,6 @@ DateTickFactory::DateTickFactory( const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement ) : m_aScale( rScale ) , m_aIncrement( rIncrement ) - , m_xInverseScaling(nullptr) { //@todo: make sure that the scale is valid for the scaling diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx index 1566ca41da8d..7b319974bbb5 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx @@ -74,8 +74,6 @@ EquidistantTickFactory::EquidistantTickFactory( const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement ) : m_rScale( rScale ) , m_rIncrement( rIncrement ) - , m_xInverseScaling(nullptr) - , m_pfCurrentValues(nullptr) { //@todo: make sure that the scale is valid for the scaling @@ -418,8 +416,7 @@ EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< do , m_pInfoTicks(nullptr) , m_rIncrement(rIncrement) , m_nMaxDepth(0) - , m_nTickCount(0), m_pnPositions(nullptr) - , m_pnPreParentCount(nullptr), m_pbIntervalFinished(nullptr) + , m_nTickCount(0) , m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 ) { initIter( nMaxDepth ); @@ -432,8 +429,7 @@ EquidistantTickIter::EquidistantTickIter( TickInfoArraysType& rTicks , m_pInfoTicks(&rTicks) , m_rIncrement(rIncrement) , m_nMaxDepth(0) - , m_nTickCount(0), m_pnPositions(nullptr) - , m_pnPreParentCount(nullptr), m_pbIntervalFinished(nullptr) + , m_nTickCount(0) , m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 ) { initIter( nMaxDepth ); diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index db7d798bfe9b..3ab5ce3ae633 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -231,7 +231,7 @@ void VAxisBase::removeTextShapesFromTicks() void VAxisBase::updateUnscaledValuesAtTicks( TickIter& rIter ) { - Reference< XScaling > xInverseScaling( nullptr ); + Reference< XScaling > xInverseScaling; if( m_aScale.Scaling.is() ) xInverseScaling = m_aScale.Scaling->getInverseScaling(); diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 03b392c2a676..c2385db62631 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -176,7 +176,6 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel , m_nAxisType(AxisType::REALNUMBER) , m_bComplexCategories(false) , m_pExplicitCategoriesProvider(pExplicitCategoriesProvider) - , m_xAxisTextProvider(nullptr) , m_bLimitSpaceForLabels(false) { } diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 13cd0b7dba02..a047f7239b59 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -324,7 +324,7 @@ B2DVector lcl_getLabelsDistance( TickIter& rIter, const B2DVector& rDistanceTick aStaggerDirection.normalize(); sal_Int32 nDistance=0; - Reference< drawing::XShape > xShape2DText(nullptr); + Reference< drawing::XShape > xShape2DText; for( TickInfo* pTickInfo = rIter.firstInfo() ; pTickInfo ; pTickInfo = rIter.nextInfo() ) @@ -353,7 +353,7 @@ void lcl_shiftLabels( TickIter& rIter, const B2DVector& rStaggerDistance ) { if(rStaggerDistance.getLength()==0.0) return; - Reference< drawing::XShape > xShape2DText(nullptr); + Reference< drawing::XShape > xShape2DText; for( TickInfo* pTickInfo = rIter.firstInfo() ; pTickInfo ; pTickInfo = rIter.nextInfo() ) diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 9d7373cc4abe..a9143d498aac 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -73,10 +73,6 @@ std::unique_ptr<VCoordinateSystem> VCoordinateSystem::createCoordinateSystem( VCoordinateSystem::VCoordinateSystem( const Reference< XCoordinateSystem >& xCooSys ) : m_xCooSysModel(xCooSys) - , m_xLogicTargetForGrids(nullptr) - , m_xLogicTargetForAxes(nullptr) - , m_xFinalTarget(nullptr) - , m_xShapeFactory(nullptr) , m_aMatrixSceneToScreen() , m_eLeftWallPos(CuboidPlanePosition_Left) , m_eBackWallPos(CuboidPlanePosition_Back) @@ -84,7 +80,6 @@ VCoordinateSystem::VCoordinateSystem( const Reference< XCoordinateSystem >& xCoo , m_aMergedMinMaxSupplier() , m_aExplicitScales(3) , m_aExplicitIncrements(3) - , m_apExplicitCategoriesProvider(nullptr) { if( !m_xCooSysModel.is() || m_xCooSysModel->getDimension()<3 ) { diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index b0e3f2c86faa..f2b1e2687a4c 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -73,7 +73,7 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis( , PolarPlottingPositionHelper const * pPosHelper , double fLogicRadius, double fLogicZ ) { - Reference< XScaling > xInverseScaling( nullptr ); + Reference< XScaling > xInverseScaling; if( rScale.Scaling.is() ) xInverseScaling = rScale.Scaling->getInverseScaling(); @@ -164,7 +164,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic const ExplicitScaleData& rRadiusScale = m_pPosHelper->getScales()[1]; const ExplicitScaleData& rAngleScale = m_pPosHelper->getScales()[0]; const ExplicitIncrementData& rAngleIncrement = m_aIncrements[0]; - Reference< XScaling > xInverseRadiusScaling( nullptr ); + Reference< XScaling > xInverseRadiusScaling; if( rRadiusScale.Scaling.is() ) xInverseRadiusScaling = rRadiusScale.Scaling->getInverseScaling(); diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index 703cae0129bf..a652c5fad2bd 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -130,7 +130,7 @@ void VPolarRadiusAxis::createShapes() TickFactory aAngleTickFactory( rAngleScale, rAngleIncrement ); aAngleTickFactory.getAllTicks( aAngleTickInfos ); - uno::Reference< XScaling > xInverseScaling( nullptr ); + uno::Reference< XScaling > xInverseScaling; if( rAngleScale.Scaling.is() ) xInverseScaling = rAngleScale.Scaling->getInverseScaling(); diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index c7932cbe590a..58acc66a749c 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -66,10 +66,6 @@ AreaChart::AreaChart( const uno::Reference<XChartType>& xChartTypeModel , m_eCurveStyle(CurveStyle_LINES) , m_nCurveResolution(20) , m_nSplineOrder(3) - , m_xSeriesTarget(nullptr) - , m_xErrorBarTarget(nullptr) - , m_xTextTarget(nullptr) - , m_xRegressionCurveEquationTarget(nullptr) { m_pMainPosHelper->AllowShiftXAxisPos(true); m_pMainPosHelper->AllowShiftZAxisPos(true); @@ -415,7 +411,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries pPosHelper->transformScaledLogicToScene( aPoly ); //create line: - uno::Reference< drawing::XShape > xShape(nullptr); + uno::Reference< drawing::XShape > xShape; if(m_nDimension==3) { double fDepth = getTransformedDepth(); @@ -511,7 +507,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries pPosHelper->transformScaledLogicToScene( aPoly ); //create area: - uno::Reference< drawing::XShape > xShape(nullptr); + uno::Reference< drawing::XShape > xShape; if(m_nDimension==3) { xShape = m_pShapeFactory->createArea3D( xSeriesGroupShape_Shapes diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 3a7bf3f6a599..3d9aae4bf942 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -316,7 +316,7 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint3D_Bar( SAL_WARN("chart2", "Exception caught. " << e ); } - uno::Reference< drawing::XShape > xShape(nullptr); + uno::Reference< drawing::XShape > xShape; switch( nGeometry3D ) { case DataPointGeometry3D::CYLINDER: diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 3342bee2df56..cff376eac322 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -115,8 +115,8 @@ void CandleStickChart::createShapes() { m_xChartTypeModelProps->getPropertyValue( "ShowFirst" ) >>= bShowFirst; - uno::Reference< beans::XPropertySet > xWhiteDayProps(nullptr); - uno::Reference< beans::XPropertySet > xBlackDayProps(nullptr); + uno::Reference< beans::XPropertySet > xWhiteDayProps; + uno::Reference< beans::XPropertySet > xBlackDayProps; m_xChartTypeModelProps->getPropertyValue( "Japanese" ) >>= bJapaneseStyle; m_xChartTypeModelProps->getPropertyValue( "WhiteDay" ) >>= xWhiteDayProps; m_xChartTypeModelProps->getPropertyValue( "BlackDay" ) >>= xBlackDayProps; @@ -213,7 +213,7 @@ void CandleStickChart::createShapes() xLossGainTarget = xLossTarget; uno::Reference< beans::XPropertySet > xPointProp( pSeries->getPropertiesOfPoint( nIndex )); - uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(nullptr); + uno::Reference< drawing::XShapes > xPointGroupShape_Shapes; { OUString aPointCID = ObjectIdentifier::createPointCID( pSeries->getPointCID_Stub(), nIndex ); uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes( getSeriesGroupShape(pSeries.get(), xSeriesTarget) ); diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index d08547f54b88..c5f38386bd3f 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -59,8 +59,6 @@ NetChart::NetChart( const uno::Reference<XChartType>& xChartTypeModel , m_pMainPosHelper(std::move(pPlottingPositionHelper)) , m_bArea(!bNoArea) , m_bLine(bNoArea) - , m_xSeriesTarget(nullptr) - , m_xTextTarget(nullptr) { // we only support 2D Net charts assert(nDimensionCount == 2); @@ -158,7 +156,7 @@ bool NetChart::impl_createLine( VDataSeries* pSeries pPosHelper->transformScaledLogicToScene( aPoly ); //create line: - uno::Reference< drawing::XShape > xShape(nullptr); + uno::Reference< drawing::XShape > xShape; { xShape = m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes , PolyToPointSequence( aPoly ) ); diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index febee25a0806..7f03317b5daa 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -238,7 +238,7 @@ uno::Reference< drawing::XShape > PieChart::createDataPoint( } //create point - uno::Reference< drawing::XShape > xShape(nullptr); + uno::Reference< drawing::XShape > xShape; if(m_nDimension==3) { xShape = m_pShapeFactory->createPieSegment( xTarget @@ -661,7 +661,7 @@ void PieChart::createShapes() aParam.mfUnitCircleOuterRadius = m_pPosHelper->transformToRadius( fLogicOuterRadius ); ///point color: - std::unique_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(nullptr); + std::unique_ptr< tPropertyNameValueMap > apOverwritePropertiesMap; if (!pSeries->hasPointOwnColor(nPointIndex) && m_xColorScheme.is()) { apOverwritePropertiesMap.reset( new tPropertyNameValueMap ); @@ -754,8 +754,8 @@ bool lcl_isInsidePage( const awt::Point& rPos, const awt::Size& rSize, const awt }//end anonymous namespace PieChart::PieLabelInfo::PieLabelInfo() - : xTextShape(nullptr), xLabelGroupShape(nullptr), aFirstPosition(), aOrigin(), fValue(0.0) - , bMovementAllowed(false), bMoved(false), xTextTarget(nullptr), pPrevious(nullptr),pNext(nullptr) + : aFirstPosition(), aOrigin(), fValue(0.0) + , bMovementAllowed(false), bMoved(false), pPrevious(nullptr),pNext(nullptr) { } diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index f751469d19b9..29a33b248a46 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -50,12 +50,7 @@ using namespace ::com::sun::star::chart2; VDiagram::VDiagram( const uno::Reference<XDiagram> & xDiagram, const drawing::Direction3D& rPreferredAspectRatio, sal_Int32 nDimension ) - : m_xTarget(nullptr) - , m_xShapeFactory(nullptr) - , m_pShapeFactory(nullptr) - , m_xOuterGroupShape(nullptr) - , m_xCoordinateRegionShape(nullptr) - , m_xWall2D(nullptr) + : m_pShapeFactory(nullptr) , m_nDimensionCount(nDimension) , m_xDiagram(xDiagram) , m_aPreferredAspectRatio(rPreferredAspectRatio) @@ -490,7 +485,7 @@ void VDiagram::createShapes_3d() //add walls { - uno::Reference< beans::XPropertySet > xWallProp( nullptr ); + uno::Reference< beans::XPropertySet > xWallProp; if( m_xDiagram.is() ) xWallProp.set( m_xDiagram->getWall() ); @@ -614,7 +609,7 @@ void VDiagram::createShapes_3d() //add floor plate { - uno::Reference< beans::XPropertySet > xFloorProp( nullptr ); + uno::Reference< beans::XPropertySet > xFloorProp; if( m_xDiagram.is() ) xFloorProp.set( m_xDiagram->getFloor() ); diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 44129345dd5c..eb3395507659 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -180,7 +180,7 @@ ChartItemPool::ChartItemPool(): } ChartItemPool::ChartItemPool(const ChartItemPool& rPool): - SfxItemPool(rPool), pItemInfos(nullptr) + SfxItemPool(rPool) { } diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 4c393df4edbe..80d99d8d5e4e 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1496,8 +1496,8 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D drawing::Direction3D aPreferredAspectRatio = rParam.mpSeriesPlotterContainer->getPreferredAspectRatio(); - uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis(nullptr); - uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis(nullptr); + uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis; + uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis; VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount); bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram); {//create diagram @@ -1592,7 +1592,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D for( std::unique_ptr<VSeriesPlotter>& aPlotter : rSeriesPlotterList ) { VSeriesPlotter* pSeriesPlotter = aPlotter.get(); - uno::Reference< drawing::XShapes > xSeriesTarget(nullptr); + uno::Reference< drawing::XShapes > xSeriesTarget; if( pSeriesPlotter->WantToPlotInFrontOfAxisLine() ) xSeriesTarget = xSeriesTargetInFrontOfAxis; else @@ -2427,7 +2427,7 @@ void lcl_removeEmptyGroupShapes( const Reference< drawing::XShapes>& xParent ) for( sal_Int32 nN = xParent->getCount(); nN--; ) { uno::Any aAny = xParent->getByIndex( nN ); - Reference< drawing::XShapes> xShapes(nullptr); + Reference< drawing::XShapes> xShapes; if( aAny >>= xShapes ) lcl_removeEmptyGroupShapes( xShapes ); if( xShapes.is() && xShapes->getCount()==0 ) diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 94b6a96323d3..c405b75a0bff 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -52,8 +52,6 @@ namespace chart DrawModelWrapper::DrawModelWrapper() : SdrModel() , m_pChartItemPool(nullptr) - , m_xMainDrawPage(nullptr) - , m_xHiddenDrawPage(nullptr) { m_pChartItemPool = ChartItemPool::CreateChartItemPool(); diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index 0778c2954a42..2962f31758a0 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -30,10 +30,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; PlotterBase::PlotterBase( sal_Int32 nDimensionCount ) - : m_xLogicTarget(nullptr) - , m_xFinalTarget(nullptr) - , m_xShapeFactory(nullptr) - , m_pShapeFactory(nullptr) + : m_pShapeFactory(nullptr) , m_aCID() , m_nDimension(nDimensionCount) , m_pPosHelper(nullptr) diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index 6c05d96b233a..164f0a8d5f64 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -45,7 +45,6 @@ using namespace ::com::sun::star::chart2; PlottingPositionHelper::PlottingPositionHelper() : m_aScales() , m_aMatrixScreenToScene() - , m_xTransformationLogicToScene(nullptr) , m_bSwapXAndY( false ) , m_nXResolution( 1000 ) , m_nYResolution( 1000 ) @@ -62,7 +61,7 @@ PlottingPositionHelper::PlottingPositionHelper() PlottingPositionHelper::PlottingPositionHelper( const PlottingPositionHelper& rSource ) : m_aScales( rSource.m_aScales ) , m_aMatrixScreenToScene( rSource.m_aMatrixScreenToScene ) - , m_xTransformationLogicToScene( nullptr ) //should be recalculated + // m_xTransformationLogicToScene( nullptr ) //should be recalculated , m_bSwapXAndY( rSource.m_bSwapXAndY ) , m_nXResolution( rSource.m_nXResolution ) , m_nYResolution( rSource.m_nYResolution ) diff --git a/chart2/source/view/main/VButton.cxx b/chart2/source/view/main/VButton.cxx index 7dde0f25369a..bd8c5f9749eb 100644 --- a/chart2/source/view/main/VButton.cxx +++ b/chart2/source/view/main/VButton.cxx @@ -30,10 +30,7 @@ namespace chart using namespace css; VButton::VButton() - : m_xShapeFactory(nullptr) - , m_xTarget(nullptr) - , m_xShape(nullptr) - , m_bShowArrow(true) + : m_bShowArrow(true) , m_nArrowColor(0x00000000) , m_nBGColor(0x00E6E6E6) { diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index ec17514df816..34532c8a824f 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -151,12 +151,6 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) , m_fLogicMinX(0.0) , m_fLogicMaxX(0.0) , m_fLogicZPos(0.0) - , m_xGroupShape(nullptr) - , m_xLabelsGroupShape(nullptr) - , m_xErrorXBarsGroupShape(nullptr) - , m_xErrorYBarsGroupShape(nullptr) - , m_xFrontSubGroupShape(nullptr) - , m_xBackSubGroupShape(nullptr) , m_xDataSeries(xDataSeries) , m_nPointCount(0) @@ -175,16 +169,6 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) , m_nGlobalSeriesIndex(0) - , m_apLabel_Series(nullptr) - , m_apLabelPropNames_Series(nullptr) - , m_apLabelPropValues_Series(nullptr) - , m_apSymbolProperties_Series(nullptr) - - , m_apLabel_AttributedPoint(nullptr) - , m_apLabelPropNames_AttributedPoint(nullptr) - , m_apLabelPropValues_AttributedPoint(nullptr) - , m_apSymbolProperties_AttributedPoint(nullptr) - , m_apSymbolProperties_InvisibleSymbolForSelection(nullptr) , m_nCurrentAttributedPoint(-1) , m_nMissingValueTreatment(css::chart::MissingValueTreatment::LEAVE_GAP) , m_bAllowPercentValueInDataLabel(false) diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index 1ccbe29939a3..5d55b09c479c 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -37,10 +37,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; VTitle::VTitle( const uno::Reference< XTitle > & xTitle ) - : m_xTarget(nullptr) - , m_xShapeFactory(nullptr) - , m_xTitle(xTitle) - , m_xShape(nullptr) + : m_xTitle(xTitle) , m_aCID() , m_fRotationAngleDegree(0.0) , m_nXPos(0) |