diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-06-30 18:31:56 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-06-30 22:57:53 +0200 |
commit | 0cdcb21c90215f15e393d80eb7abdd85bdb89f64 (patch) | |
tree | 1a33b44ba08ec0bbc1c133b8f940e864d33659b1 /chart2 | |
parent | 117011cf10032e6ca93a8d502f794deb16c13a8f (diff) |
Upcoming improved loplugin:staticanonymous -> redundantstatic: chart2
Change-Id: If4e61fdcf1749b2900512ae788422c435ae6af0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97541
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/controller/main/ControllerCommandDispatch.cxx | 4 | ||||
-rw-r--r-- | chart2/source/controller/main/ElementSelector.cxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/ChartAxisPanel.cxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/ChartErrorBarPanel.cxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 2 | ||||
-rw-r--r-- | chart2/source/model/main/CartesianCoordinateSystem.cxx | 2 | ||||
-rw-r--r-- | chart2/source/model/main/PolarCoordinateSystem.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/CachedDataSequence.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/ConfigColorScheme.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/ErrorBar.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/InternalData.cxx | 2 | ||||
-rw-r--r-- | chart2/source/tools/InternalDataProvider.cxx | 12 | ||||
-rw-r--r-- | chart2/source/tools/ObjectIdentifier.cxx | 10 | ||||
-rw-r--r-- | chart2/source/tools/Scaling.cxx | 8 | ||||
-rw-r--r-- | chart2/source/tools/UncachedDataSequence.cxx | 2 | ||||
-rw-r--r-- | chart2/source/view/axes/DateScaling.cxx | 6 |
16 files changed, 31 insertions, 31 deletions
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index aa21b77fb451..6edaaff79592 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -86,8 +86,8 @@ namespace impl /// Constants for moving the series. namespace { - static bool const MOVE_SERIES_FORWARD = true; - static bool const MOVE_SERIES_BACKWARD = false; + bool const MOVE_SERIES_FORWARD = true; + bool const MOVE_SERIES_BACKWARD = false; } /** Represents the current state of the controller (needed for issue 63017). diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 46e601954e34..e1ef40a660be 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -48,7 +48,7 @@ using ::com::sun::star::uno::Sequence; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.ElementSelectorToolbarController"; +const char lcl_aServiceName[] = "com.sun.star.comp.chart.ElementSelectorToolbarController"; } SelectorListBox::SelectorListBox(vcl::Window* pParent) diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index 593071ac1ab3..77fdaf45f119 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -71,7 +71,7 @@ struct AxisLabelPosMap css::chart::ChartAxisLabelPosition ePos; }; -static AxisLabelPosMap const aLabelPosMap[] = { +AxisLabelPosMap const aLabelPosMap[] = { { 0, css::chart::ChartAxisLabelPosition_NEAR_AXIS }, { 1, css::chart::ChartAxisLabelPosition_NEAR_AXIS_OTHER_SIDE }, { 2, css::chart::ChartAxisLabelPosition_OUTSIDE_START }, diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index 819f8f1ed2dd..c31990146953 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -112,7 +112,7 @@ struct ErrorBarTypeMap sal_Int32 nApi; }; -static ErrorBarTypeMap const aErrorBarType[] = { +ErrorBarTypeMap const aErrorBarType[] = { { 0, css::chart::ErrorBarStyle::ABSOLUTE }, { 1, css::chart::ErrorBarStyle::RELATIVE }, { 2, css::chart::ErrorBarStyle::FROM_DATA }, diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 7bb5646c21a5..83a3251925f1 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -74,7 +74,7 @@ struct LabelPlacementMap sal_Int32 nApi; }; -static LabelPlacementMap const aLabelPlacementMap[] = { +LabelPlacementMap const aLabelPlacementMap[] = { { 0, css::chart::DataLabelPlacement::TOP }, { 1, css::chart::DataLabelPlacement::BOTTOM }, { 2, css::chart::DataLabelPlacement::CENTER }, diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index 288749d8540e..dd0f77b40e58 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -31,7 +31,7 @@ namespace com::sun::star::uno { class XComponentContext; } namespace { -static const char CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME[] = "com.sun.star.chart2.CoordinateSystems.Cartesian"; +const char CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME[] = "com.sun.star.chart2.CoordinateSystems.Cartesian"; } diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index f6780bbb54a3..5ec3252ae582 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -31,7 +31,7 @@ using ::com::sun::star::uno::Sequence; namespace { -static const char CHART2_COOSYSTEM_POLAR_SERVICE_NAME[] = "com.sun.star.chart2.CoordinateSystems.Polar"; +const char CHART2_COOSYSTEM_POLAR_SERVICE_NAME[] = "com.sun.star.chart2.CoordinateSystems.Polar"; } diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 95777aa0e560..4eaf5d8f2743 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -42,7 +42,7 @@ using ::chart::impl::CachedDataSequence_Base; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.CachedDataSequence"; +const char lcl_aServiceName[] = "com.sun.star.comp.chart.CachedDataSequence"; enum { diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index e3bdb20fac04..5645fb22b68f 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -34,7 +34,7 @@ using ::com::sun::star::uno::Sequence; namespace { -static const char aSeriesPropName[] = "Series"; +const char aSeriesPropName[] = "Series"; } // anonymous namespace diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 5191e4f3d64c..77dd69705211 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart2.ErrorBar"; +const char lcl_aServiceName[] = "com.sun.star.comp.chart2.ErrorBar"; bool lcl_isInternalData( const uno::Reference< chart2::data::XLabeledDataSequence > & xLSeq ) { diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index 5fc4d17244a4..91a9fbaa16fa 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -85,7 +85,7 @@ InternalData::InternalData() , m_aColumnLabels( 0 ) {} -static const double fDefaultData[] = { +const double fDefaultData[] = { 9.10, 3.20, 4.54, 2.40, 8.80, 9.65, 3.10, 1.50, 3.70, diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index ff89bc6dee92..9d78d9ffc758 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -57,12 +57,12 @@ namespace chart namespace { -static const char lcl_aCategoriesRangeName[] = "categories"; -static const char lcl_aCategoriesLevelRangeNamePrefix[] = "categoriesL "; //L <-> level -static const char lcl_aCategoriesPointRangeNamePrefix[] = "categoriesP "; //P <-> point -static const char lcl_aCategoriesRoleName[] = "categories"; -static const char lcl_aLabelRangePrefix[] = "label "; -static const char lcl_aCompleteRange[] = "all"; +const char lcl_aCategoriesRangeName[] = "categories"; +const char lcl_aCategoriesLevelRangeNamePrefix[] = "categoriesL "; //L <-> level +const char lcl_aCategoriesPointRangeNamePrefix[] = "categoriesP "; //P <-> point +const char lcl_aCategoriesRoleName[] = "categories"; +const char lcl_aLabelRangePrefix[] = "label "; +const char lcl_aCompleteRange[] = "all"; typedef std::multimap< OUString, uno::WeakReference< chart2::data::XDataSequence > > lcl_tSequenceMap; diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx index be592b9522df..2b7628f7a0ab 100644 --- a/chart2/source/tools/ObjectIdentifier.cxx +++ b/chart2/source/tools/ObjectIdentifier.cxx @@ -52,11 +52,11 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -static const char m_aMultiClick[] = "MultiClick"; -static const char m_aDragMethodEquals[] = "DragMethod="; -static const char m_aDragParameterEquals[] = "DragParameter="; -static const char m_aProtocol[] = "CID/"; -static const OUString m_aPieSegmentDragMethodServiceName("PieSegmentDragging"); +const char m_aMultiClick[] = "MultiClick"; +const char m_aDragMethodEquals[] = "DragMethod="; +const char m_aDragParameterEquals[] = "DragParameter="; +const char m_aProtocol[] = "CID/"; +const OUString m_aPieSegmentDragMethodServiceName("PieSegmentDragging"); namespace { diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 82ce8149b704..27a9c51a7a44 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -27,10 +27,10 @@ namespace com::sun::star::uno { class XComponentContext; } namespace { -static const char lcl_aServiceName_Logarithmic[] = "com.sun.star.chart2.LogarithmicScaling"; -static const char lcl_aServiceName_Exponential[] = "com.sun.star.chart2.ExponentialScaling"; -static const char lcl_aServiceName_Linear[] = "com.sun.star.chart2.LinearScaling"; -static const char lcl_aServiceName_Power[] = "com.sun.star.chart2.PowerScaling"; +const char lcl_aServiceName_Logarithmic[] = "com.sun.star.chart2.LogarithmicScaling"; +const char lcl_aServiceName_Exponential[] = "com.sun.star.chart2.ExponentialScaling"; +const char lcl_aServiceName_Linear[] = "com.sun.star.chart2.LinearScaling"; +const char lcl_aServiceName_Power[] = "com.sun.star.chart2.PowerScaling"; } diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 59fc826d3629..8851988b6d85 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -41,7 +41,7 @@ using ::chart::impl::UncachedDataSequence_Base; namespace { -static const char lcl_aServiceName[] = "com.sun.star.comp.chart.UncachedDataSequence"; +const char lcl_aServiceName[] = "com.sun.star.comp.chart.UncachedDataSequence"; enum { diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx index 292f24b7edee..60ffc14bbfae 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -25,10 +25,10 @@ namespace { -static const char lcl_aServiceName_DateScaling[] = "com.sun.star.chart2.DateScaling"; -static const char lcl_aServiceName_InverseDateScaling[] = "com.sun.star.chart2.InverseDateScaling"; +const char lcl_aServiceName_DateScaling[] = "com.sun.star.chart2.DateScaling"; +const char lcl_aServiceName_InverseDateScaling[] = "com.sun.star.chart2.InverseDateScaling"; -static const double lcl_fNumberOfMonths = 12.0;//todo: this needs to be offered by basic tools Date class if it should be more generic +const double lcl_fNumberOfMonths = 12.0;//todo: this needs to be offered by basic tools Date class if it should be more generic } namespace chart |