mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:staticmethods

Browse Source 
Change-Id: Iab2f10b000ef41fb090e0034785d4ed0bda4cf43
This commit is contained in:
Noel Grandin 2015-04-22 15:17:23 +02:00
parent 0a7b739cc3
commit 7ab8b08b6c
79 changed files with 130 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
View File

@ -52,7 +52,7 @@ struct StaticAreaWrapperPropertyArray_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );

2
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
View File

@ -367,7 +367,7 @@ struct StaticAxisWrapperPropertyArray_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
View File

@ -249,7 +249,7 @@ struct StaticChartDocumentWrapperPropertyArray_Initializer
}
private:
uno::Sequence< Property > lcl_GetPropertySequence()
static uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

2
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
View File

@ -459,7 +459,7 @@ struct StaticDiagramWrapperPropertyArray_Initializer
}
private:
uno::Sequence< Property > lcl_GetPropertySequence()
static uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

2
chart2/source/controller/chartapiwrapper/GridWrapper.cxx
View File

@ -55,7 +55,7 @@ struct StaticGridWrapperPropertyArray_Initializer
return &aPropSeq;
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );

2
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
View File

@ -246,7 +246,7 @@ struct StaticLegendWrapperPropertyArray_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
View File

@ -53,7 +53,7 @@ struct StaticMinMaxLineWrapperDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
}
@ -72,7 +72,7 @@ struct StaticMinMaxLineWrapperPropertyArray_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;

2
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
View File

@ -111,7 +111,7 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private: //methods
::cppu::IPropertyArrayHelper& getInfoHelper();
static ::cppu::IPropertyArrayHelper& getInfoHelper();
private: //member
::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;

2
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
View File

@ -170,7 +170,7 @@ struct StaticTitleWrapperPropertyArray_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
View File

@ -53,7 +53,7 @@ struct StaticUpDownBarWrapperPropertyArray_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
@ -108,7 +108,7 @@ struct StaticUpDownBarWrapperDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );

2
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
View File

@ -110,7 +110,7 @@ public:
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private: //methods
::cppu::IPropertyArrayHelper& getInfoHelper();
static ::cppu::IPropertyArrayHelper& getInfoHelper();
private: //member
::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;

2
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
View File

@ -56,7 +56,7 @@ struct StaticWallFloorWrapperPropertyArray_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
::chart::FillProperties::AddPropertiesToVector( aProperties );

2
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
View File

@ -180,7 +180,7 @@ public:
virtual ~WrappedStatisticProperty() {};
protected:
uno::Reference< beans::XPropertySet > getOrCreateErrorBarProperties( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const
static uno::Reference< beans::XPropertySet > getOrCreateErrorBarProperties( const Reference< beans::XPropertySet >& xSeriesPropertySet )
{
if(!xSeriesPropertySet.is())
return 0;

2
chart2/source/controller/dialogs/DataBrowser.cxx
View File

@ -623,7 +623,7 @@ OUString DataBrowser::GetColString( sal_Int32 nColumnId ) const
return OUString();
}
OUString DataBrowser::GetRowString( sal_Int32 nRow ) const
OUString DataBrowser::GetRowString( sal_Int32 nRow )
{
return OUString::number(nRow + 1);
}

2
chart2/source/controller/dialogs/DataBrowser.hxx
View File

@ -180,7 +180,7 @@ private:
void ImplAdjustHeaderControls();
OUString GetColString( sal_Int32 nColumnId ) const;
OUString GetRowString( sal_Int32 nRow ) const;
static OUString GetRowString( sal_Int32 nRow );
DECL_LINK( SeriesHeaderGotFocus, impl::SeriesHeaderEdit* );
DECL_LINK( SeriesHeaderChanged, impl::SeriesHeaderEdit* );

2
chart2/source/controller/dialogs/DialogModel.cxx
View File

@ -515,7 +515,7 @@ void addNewSeriesToContainer(
DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
const Reference< XDataSeries > & xSeries,
const OUString & aRoleOfSequenceForLabel,
const Reference< chart2::XChartType > & xChartType ) const
const Reference< chart2::XChartType > & xChartType )
{
DialogModel::tRolesWithRanges aResult;
try

4
chart2/source/controller/dialogs/DialogModel.hxx
View File

@ -99,12 +99,12 @@ public:
::std::vector< tSeriesWithChartTypeByName >
getAllDataSeriesWithLabel() const;
tRolesWithRanges getRolesWithRanges(
static tRolesWithRanges getRolesWithRanges(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries > & xSeries,
const OUString & aRoleOfSequenceForLabel,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartType > & xChartType ) const;
::com::sun::star::chart2::XChartType > & xChartType );
enum eMoveDirection
{

2
chart2/source/controller/dialogs/tp_DataSource.cxx
View File

@ -439,7 +439,7 @@ void DataSourceTabPage::fillRoleListBox()
if( bHasSelectedEntry )
{
DialogModel::tRolesWithRanges aRoles(
m_rDialogModel.getRolesWithRanges(
DialogModel::getRolesWithRanges(
pSeriesEntry->m_xDataSeries,
lcl_GetSequenceNameForLabel( pSeriesEntry ),
pSeriesEntry->m_xChartType ));

2
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
View File

@ -302,7 +302,7 @@ SdrObject* DrawViewWrapper::getNamedSdrObject( const OUString& rName ) const
return 0;
}
bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt ) const
bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt )
{
if(pObj)
{

2
chart2/source/controller/inc/DrawViewWrapper.hxx
View File

@ -75,7 +75,7 @@ public:
SfxItemSet getPositionAndSizeItemSetFromMarkedObject() const;
SdrObject* getNamedSdrObject( const OUString& rName ) const;
bool IsObjectHit( SdrObject* pObj, const Point& rPnt ) const;
static bool IsObjectHit( SdrObject* pObj, const Point& rPnt );
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE;

2
chart2/source/controller/inc/dlg_DataEditor.hxx
View File

@ -102,7 +102,7 @@ private:
@note this code is taken from dbaccess/source/ui/inc/UITools.hxx
*/
void notifySystemWindow(vcl::Window* pWindow,
static void notifySystemWindow(vcl::Window* pWindow,
vcl::Window* pToRegister,
const ::comphelper::mem_fun1_t<TaskPaneList, vcl::Window*>& rMemFunc);
};

2
chart2/source/controller/main/ChartController.hxx
View File

@ -651,7 +651,7 @@ private:
const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY );
bool impl_DragDataPoint( const OUString & rCID, double fOffset );
::std::set< OUString > impl_getAvailableCommands();
static ::std::set< OUString > impl_getAvailableCommands();
/** Creates a helper accesibility class that must be initialized via XInitialization. For
parameters see

2
chart2/source/controller/main/CommandDispatchContainer.hxx
View File

@ -105,7 +105,7 @@ public:
void DisposeAndClear();
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >
static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >
getContainerDispatchForURL(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > & xChartController,
const ::com::sun::star::util::URL & rURL );

2
chart2/source/controller/main/ObjectHierarchy.cxx
View File

@ -146,7 +146,7 @@ private:
void createDataSeriesTree(
ObjectHierarchy::tChildContainer & rOutDiagramSubContainer,
const Reference< XDiagram > & xDiagram );
void createWallAndFloor(
static void createWallAndFloor(
ObjectHierarchy::tChildContainer & rContainer,
const Reference< XDiagram > & xDiagram );
void createLegendTree(

8
chart2/source/controller/main/SelectionHelper.cxx
View File

@ -260,7 +260,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
SdrObject* pDiagram = pDrawViewWrapper->getNamedSdrObject( aDiagramCID );
if( pDiagram )
{
if( pDrawViewWrapper->IsObjectHit( pDiagram, rMousePos ) )
if( DrawViewWrapper::IsObjectHit( pDiagram, rMousePos ) )
{
m_aSelectedOID = ObjectIdentifier( aDiagramCID );
}
@ -273,7 +273,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
SdrObject* pLegend = pDrawViewWrapper->getNamedSdrObject( aLegendCID );
if( pLegend )
{
if( pDrawViewWrapper->IsObjectHit( pLegend, rMousePos ) )
if( DrawViewWrapper::IsObjectHit( pLegend, rMousePos ) )
{
m_aSelectedOID = ObjectIdentifier( aLegendCID );
}
@ -375,7 +375,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
return false;
SolarMutexGuard aSolarGuard;
SdrObject* pObj = rDrawViewWrapper.getNamedSdrObject( rNameOfSelectedObject );
if( !rDrawViewWrapper.IsObjectHit( pObj, rMPos ) )
if( !DrawViewWrapper::IsObjectHit( pObj, rMPos ) )
return false;
return true;
}
@ -423,7 +423,7 @@ OUString SelectionHelper::getHitObjectCID(
SdrObject* pDiagram = rDrawViewWrapper.getNamedSdrObject( aDiagramCID );
if( pDiagram )
{
if( rDrawViewWrapper.IsObjectHit( pDiagram, rMPos ) )
if( DrawViewWrapper::IsObjectHit( pDiagram, rMPos ) )
{
aRet = aDiagramCID;
}

4
chart2/source/inc/RegressionCurveCalculator.hxx
View File

@ -45,10 +45,10 @@ protected:
const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatter >& xNumFormatter,
sal_Int32 nNumberFormatKey ) const = 0;
OUString getFormattedString(
static OUString getFormattedString(
const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatter >& xNumFormatter,
sal_Int32 nNumberFormatKey,
double fNumber ) const;
double fNumber );
double m_fCorrelationCoeffitient;

4
chart2/source/model/main/Axis.cxx
View File

@ -221,7 +221,7 @@ struct StaticAxisDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::CharacterProperties::AddDefaultsToMap( rOutMap );
::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
@ -262,7 +262,7 @@ struct StaticAxisInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/main/BaseCoordinateSystem.cxx
View File

@ -67,7 +67,7 @@ struct StaticCooSysDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_COORDINATESYSTEM_SWAPXANDYAXIS, false );
}
@ -86,7 +86,7 @@ struct StaticCooSysInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

2
chart2/source/model/main/DataPoint.cxx
View File

@ -51,7 +51,7 @@ struct StaticDataPointInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
::chart::DataPointProperties::AddPropertiesToVector( aProperties );

4
chart2/source/model/main/Diagram.cxx
View File

@ -210,7 +210,7 @@ struct StaticDiagramDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_POSSIZE_EXCLUDE_LABELS, true );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DIAGRAM_SORT_BY_X_VALUES, false );
@ -240,7 +240,7 @@ struct StaticDiagramInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/main/FormattedString.cxx
View File

@ -46,7 +46,7 @@ struct StaticFormattedStringDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::CharacterProperties::AddDefaultsToMap( rOutMap );
}
@ -65,7 +65,7 @@ struct StaticFormattedStringInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
::chart::CharacterProperties::AddPropertiesToVector( aProperties );

4
chart2/source/model/main/GridProperties.cxx
View File

@ -66,7 +66,7 @@ struct StaticGridDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
@ -91,7 +91,7 @@ struct StaticGridInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/main/Legend.cxx
View File

@ -115,7 +115,7 @@ struct StaticLegendDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );
@ -145,7 +145,7 @@ struct StaticLegendInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/main/PageBackground.cxx
View File

@ -52,7 +52,7 @@ struct StaticPageBackgroundDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );
@ -76,7 +76,7 @@ struct StaticPageBackgroundInfoHelper_Initializer
}
private:
uno::Sequence< Property > lcl_GetPropertySequence()
static uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );

4
chart2/source/model/main/StockBar.cxx
View File

@ -50,7 +50,7 @@ struct StaticStockBarInfoHelper_Initializer
}
private:
uno::Sequence< Property > lcl_GetPropertySequence()
static uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
@ -92,7 +92,7 @@ struct StaticStockBarDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );

4
chart2/source/model/main/Title.cxx
View File

@ -155,7 +155,7 @@ struct StaticTitleDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );
@ -194,7 +194,7 @@ struct StaticTitleInfoHelper_Initializer
}
private:
uno::Sequence< Property > lcl_GetPropertySequence()
static uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/main/Wall.cxx
View File

@ -55,7 +55,7 @@ struct StaticWallDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );
@ -78,7 +78,7 @@ struct StaticWallInfoHelper_Initializer
}
private:
uno::Sequence< Property > lcl_GetPropertySequence()
static uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );

4
chart2/source/model/template/AreaChartTypeTemplate.cxx
View File

@ -65,7 +65,7 @@ struct StaticAreaChartTypeTemplateDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_AREA_TEMPLATE_DIMENSION, 2 );
}
@ -84,7 +84,7 @@ struct StaticAreaChartTypeTemplateInfoHelper_Initializer
}
private:
uno::Sequence< Property > lcl_GetPropertySequence()
static uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/template/BarChartTypeTemplate.cxx
View File

@ -72,7 +72,7 @@ struct StaticBarChartTypeTemplateDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_BAR_TEMPLATE_DIMENSION, 2 );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_BAR_TEMPLATE_GEOMETRY3D, ::chart2::DataPointGeometry3D::CUBOID );
@ -92,7 +92,7 @@ struct StaticBarChartTypeTemplateInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

2
chart2/source/model/template/BubbleChartType.cxx
View File

@ -63,7 +63,7 @@ struct StaticBubbleChartTypeInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;

2
chart2/source/model/template/BubbleChartTypeTemplate.cxx
View File

@ -65,7 +65,7 @@ struct StaticBubbleChartTypeTemplateInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;

4
chart2/source/model/template/CandleStickChartType.cxx
View File

@ -93,7 +93,7 @@ struct StaticCandleStickChartTypeDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
// must match default in CTOR!
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CANDLESTICKCHARTTYPE_JAPANESE, false );
@ -115,7 +115,7 @@ struct StaticCandleStickChartTypeInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/template/ColumnChartType.cxx
View File

@ -65,7 +65,7 @@ struct StaticColumnChartTypeDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
Sequence< sal_Int32 > aSeq(2);
@ -90,7 +90,7 @@ struct StaticColumnChartTypeInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
View File

@ -70,7 +70,7 @@ struct StaticColumnLineChartTypeTemplateDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_COL_LINE_NUMBER_OF_LINES, 1 );
}
@ -89,7 +89,7 @@ struct StaticColumnLineChartTypeTemplateInfoHelper_Initializer
}
private:
uno::Sequence< Property > lcl_GetPropertySequence()
static uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/template/GL3DBarChartType.cxx
View File

@ -40,7 +40,7 @@ struct DefaultsInitializer
}
private:
void addDefaults( tPropertyValueMap & rOutMap )
static void addDefaults( tPropertyValueMap & rOutMap )
{
PropertyHelper::setPropertyValueDefault(rOutMap, PROP_GL3DCHARTTYPE_ROUNDED_EDGE, false);
}
@ -56,7 +56,7 @@ struct InfoHelperInitializer
return &aHelper;
}
uno::Sequence<beans::Property> getProperties()
static uno::Sequence<beans::Property> getProperties()
{
uno::Sequence<beans::Property> aRet(1);

4
chart2/source/model/template/GL3DBarChartTypeTemplate.cxx
View File

@ -43,7 +43,7 @@ struct DefaultsInitializer
}
private:
void addDefaults( tPropertyValueMap & rOutMap )
static void addDefaults( tPropertyValueMap & rOutMap )
{
PropertyHelper::setPropertyValueDefault(rOutMap, PROP_GL3DCHARTTYPE_ROUNDED_EDGE, false);
}
@ -59,7 +59,7 @@ struct InfoHelperInitializer
return &aHelper;
}
uno::Sequence<beans::Property> getProperties()
static uno::Sequence<beans::Property> getProperties()
{
uno::Sequence<beans::Property> aRet(1);

4
chart2/source/model/template/LineChartType.cxx
View File

@ -79,7 +79,7 @@ struct StaticLineChartTypeDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_CURVE_STYLE, ::chart2::CurveStyle_LINES );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_CURVE_RESOLUTION, 20 );
@ -103,7 +103,7 @@ struct StaticLineChartTypeInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/template/LineChartTypeTemplate.cxx
View File

@ -84,7 +84,7 @@ struct StaticLineChartTypeTemplateDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_LINECHARTTYPE_TEMPLATE_CURVE_STYLE, chart2::CurveStyle_LINES );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_LINECHARTTYPE_TEMPLATE_CURVE_RESOLUTION, 20 );
@ -108,7 +108,7 @@ struct StaticLineChartTypeTemplateInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/template/PieChartType.cxx
View File

@ -71,7 +71,7 @@ struct StaticPieChartTypeDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PIECHARTTYPE_USE_RINGS, false );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_PIECHARTTYPE_3DRELATIVEHEIGHT, 100 );
@ -91,7 +91,7 @@ struct StaticPieChartTypeInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/template/PieChartTypeTemplate.cxx
View File

@ -95,7 +95,7 @@ struct StaticPieChartTypeTemplateDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_PIE_TEMPLATE_OFFSET_MODE, chart2::PieChartOffsetMode_NONE );
::chart::PropertyHelper::setPropertyValueDefault< double >( rOutMap, PROP_PIE_TEMPLATE_DEFAULT_OFFSET, 0.5 );
@ -117,7 +117,7 @@ struct StaticPieChartTypeTemplateInfoHelper_Initializer
}
private:
uno::Sequence< Property > lcl_GetPropertySequence()
static uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/template/ScatterChartType.cxx
View File

@ -83,7 +83,7 @@ struct StaticScatterChartTypeDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCATTERCHARTTYPE_CURVE_STYLE, chart2::CurveStyle_LINES );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_CURVE_RESOLUTION, 20 );
@ -107,7 +107,7 @@ struct StaticScatterChartTypeInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/template/ScatterChartTypeTemplate.cxx
View File

@ -86,7 +86,7 @@ struct StaticScatterChartTypeTemplateDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_STYLE, chart2::CurveStyle_LINES );
::chart::PropertyHelper::setPropertyValueDefault< sal_Int32 >( rOutMap, PROP_SCATTERCHARTTYPE_TEMPLATE_CURVE_RESOLUTION, 20 );
@ -110,7 +110,7 @@ struct StaticScatterChartTypeTemplateInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/model/template/StockChartTypeTemplate.cxx
View File

@ -97,7 +97,7 @@ struct StaticStockChartTypeTemplateDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME, false );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_STOCKCHARTTYPE_TEMPLATE_OPEN, false );
@ -119,7 +119,7 @@ struct StaticStockChartTypeTemplateInfoHelper_Initializer
}
private:
Sequence< Property > lcl_GetPropertySequence()
static Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

2
chart2/source/tools/RegressionCurveCalculator.cxx
View File

@ -82,7 +82,7 @@ void RegressionCurveCalculator::setRegressionProperties(
OUString RegressionCurveCalculator::getFormattedString(
const Reference< util::XNumberFormatter >& xNumFormatter,
sal_Int32 nNumberFormatKey,
double fNumber ) const
double fNumber )
{
OUString aResult;

4
chart2/source/tools/RegressionCurveModel.cxx
View File

@ -128,7 +128,7 @@ struct StaticXXXDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
}
@ -147,7 +147,7 @@ struct StaticRegressionCurveInfoHelper_Initializer
}
private:
uno::Sequence< Property > lcl_GetPropertySequence()
static uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

4
chart2/source/tools/RegressionEquation.cxx
View File

@ -106,7 +106,7 @@ struct StaticRegressionEquationDefaults_Initializer
return &aStaticDefaults;
}
private:
void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
static void lcl_AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap )
{
::chart::LinePropertiesHelper::AddDefaultsToMap( rOutMap );
::chart::FillProperties::AddDefaultsToMap( rOutMap );
@ -140,7 +140,7 @@ struct StaticRegressionEquationInfoHelper_Initializer
}
private:
uno::Sequence< Property > lcl_GetPropertySequence()
static uno::Sequence< Property > lcl_GetPropertySequence()
{
::std::vector< ::com::sun::star::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );

2
chart2/source/view/axes/VAxisBase.hxx
View File

@ -65,7 +65,7 @@ public:
void setExtraLinePositionAtOtherAxis( double fCrossingAt );
protected: //methods
size_t getIndexOfLongestLabel( const css::uno::Sequence<OUString>& rLabels );
static size_t getIndexOfLongestLabel( const css::uno::Sequence<OUString>& rLabels );
void removeTextShapesFromTicks();
void updateUnscaledValuesAtTicks( TickIter& rIter );

2
chart2/source/view/axes/VCartesianAxis.cxx
View File

@ -499,7 +499,7 @@ bool VCartesianAxis::isBreakOfLabelsAllowed(
}
bool VCartesianAxis::isAutoStaggeringOfLabelsAllowed(
const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ) const
const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis )
{
if( rAxisLabelProperties.eStaggering != STAGGER_AUTO )
return false;

4
chart2/source/view/axes/VCartesianAxis.hxx
View File

@ -150,8 +150,8 @@ private: //methods
* @return true if we can try to stagger labels in order to avoid
* overlaps, otherwise false.
*/
bool isAutoStaggeringOfLabelsAllowed(
const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ) const;
static bool isAutoStaggeringOfLabelsAllowed(
const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis );
/**
* @return true if we can break a single line label text into multiple

2
chart2/source/view/axes/VCartesianCoordinateSystem.cxx
View File

@ -79,7 +79,7 @@ void VCartesianCoordinateSystem::createGridShapes()
if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel ))
continue;
VCartesianGrid aGrid(nDimensionIndex,nDimensionCount,this->getGridListFromAxis( xAxis ));
VCartesianGrid aGrid(nDimensionIndex,nDimensionCount, getGridListFromAxis( xAxis ));
aGrid.setExplicitScaleAndIncrement( this->getExplicitScale(nDimensionIndex,nAxisIndex)
, this->getExplicitIncrement(nDimensionIndex,nAxisIndex) );
aGrid.set3DWallPositions( m_eLeftWallPos, m_eBackWallPos, m_eBottomPos );

2
chart2/source/view/axes/VCoordinateSystem.cxx
View File

@ -221,7 +221,7 @@ Sequence< Reference< beans::XPropertySet > > VCoordinateSystem::getGridListFromA
return ContainerHelper::ContainerToSequence( aRet );
}
void VCoordinateSystem::impl_adjustDimension( sal_Int32& rDimensionIndex ) const
void VCoordinateSystem::impl_adjustDimension( sal_Int32& rDimensionIndex )
{
if( rDimensionIndex<0 )
rDimensionIndex=0;

2
chart2/source/view/axes/VPolarCoordinateSystem.cxx
View File

@ -173,7 +173,7 @@ void VPolarCoordinateSystem::createGridShapes()
if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel ))
continue;
VPolarGrid aGrid(nDimensionIndex,nDimensionCount,this->getGridListFromAxis( xAxis ));
VPolarGrid aGrid(nDimensionIndex,nDimensionCount,getGridListFromAxis( xAxis ));
aGrid.setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) );
aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory
, this->createCIDForGrid( xAxis, nDimensionIndex, nAxisIndex ) );

4
chart2/source/view/charttypes/AreaChart.cxx
View File

@ -462,7 +462,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries
{
xShape = m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes
, PolyToPointSequence( aPoly ) );
this->setMappedProperties( xShape
setMappedProperties( xShape
, pSeries->getPropertiesOfSeries()
, PropertyMapper::getPropertyNameMapForLineSeriesProperties() );
//because of this name this line will be used for marking
@ -538,7 +538,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries
xShape = m_pShapeFactory->createArea2D( xSeriesGroupShape_Shapes
, aPoly );
}
this->setMappedProperties( xShape
setMappedProperties( xShape
, pSeries->getPropertiesOfSeries()
, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() );
//because of this name this line will be used for marking

2
chart2/source/view/charttypes/AreaChart.hxx
View File

@ -63,7 +63,7 @@ private: //methods
bool impl_createLine( VDataSeries* pSeries
, ::com::sun::star::drawing::PolyPolygonShape3D* pSeriesPoly
, PlottingPositionHelper* pPosHelper );
bool create_stepped_line( ::com::sun::star::drawing::PolyPolygonShape3D aStartPoly
static bool create_stepped_line( ::com::sun::star::drawing::PolyPolygonShape3D aStartPoly
, ::com::sun::star::chart2::CurveStyle eCurveStyle
, PlottingPositionHelper* pPosHelper
, ::com::sun::star::drawing::PolyPolygonShape3D &aPoly );

6
chart2/source/view/charttypes/BarChart.cxx
View File

@ -316,7 +316,7 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint3D_Bar(
return xShape;
}
if( nGeometry3D != DataPointGeometry3D::PYRAMID )
this->setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() );
setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() );
return xShape;
}
@ -801,7 +801,7 @@ void BarChart::createShapes()
AddPointToPoly( aPoly, drawing::Position3D( fLogicX-fLogicBarWidth/2.0,fLowerYValue,fLogicZ) );
pPosHelper->transformScaledLogicToScene( aPoly );
xShape = m_pShapeFactory->createArea2D( xPointGroupShape_Shapes, aPoly );
this->setMappedProperties( xShape, xDataPointProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() );
setMappedProperties( xShape, xDataPointProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() );
}
if(bHasFillColorMapping)
@ -913,7 +913,7 @@ void BarChart::createShapes()
getSeriesGroupShape(*aSeriesIter, xSeriesTarget) );
uno::Reference< drawing::XShape > xShape( m_pShapeFactory->createLine2D(
xSeriesGroupShape_Shapes, PolyToPointSequence( aPoly ) ) );
this->setMappedProperties( xShape, pSeries->getPropertiesOfSeries()
setMappedProperties( xShape, pSeries->getPropertiesOfSeries()
, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() );
}
}

2
chart2/source/view/charttypes/BubbleChart.cxx
View File

@ -317,7 +317,7 @@ void BubbleChart::createShapes()
xShape = m_pShapeFactory->createCircle2D( xPointGroupShape_Shapes
, aScenePosition, aSymbolSize );
this->setMappedProperties( xShape
setMappedProperties( xShape
, pSeries->getPropertiesOfPoint( nIndex )
, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() );

4
chart2/source/view/charttypes/CandleStickChart.cxx
View File

@ -239,7 +239,7 @@ void CandleStickChart::createShapes()
uno::Reference< drawing::XShape > xShape =
m_pShapeFactory->createLine2D( xPointGroupShape_Shapes,
PolyToPointSequence(aPoly), NULL);
this->setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() );
setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() );
}
//create first-last shape
@ -294,7 +294,7 @@ void CandleStickChart::createShapes()
uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
if(xProp.is())
{
this->setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() );
setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() );
}
}
}

2
chart2/source/view/charttypes/GL3DBarChart.cxx
View File

@ -424,7 +424,7 @@ void RenderBenchMarkThread::ProcessClickFlyBack()
if (!mbNeedFlyBack)
return;
osl_getSystemTime(&maClickFlyBackEndTime);
int nDeltaMs = mpChart->calcTimeInterval(maClickFlyBackStartTime, maClickFlyBackEndTime);
int nDeltaMs = GL3DBarChart::calcTimeInterval(maClickFlyBackStartTime, maClickFlyBackEndTime);
if(nDeltaMs >= 10000)
{
mpChart->maRenderEvent = EVENT_MOVE_TO_DEFAULT;

4
chart2/source/view/charttypes/NetChart.cxx
View File

@ -170,7 +170,7 @@ bool NetChart::impl_createLine( VDataSeries* pSeries
{
xShape = m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes
, PolyToPointSequence( aPoly ) );
this->setMappedProperties( xShape
setMappedProperties( xShape
, pSeries->getPropertiesOfSeries()
, PropertyMapper::getPropertyNameMapForLineSeriesProperties() );
//because of this name this line will be used for marking
@ -241,7 +241,7 @@ bool NetChart::impl_createArea( VDataSeries* pSeries
uno::Reference< drawing::XShape >
xShape = m_pShapeFactory->createArea2D( xSeriesGroupShape_Shapes
, aPoly );
this->setMappedProperties( xShape
setMappedProperties( xShape
, pSeries->getPropertiesOfSeries()
, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() );
//because of this name this line will be used for marking

2
chart2/source/view/charttypes/PieChart.cxx
View File

@ -263,7 +263,7 @@ uno::Reference< drawing::XShape > PieChart::createDataPoint(
, rParam.mfUnitCircleInnerRadius, rParam.mfUnitCircleOuterRadius
, aOffset, B3DHomMatrixToHomogenMatrix( m_pPosHelper->getUnitCartesianToScene() ) );
}
this->setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties(), pOverwritePropertiesMap );
setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties(), pOverwritePropertiesMap );
return xShape;
}

2
chart2/source/view/charttypes/VSeriesPlotter.cxx
View File

@ -929,7 +929,7 @@ void VSeriesPlotter::createErrorBar(
}
uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xTarget, PolyToPointSequence( aPoly) );
this->setMappedProperties( xShape, xErrorBarProperties, PropertyMapper::getPropertyNameMapForLineProperties() );
setMappedProperties( xShape, xErrorBarProperties, PropertyMapper::getPropertyNameMapForLineProperties() );
}
catch( const uno::Exception & e )
{

6
chart2/source/view/inc/GL3DBarChart.hxx
View File

@ -103,7 +103,7 @@ private:
void updateRenderFPS();
void updateDataUpdateFPS();
DECL_LINK(UpdateTimerHdl, void*);
int calcTimeInterval(TimeValue &startTime, TimeValue &endTime);
static int calcTimeInterval(TimeValue &startTime, TimeValue &endTime);
float addScreenTextShape(OUString &nStr, const glm::vec2& rLeftOrRightTop, float nTextHeight, bool bLeftTopFlag = true,
const glm::vec4& rColor = glm::vec4(0.0f, 1.0f, 1.0f, 0.0f),
const glm::vec3& rPos = glm::vec3(0.0f, 0.0f, 0.0f),
@ -111,10 +111,10 @@ private:
void recordBarHistory(sal_uInt32 &nBarID, float &nVal);
void updateClickEvent();
void calcDistance(std::vector<sal_uInt32> &vectorNearest);
float calcScrollDistance(const glm::mat4 &mvp, const glm::vec3& rPos);
static float calcScrollDistance(const glm::mat4 &mvp, const glm::vec3& rPos);
void initDistanceHeap(std::vector<sal_uInt32> &vectorNearest);
void keepHeap(std::vector<sal_uInt32> &vectorNearest, int index);
void swapVector(int i, int j, std::vector<sal_uInt32> &vectorNearest);
static void swapVector(int i, int j, std::vector<sal_uInt32> &vectorNearest);
void getNearestBars(std::vector<sal_uInt32> &vectorNearest);
void updateScroll();
void processAutoFly(sal_uInt32 nId, sal_uInt32 nColor);

8
chart2/source/view/inc/GL3DRenderer.hxx
View File

@ -228,7 +228,7 @@ public:
private:
void MoveModelf( const PosVecf3& trans, const PosVecf3& angle, const PosVecf3& scale);
void ClearBuffer();
static void ClearBuffer();
void RenderPolygon3DObject();
void RenderLine3D(const Polygon3DInfo &polygon);
void RenderPolygon3D(const Polygon3DInfo &polygon);
@ -247,17 +247,17 @@ private:
void AddNormalData(GLuint normalBuf);
void AddIndexData(GLuint indexBuf);
void RenderNonRoundedBar(const Extrude3DInfo& extrude3D);
bool GetSimilarVertexIndex(PackedVertex & packed,
static bool GetSimilarVertexIndex(PackedVertex & packed,
std::map<PackedVertex,unsigned short> & VertexToOutIndex,
unsigned short & result
);
void SetVertex(PackedVertex &packed,
static void SetVertex(PackedVertex &packed,
std::map<PackedVertex,unsigned short> &VertexToOutIndex,
std::vector<glm::vec3> &vertex,
std::vector<glm::vec3> &normal,
std::vector<unsigned short> &indeices);
void CreateActualRoundedCube(float fRadius, int iSubDivY, int iSubDivZ, float width, float height, float depth);
int GenerateRoundCornerBar(std::vector<glm::vec3> &vertices, std::vector<glm::vec3> &normals, float fRadius, int iSubDivY,
static int GenerateRoundCornerBar(std::vector<glm::vec3> &vertices, std::vector<glm::vec3> &normals, float fRadius, int iSubDivY,
int iSubDivZ, float width, float height, float depth);
void CreateSceneBoxView();

6
chart2/source/view/inc/Stripe.hxx
View File

@ -52,9 +52,9 @@ public:
void InvertNormal( bool bInvertNormal );
::com::sun::star::uno::Any getPolyPolygonShape3D() const;
::com::sun::star::uno::Any getNormalsPolygon() const;
::com::sun::star::uno::Any getTexturePolygon( short nRotatedTexture ) const; //0 to 7 are the different possibilities
::com::sun::star::uno::Any getPolyPolygonShape3D() const;
::com::sun::star::uno::Any getNormalsPolygon() const;
static ::com::sun::star::uno::Any getTexturePolygon( short nRotatedTexture ); //0 to 7 are the different possibilities
::com::sun::star::drawing::Position3D GetPosition1() const { return m_aPoint1; }
::com::sun::star::drawing::Position3D GetPosition2() const { return m_aPoint2; }

4
chart2/source/view/inc/VCoordinateSystem.hxx
View File

@ -143,7 +143,7 @@ protected: //methods
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >
getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > >
static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > >
getGridListFromAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
VAxisBase* getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
@ -161,7 +161,7 @@ protected: //methods
::com::sun::star::chart2::XChartDocument>& xChartDoc);
private: //methods
void impl_adjustDimension( sal_Int32& rDimensionIndex ) const;
static void impl_adjustDimension( sal_Int32& rDimensionIndex );
void impl_adjustDimensionAndIndex( sal_Int32& rDimensionIndex, sal_Int32& rAxisIndex ) const;
protected: //member

2
chart2/source/view/inc/VSeriesPlotter.hxx
View File

@ -405,7 +405,7 @@ protected:
::com::sun::star::chart2::XRegressionCurveCalculator > & xRegressionCurveCalculator
, ::com::sun::star::awt::Point aDefaultPos );
void setMappedProperties(
static void setMappedProperties(
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xTarget
, const ::com::sun::star::uno::Reference<

2
chart2/source/view/main/ShapeFactory.cxx
View File

@ -1004,7 +1004,7 @@ uno::Reference< drawing::XShape >
//TexturePolygon
xProp->setPropertyValue( UNO_NAME_3D_TEXTUREPOLYGON3D
, rStripe.getTexturePolygon( nRotatedTexture ) );
, Stripe::getTexturePolygon( nRotatedTexture ) );
//Normals Polygon
xProp->setPropertyValue( UNO_NAME_3D_NORMALSPOLYGON3D

2
chart2/source/view/main/Stripe.cxx
View File

@ -175,7 +175,7 @@ uno::Any Stripe::getNormalsPolygon() const
return uno::Any( &aPP, cppu::UnoType<drawing::PolyPolygonShape3D>::get());
}
uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const
uno::Any Stripe::getTexturePolygon( short nRotatedTexture )
{
drawing::PolyPolygonShape3D aPP;

6
compilerplugins/clang/staticmethods.cxx
View File

@ -162,6 +162,10 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
|| fqn == "SfxApplication::InitializeDde" || fqn == "SfxApplication::RemoveDdeTopic") {
return true;
}
// debugging stuff
if (fqn == "chart::InternalData::dump") {
return true;
}
// used in a function-pointer-table
if (startsWith(fqn, "SbiRuntime::Step")) {
return true;
@ -181,7 +185,7 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl)
return true;
}
loplugin::Plugin::Registration<StaticMethods> X("staticmethods", true);
loplugin::Plugin::Registration<StaticMethods> X("staticmethods", false);
}