From ad82e0d25ec6eb68361d67db8aaa1740ec70a5c5 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 13 Jun 2014 17:49:00 +0200 Subject: [PATCH] loplugin:staticcall Change-Id: I3f3adebc0916c96b50e15c68b627e655166e2551 --- chart2/source/controller/main/ChartFrameloader.cxx | 4 ++-- chart2/source/controller/main/ElementSelector.cxx | 2 +- chart2/source/view/axes/VCartesianAxis.cxx | 2 +- chart2/source/view/axes/VCartesianGrid.cxx | 2 +- chart2/source/view/axes/VPolarAngleAxis.cxx | 2 +- chart2/source/view/axes/VPolarGrid.cxx | 2 +- chart2/source/view/charttypes/AreaChart.cxx | 4 ++-- chart2/source/view/charttypes/BubbleChart.cxx | 2 +- chart2/source/view/charttypes/NetChart.cxx | 4 ++-- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index e9143553898a..567b150efe16 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -80,7 +80,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT utl::MediaDescriptor aMediaDescriptor(rMediaDescriptor); { - utl::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_MODEL())); + utl::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( utl::MediaDescriptor::PROP_MODEL())); if( aIt != aMediaDescriptor.end()) { xModel.set( (*aIt).second.get< uno::Reference< frame::XModel > >()); @@ -136,7 +136,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT if(!bHaveLoadedModel) try { - utl::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_URL())); + utl::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( utl::MediaDescriptor::PROP_URL())); if( aIt != aMediaDescriptor.end()) { OUString aURL( (*aIt).second.get< OUString >()); diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 7a5d4e2db901..dbfecd47f887 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -113,7 +113,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection() xChartView = xFact->createInstance( CHART_VIEW_SERVICE_NAME ); ExplicitValueProvider* pExplicitValueProvider = 0; //ExplicitValueProvider::getExplicitValueProvider(xChartView); this creates all visible data points, that's too much ObjectHierarchy aHierarchy( xChartDoc, pExplicitValueProvider, true /*bFlattenDiagram*/, true /*bOrderingForElementSelector*/ ); - lcl_addObjectsToList( aHierarchy, aHierarchy.getRootNodeOID(), m_aEntries, 0, xChartDoc ); + lcl_addObjectsToList( aHierarchy, ::chart::ObjectHierarchy::getRootNodeOID(), m_aEntries, 0, xChartDoc ); std::vector< ListBoxEntryData >::iterator aIt( m_aEntries.begin() ); if( bAddSelectionToList ) diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 1f1b1e3a53d2..4b59e3a90c1c 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -1647,7 +1647,7 @@ void VCartesianAxis::createShapes() m_xGroupShape_Shapes, aPoints , &m_aAxisProperties.m_aLineProperties ); //because of this name this line will be used for marking the axis - m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); + ::chart::AbstractShapeFactory::setShapeName( xShape, "MarkHandles" ); } //create an additional line at NULL if( !AxisHelper::isAxisPositioningEnabled() ) diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index ebff751bfb94..edef68f1dc4c 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -274,7 +274,7 @@ void VCartesianGrid::createShapes() aHandleLineProperties.LineStyle = uno::makeAny( drawing::LineStyle_NONE ); Reference< drawing::XShape > xHandleShape = m_pShapeFactory->createLine2D( xTarget, aHandlesPoints, &aHandleLineProperties ); - m_pShapeFactory->setShapeName( xHandleShape, "HandlesOnly" ); + ::chart::AbstractShapeFactory::setShapeName( xHandleShape, "HandlesOnly" ); } else //if(2!=m_nDimension) { diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index f0d172f9f478..adbf8e66884f 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -205,7 +205,7 @@ void VPolarAngleAxis::createShapes() uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( m_xGroupShape_Shapes, aPoints, &m_aAxisProperties.m_aLineProperties ); //because of this name this line will be used for marking the axis - m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); + ::chart::AbstractShapeFactory::setShapeName( xShape, "MarkHandles" ); //create labels createLabels(); diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index ceee94d9b99e..9ce621e3b2bc 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -215,7 +215,7 @@ void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogic Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xTarget, aAllPoints, &rLinePropertiesList[nDepth] ); //because of this name this line will be used for marking - m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); + ::chart::AbstractShapeFactory::setShapeName( xShape, "MarkHandles" ); } } diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index ce557adbf65d..99ff6e497b6a 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -466,7 +466,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); //because of this name this line will be used for marking - m_pShapeFactory->setShapeName(xShape, "MarkHandles"); + ::chart::AbstractShapeFactory::setShapeName(xShape, "MarkHandles"); } return true; } @@ -542,7 +542,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); //because of this name this line will be used for marking - m_pShapeFactory->setShapeName(xShape, "MarkHandles"); + ::chart::AbstractShapeFactory::setShapeName(xShape, "MarkHandles"); return true; } diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index c8c6db5ae00c..991884467eea 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -335,7 +335,7 @@ void BubbleChart::createShapes() pSeries->getValueByProperty(nIndex, "LineColor")))); } - m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); + ::chart::AbstractShapeFactory::setShapeName( xShape, "MarkHandles" ); //create data point label if( (**aSeriesIter).getDataPointLabelIfLabel(nIndex) ) diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index f50b231a0c95..5d735f79f1ca 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -174,7 +174,7 @@ bool NetChart::impl_createLine( VDataSeries* pSeries , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); //because of this name this line will be used for marking - m_pShapeFactory->setShapeName(xShape, "MarkHandles"); + ::chart::AbstractShapeFactory::setShapeName(xShape, "MarkHandles"); } return true; } @@ -245,7 +245,7 @@ bool NetChart::impl_createArea( VDataSeries* pSeries , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); //because of this name this line will be used for marking - m_pShapeFactory->setShapeName(xShape, "MarkHandles"); + ::chart::AbstractShapeFactory::setShapeName(xShape, "MarkHandles"); return true; }