diff options
Diffstat (limited to 'chart2/source/controller')
4 files changed, 43 insertions, 43 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 7b60554698e4..6b5861405254 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -448,7 +448,7 @@ Image ColumnChartDialogController::getImage() } const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTemplateMap() const { - static tTemplateServiceChartTypeParameterMap m_aTemplateMap = + static tTemplateServiceChartTypeParameterMap s_aTemplateMap = tTemplateServiceChartTypeParameterMap ( "com.sun.star.chart2.template.Column" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) ( "com.sun.star.chart2.template.StackedColumn" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) @@ -458,7 +458,7 @@ const tTemplateServiceChartTypeParameterMap& ColumnChartDialogController::getTem ( "com.sun.star.chart2.template.PercentStackedThreeDColumnFlat" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) ( "com.sun.star.chart2.template.ThreeDColumnDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) ) ; - return m_aTemplateMap; + return s_aTemplateMap; } void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { @@ -523,7 +523,7 @@ Image BarChartDialogController::getImage() } const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTemplateMap() const { - static tTemplateServiceChartTypeParameterMap m_aTemplateMap = + static tTemplateServiceChartTypeParameterMap s_aTemplateMap = tTemplateServiceChartTypeParameterMap ( "com.sun.star.chart2.template.Bar" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) ( "com.sun.star.chart2.template.StackedBar" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) @@ -533,7 +533,7 @@ const tTemplateServiceChartTypeParameterMap& BarChartDialogController::getTempla ( "com.sun.star.chart2.template.PercentStackedThreeDBarFlat" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) ( "com.sun.star.chart2.template.ThreeDBarDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z) ) ; - return m_aTemplateMap; + return s_aTemplateMap; } void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { @@ -597,7 +597,7 @@ Image PieChartDialogController::getImage() } const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTemplateMap() const { - static tTemplateServiceChartTypeParameterMap m_aTemplateMap = + static tTemplateServiceChartTypeParameterMap s_aTemplateMap = tTemplateServiceChartTypeParameterMap ( "com.sun.star.chart2.template.Pie" , ChartTypeParameter(1,false,false) ) ( "com.sun.star.chart2.template.PieAllExploded" , ChartTypeParameter(2,false,false) ) @@ -608,7 +608,7 @@ const tTemplateServiceChartTypeParameterMap& PieChartDialogController::getTempla ( "com.sun.star.chart2.template.ThreeDDonut" , ChartTypeParameter(3,false,true) ) ( "com.sun.star.chart2.template.ThreeDDonutAllExploded" , ChartTypeParameter(4,false,true) ) ; - return m_aTemplateMap; + return s_aTemplateMap; } void PieChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { @@ -659,7 +659,7 @@ Image LineChartDialogController::getImage() } const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTemplateMap() const { - static tTemplateServiceChartTypeParameterMap m_aTemplateMap = + static tTemplateServiceChartTypeParameterMap s_aTemplateMap = tTemplateServiceChartTypeParameterMap ( "com.sun.star.chart2.template.Symbol" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) ) ( "com.sun.star.chart2.template.StackedSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_STACK_Y,true,false) ) @@ -674,7 +674,7 @@ const tTemplateServiceChartTypeParameterMap& LineChartDialogController::getTempl ( "com.sun.star.chart2.template.PercentStackedThreeDLine" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Y_PERCENT,false,true) ) ( "com.sun.star.chart2.template.ThreeDLineDeep" , ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z,false,true) ) ; - return m_aTemplateMap; + return s_aTemplateMap; } void LineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { @@ -807,14 +807,14 @@ Image XYChartDialogController::getImage() } const tTemplateServiceChartTypeParameterMap& XYChartDialogController::getTemplateMap() const { - static tTemplateServiceChartTypeParameterMap m_aTemplateMap = + static tTemplateServiceChartTypeParameterMap s_aTemplateMap = tTemplateServiceChartTypeParameterMap ( "com.sun.star.chart2.template.ScatterSymbol" , ChartTypeParameter(1,true,false,GlobalStackMode_NONE,true,false) ) ( "com.sun.star.chart2.template.ScatterLineSymbol" , ChartTypeParameter(2,true,false,GlobalStackMode_NONE,true,true) ) ( "com.sun.star.chart2.template.ScatterLine" , ChartTypeParameter(3,true,false,GlobalStackMode_NONE,false,true) ) ( "com.sun.star.chart2.template.ThreeDScatter" , ChartTypeParameter(4,true,true,GlobalStackMode_NONE,false,true) ) ; - return m_aTemplateMap; + return s_aTemplateMap; } void XYChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { @@ -910,7 +910,7 @@ bool AreaChartDialogController::shouldShow_3DLookControl() const } const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTemplateMap() const { - static tTemplateServiceChartTypeParameterMap m_aTemplateMap = + static tTemplateServiceChartTypeParameterMap s_aTemplateMap = tTemplateServiceChartTypeParameterMap ( "com.sun.star.chart2.template.Area" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE) ) ( "com.sun.star.chart2.template.ThreeDArea" , ChartTypeParameter(1,false,true,GlobalStackMode_STACK_Z) ) @@ -919,7 +919,7 @@ const tTemplateServiceChartTypeParameterMap& AreaChartDialogController::getTempl ( "com.sun.star.chart2.template.PercentStackedArea" , ChartTypeParameter(3,false,false,GlobalStackMode_STACK_Y_PERCENT) ) ( "com.sun.star.chart2.template.PercentStackedThreeDArea" , ChartTypeParameter(3,false,true,GlobalStackMode_STACK_Y_PERCENT) ) ; - return m_aTemplateMap; + return s_aTemplateMap; } void AreaChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { @@ -992,7 +992,7 @@ bool NetChartDialogController::shouldShow_StackingControl() const } const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTemplateMap() const { - static tTemplateServiceChartTypeParameterMap m_aTemplateMap = + static tTemplateServiceChartTypeParameterMap s_aTemplateMap = tTemplateServiceChartTypeParameterMap //@todo need templates with symbols only ( "com.sun.star.chart2.template.NetSymbol" , ChartTypeParameter(1,false,false,GlobalStackMode_NONE,true,false) ) @@ -1011,7 +1011,7 @@ const tTemplateServiceChartTypeParameterMap& NetChartDialogController::getTempla ( "com.sun.star.chart2.template.StackedFilledNet" , ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y,false,false) ) ( "com.sun.star.chart2.template.PercentStackedFilledNet" ,ChartTypeParameter(4,false,false,GlobalStackMode_STACK_Y_PERCENT,false,false) ) ; - return m_aTemplateMap; + return s_aTemplateMap; } void NetChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) { @@ -1083,14 +1083,14 @@ Image StockChartDialogController::getImage() const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemplateMap() const { - static tTemplateServiceChartTypeParameterMap m_aTemplateMap = + static tTemplateServiceChartTypeParameterMap s_aTemplateMap = tTemplateServiceChartTypeParameterMap ( "com.sun.star.chart2.template.StockLowHighClose" , ChartTypeParameter(1) ) ( "com.sun.star.chart2.template.StockOpenLowHighClose" , ChartTypeParameter(2) ) ( "com.sun.star.chart2.template.StockVolumeLowHighClose" , ChartTypeParameter(3) ) ( "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" ,ChartTypeParameter(4) ) ; - return m_aTemplateMap; + return s_aTemplateMap; } void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) @@ -1132,12 +1132,12 @@ Image CombiColumnLineChartDialogController::getImage( ) const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogController::getTemplateMap() const { - static tTemplateServiceChartTypeParameterMap m_aTemplateMap = + static tTemplateServiceChartTypeParameterMap s_aTemplateMap = tTemplateServiceChartTypeParameterMap ( "com.sun.star.chart2.template.ColumnWithLine" , ChartTypeParameter(1) ) ( "com.sun.star.chart2.template.StackedColumnWithLine" , ChartTypeParameter(2,false,false,GlobalStackMode_STACK_Y) ) ; - return m_aTemplateMap; + return s_aTemplateMap; } void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) @@ -1263,10 +1263,10 @@ Image BubbleChartDialogController::getImage() } const tTemplateServiceChartTypeParameterMap& BubbleChartDialogController::getTemplateMap() const { - static tTemplateServiceChartTypeParameterMap m_aTemplateMap = + static tTemplateServiceChartTypeParameterMap s_aTemplateMap = tTemplateServiceChartTypeParameterMap ( "com.sun.star.chart2.template.Bubble" , ChartTypeParameter(1,true) ) ; - return m_aTemplateMap; + return s_aTemplateMap; } void BubbleChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx index 4663b70382d3..2a6e4097cf9c 100644 --- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx +++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx @@ -101,11 +101,11 @@ XBitmapListRef ViewElementListProvider::GetBitmapList() const //create chartspecific symbols for linecharts SdrObjList* ViewElementListProvider::GetSymbolList() const { - SdrObjList* m_pSymbolList = nullptr; - uno::Reference< drawing::XShapes > m_xSymbols(nullptr);//@todo this keeps the first drawinglayer alive ... + SdrObjList* pSymbolList = nullptr; + uno::Reference< drawing::XShapes > xSymbols(nullptr);//@todo this keeps the first drawinglayer alive ... try { - if(!m_pSymbolList || !m_pSymbolList->GetObjCount()) + if(!pSymbolList || !pSymbolList->GetObjCount()) { //@todo use mutex @@ -117,18 +117,18 @@ SdrObjList* ViewElementListProvider::GetSymbolList() const //create symbols via uno and convert to native sdr objects drawing::Direction3D aSymbolSize(220,220,0); // should be 250, but 250 -> 280 ?? - m_xSymbols = DataPointSymbolSupplier::create2DSymbolList( xShapeFactory, xTarget, aSymbolSize ); + xSymbols = DataPointSymbolSupplier::create2DSymbolList( xShapeFactory, xTarget, aSymbolSize ); - SdrObject* pSdrObject = DrawViewWrapper::getSdrObject( uno::Reference< drawing::XShape >( m_xSymbols, uno::UNO_QUERY ) ); + SdrObject* pSdrObject = DrawViewWrapper::getSdrObject( uno::Reference< drawing::XShape >( xSymbols, uno::UNO_QUERY ) ); if(pSdrObject) - m_pSymbolList = pSdrObject->GetSubList(); + pSymbolList = pSdrObject->GetSubList(); } } catch( const uno::Exception& e ) { ASSERT_EXCEPTION( e ); } - return m_pSymbolList; + return pSymbolList; } Graphic ViewElementListProvider::GetSymbolGraphic( sal_Int32 nStandardSymbol, const SfxItemSet* pSymbolShapeProperties ) const diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index 52451c938d2b..48ecfda6250e 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -101,19 +101,19 @@ SeriesOptionsItemConverter::SeriesOptionsItemConverter( sal_Int32 nAxisIndex = DataSeriesHelper::getAttachedAxisIndex(xDataSeries); - uno::Sequence< sal_Int32 > m_aBarPositionSequence; + uno::Sequence< sal_Int32 > aBarPositionSequence; uno::Reference< beans::XPropertySet > xChartTypeProps( xChartType, uno::UNO_QUERY ); if( xChartTypeProps.is() ) { - if( xChartTypeProps->getPropertyValue( "OverlapSequence" ) >>= m_aBarPositionSequence ) + if( xChartTypeProps->getPropertyValue( "OverlapSequence" ) >>= aBarPositionSequence ) { - if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() ) - m_nBarOverlap = m_aBarPositionSequence[nAxisIndex]; + if( nAxisIndex >= 0 && nAxisIndex < aBarPositionSequence.getLength() ) + m_nBarOverlap = aBarPositionSequence[nAxisIndex]; } - if( xChartTypeProps->getPropertyValue( "GapwidthSequence" ) >>= m_aBarPositionSequence ) + if( xChartTypeProps->getPropertyValue( "GapwidthSequence" ) >>= aBarPositionSequence ) { - if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() ) - m_nGapWidth = m_aBarPositionSequence[nAxisIndex]; + if( nAxisIndex >= 0 && nAxisIndex < aBarPositionSequence.getLength() ) + m_nGapWidth = aBarPositionSequence[nAxisIndex]; } } } @@ -220,22 +220,22 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf if( xChartTypeProps.is() ) { sal_Int32 nAxisIndex = DataSeriesHelper::getAttachedAxisIndex(xDataSeries); - uno::Sequence< sal_Int32 > m_aBarPositionSequence; + uno::Sequence< sal_Int32 > aBarPositionSequence; if( xChartTypeProps.is() ) { - if( xChartTypeProps->getPropertyValue( aPropName ) >>= m_aBarPositionSequence ) + if( xChartTypeProps->getPropertyValue( aPropName ) >>= aBarPositionSequence ) { bool bGroupBarsPerAxis = static_cast< const SfxBoolItem & >(rItemSet.Get( SCHATTR_GROUP_BARS_PER_AXIS )).GetValue(); if(!bGroupBarsPerAxis) { //set the same value for all axes - for( sal_Int32 nN = 0; nN < m_aBarPositionSequence.getLength(); nN++ ) - m_aBarPositionSequence[nN] = rBarPosition; + for( sal_Int32 nN = 0; nN < aBarPositionSequence.getLength(); nN++ ) + aBarPositionSequence[nN] = rBarPosition; } - else if( nAxisIndex >= 0 && nAxisIndex < m_aBarPositionSequence.getLength() ) - m_aBarPositionSequence[nAxisIndex] = rBarPosition; + else if( nAxisIndex >= 0 && nAxisIndex < aBarPositionSequence.getLength() ) + aBarPositionSequence[nAxisIndex] = rBarPosition; - xChartTypeProps->setPropertyValue( aPropName, uno::makeAny(m_aBarPositionSequence) ); + xChartTypeProps->setPropertyValue( aPropName, uno::makeAny(aBarPositionSequence) ); bChanged = true; } } diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx index 4b0102831fa5..3b00265b5957 100644 --- a/chart2/source/controller/main/ChartController_Insert.cxx +++ b/chart2/source/controller/main/ChartController_Insert.cxx @@ -108,11 +108,11 @@ void ChartController::executeDispatch_InsertAxes() InsertAxisOrGridDialogData aDialogOutput; aDlg->getResult( aDialogOutput ); - std::unique_ptr< ReferenceSizeProvider > mpRefSizeProvider( + std::unique_ptr< ReferenceSizeProvider > pRefSizeProvider( impl_createReferenceSizeProvider()); bool bChanged = AxisHelper::changeVisibilityOfAxes( xDiagram , aDialogInput.aExistenceList, aDialogOutput.aExistenceList, m_xCC - , mpRefSizeProvider.get() ); + , pRefSizeProvider.get() ); if( bChanged ) aUndoGuard.commit(); } |