diff options
21 files changed, 98 insertions, 163 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx index 577a02970763..e0b65406b31e 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx @@ -44,8 +44,8 @@ public: virtual Size PixelToLogic( const Size& rSize ) const SAL_OVERRIDE; private: - AccessibleViewForwarder( AccessibleViewForwarder& ); - AccessibleViewForwarder& operator=( AccessibleViewForwarder& ); + AccessibleViewForwarder( AccessibleViewForwarder& ) SAL_DELETED_FUNCTION; + AccessibleViewForwarder& operator=( AccessibleViewForwarder& ) SAL_DELETED_FUNCTION; AccessibleChartView* m_pAccChartView; vcl::Window* m_pWindow; diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index f4c82b3dd012..9e72939d40cd 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -185,8 +185,7 @@ private: DECL_LINK( SeriesHeaderGotFocus, impl::SeriesHeaderEdit* ); DECL_LINK( SeriesHeaderChanged, impl::SeriesHeaderEdit* ); - /// not implemented: inhibit copy construction - DataBrowser( const DataBrowser & ); + DataBrowser( const DataBrowser & ) SAL_DELETED_FUNCTION; }; } // namespace chart diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index b4ff5e876856..95dc944b7aae 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -59,10 +59,8 @@ private: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; - //no default constructor - ChartTypeUnoDlg(); - ChartTypeUnoDlg(const ChartTypeUnoDlg&); // no defined - void operator =(const ChartTypeUnoDlg&); // no defined + ChartTypeUnoDlg(const ChartTypeUnoDlg&) SAL_DELETED_FUNCTION; + void operator =(const ChartTypeUnoDlg&) SAL_DELETED_FUNCTION; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xChartModel; }; diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 2fecaa8dbcc8..f777dcbcb0d5 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -49,8 +49,8 @@ class ShapeToolbarController : public ::svt::ToolboxController TToolbarHelper m_pToolbarController; sal_uInt16 m_nToolBoxId; sal_uInt16 m_nSlotId; - ShapeToolbarController( const ShapeToolbarController& ); - void operator =( const ShapeToolbarController& ); + ShapeToolbarController( const ShapeToolbarController& ) SAL_DELETED_FUNCTION; + void operator =( const ShapeToolbarController& ) SAL_DELETED_FUNCTION; public: ShapeToolbarController( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); diff --git a/chart2/source/inc/CharacterProperties.hxx b/chart2/source/inc/CharacterProperties.hxx index 36a2eec6984f..026bedf2a9ad 100644 --- a/chart2/source/inc/CharacterProperties.hxx +++ b/chart2/source/inc/CharacterProperties.hxx @@ -35,9 +35,8 @@ namespace chart // com.sun.star.style.CharacterProperties // com.sun.star.style.CharacterPropertiesAsian // com.sun.star.style.CharacterPropertiesComplex -class OOO_DLLPUBLIC_CHARTTOOLS CharacterProperties +namespace CharacterProperties { -public: // FastProperty Ids for properties enum { @@ -121,20 +120,16 @@ public: FAST_PROPERTY_ID_END_CHAR_PROP }; - static void AddPropertiesToVector( + OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); - static void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); + OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); - static bool IsCharacterPropertyHandle( sal_Int32 nHandle ); + OOO_DLLPUBLIC_CHARTTOOLS bool IsCharacterPropertyHandle( sal_Int32 nHandle ); - static ::com::sun::star::awt::FontDescriptor createFontDescriptorFromPropertySet( + OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::awt::FontDescriptor createFontDescriptorFromPropertySet( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > & xMultiPropSet ); - -private: - // not implemented - CharacterProperties(); -}; +} } // namespace chart diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index 375aa70d51ca..c8bc8ed6c624 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -345,8 +345,7 @@ public: , bool bConvertAlsoFromAutoPositioning ); private: - // not implemented - DiagramHelper(); + DiagramHelper() SAL_DELETED_FUNCTION; }; diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx index 29a627052743..43024262c399 100644 --- a/chart2/source/inc/FillProperties.hxx +++ b/chart2/source/inc/FillProperties.hxx @@ -30,9 +30,8 @@ namespace chart { // implements service FillProperties -class OOO_DLLPUBLIC_CHARTTOOLS FillProperties +namespace FillProperties { -public: // FastProperty Ids for properties enum { @@ -64,15 +63,11 @@ public: , PROP_FILL_BACKGROUND }; - static void AddPropertiesToVector( + OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); - static void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); - -private: - // not implemented - FillProperties(); -}; + OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); +} } // namespace chart diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index edcdcab0806a..63c9bdadf0c4 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -203,10 +203,8 @@ private: bool m_bLongLastingCallRegistered; private: - // these make no sense - LifeTimeGuard( ::osl::Mutex& rMutex ); - LifeTimeGuard( const LifeTimeGuard& ); - LifeTimeGuard& operator= ( const LifeTimeGuard& ); + LifeTimeGuard( const LifeTimeGuard& ) SAL_DELETED_FUNCTION; + LifeTimeGuard& operator= ( const LifeTimeGuard& ) SAL_DELETED_FUNCTION; }; template<class T> diff --git a/chart2/source/inc/LinePropertiesHelper.hxx b/chart2/source/inc/LinePropertiesHelper.hxx index 48b6df9df018..c765cd1cb4c5 100644 --- a/chart2/source/inc/LinePropertiesHelper.hxx +++ b/chart2/source/inc/LinePropertiesHelper.hxx @@ -30,9 +30,8 @@ namespace chart { // implements service LineProperties -class LinePropertiesHelper +namespace LinePropertiesHelper { -public: // FastProperty Ids for properties enum { @@ -46,22 +45,18 @@ public: PROP_LINE_JOINT }; - OOO_DLLPUBLIC_CHARTTOOLS static void AddPropertiesToVector( + OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); - OOO_DLLPUBLIC_CHARTTOOLS static void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); + OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); - SAL_DLLPRIVATE static bool IsLineVisible( const ::com::sun::star::uno::Reference< + bool IsLineVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xLineProperties ); - SAL_DLLPRIVATE static void SetLineVisible( const ::com::sun::star::uno::Reference< + void SetLineVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xLineProperties ); - static void SetLineInvisible( const ::com::sun::star::uno::Reference< + void SetLineInvisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xLineProperties ); - -private: - // not implemented - LinePropertiesHelper(); -}; +} } // namespace chart diff --git a/chart2/source/inc/ModifyListenerCallBack.hxx b/chart2/source/inc/ModifyListenerCallBack.hxx index de6412cd274a..e992d7d11db0 100644 --- a/chart2/source/inc/ModifyListenerCallBack.hxx +++ b/chart2/source/inc/ModifyListenerCallBack.hxx @@ -43,8 +43,7 @@ public: SAL_DLLPRIVATE void stopListening(); private: //methods - SAL_DLLPRIVATE ModifyListenerCallBack(); - SAL_DLLPRIVATE ModifyListenerCallBack( const ModifyListenerCallBack& ); + ModifyListenerCallBack( const ModifyListenerCallBack& ) SAL_DELETED_FUNCTION; private: //member ModifyListenerCallBack_impl* pModifyListener_impl; diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index 772c3c3e2ffe..45408c37b676 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -35,26 +35,25 @@ namespace chart { -class OOO_DLLPUBLIC_CHARTTOOLS RegressionCurveHelper +namespace RegressionCurveHelper { -public: /// returns a model mean-value line - SAL_DLLPRIVATE static css::uno::Reference<css::chart2::XRegressionCurve> + css::uno::Reference<css::chart2::XRegressionCurve> createMeanValueLine(const css::uno::Reference<css::uno::XComponentContext> & xContext ); /// returns a model regression curve - SAL_DLLPRIVATE static css::uno::Reference<css::chart2::XRegressionCurve> + css::uno::Reference<css::chart2::XRegressionCurve> createRegressionCurveByServiceName( const css::uno::Reference<css::uno::XComponentContext> & xContext, const OUString& aServiceName ); - static bool hasMeanValueLine( + OOO_DLLPUBLIC_CHARTTOOLS bool hasMeanValueLine( const css::uno::Reference<css::chart2::XRegressionCurveContainer> & xRegCnt ); - static bool isMeanValueLine( + OOO_DLLPUBLIC_CHARTTOOLS bool isMeanValueLine( const css::uno::Reference<css::chart2::XRegressionCurve> & xRegCurve ); - static css::uno::Reference<css::chart2::XRegressionCurve> + OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<css::chart2::XRegressionCurve> getMeanValueLine( const css::uno::Reference<css::chart2::XRegressionCurveContainer> & xRegCnt ); @@ -63,24 +62,24 @@ public: @param xSeriesProp If set, this property-set will be used to apply a line color */ - static void addMeanValueLine( + OOO_DLLPUBLIC_CHARTTOOLS void addMeanValueLine( css::uno::Reference<css::chart2::XRegressionCurveContainer>& xRegCnt, const css::uno::Reference<css::uno::XComponentContext>& xContext, const css::uno::Reference<css::beans::XPropertySet>& xSeriesProp ); - static void removeMeanValueLine( + OOO_DLLPUBLIC_CHARTTOOLS void removeMeanValueLine( css::uno::Reference<css::chart2::XRegressionCurveContainer>& xRegCnt ); /** Returns the first regression curve found that is not of type mean-value line */ - static css::uno::Reference<com::sun::star::chart2::XRegressionCurve> + OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<com::sun::star::chart2::XRegressionCurve> getFirstCurveNotMeanValueLine( const css::uno::Reference<css::chart2::XRegressionCurveContainer>& xCurveContainer ); /** Returns the regression curve found at the index provided. */ - static css::uno::Reference<css::chart2::XRegressionCurve> + OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<css::chart2::XRegressionCurve> getRegressionCurveAtIndex( const css::uno::Reference<css::chart2::XRegressionCurveContainer>& xCurveContainer, sal_Int32 aIndex); @@ -88,10 +87,10 @@ public: /** Returns the type of the first regression curve found that is not of type mean-value line */ - static SvxChartRegress getFirstRegressTypeNotMeanValueLine( + OOO_DLLPUBLIC_CHARTTOOLS SvxChartRegress getFirstRegressTypeNotMeanValueLine( const css::uno::Reference<css::chart2::XRegressionCurveContainer>& xCurveContainer ); - static SvxChartRegress getRegressionType( + OOO_DLLPUBLIC_CHARTTOOLS SvxChartRegress getRegressionType( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); /** @param xPropertySource is taken as source to copy all properties from if @@ -99,7 +98,7 @@ public: @param xEquationProperties is set at the new regression curve as equation properties if not null */ - static css::uno::Reference<css::chart2::XRegressionCurve> + OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<css::chart2::XRegressionCurve> addRegressionCurve( SvxChartRegress eType, css::uno::Reference<css::chart2::XRegressionCurveContainer>& xCurveContainer, @@ -109,13 +108,13 @@ public: const css::uno::Reference<css::beans::XPropertySet>& xEquationProperties = css::uno::Reference<css::beans::XPropertySet>() ); - static bool removeAllExceptMeanValueLine( + OOO_DLLPUBLIC_CHARTTOOLS bool removeAllExceptMeanValueLine( css::uno::Reference<css::chart2::XRegressionCurveContainer>& xCurveContainer ); - static void removeEquations( + OOO_DLLPUBLIC_CHARTTOOLS void removeEquations( css::uno::Reference<css::chart2::XRegressionCurveContainer>& xCurveContainer ); - static css::uno::Reference<css::chart2::XRegressionCurve> + OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<css::chart2::XRegressionCurve> changeRegressionCurveType( SvxChartRegress eType, css::uno::Reference<css::chart2::XRegressionCurveContainer>& xRegressionCurveContainer, @@ -123,7 +122,7 @@ public: const css::uno::Reference<css::uno::XComponentContext>& xContext ); /// returns a calculator object for regression curves (used by the view) - static css::uno::Reference<css::chart2::XRegressionCurveCalculator> + OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference<css::chart2::XRegressionCurveCalculator> createRegressionCurveCalculatorByServiceName( const OUString& aServiceName ); /** recalculates the regression parameters according to the data given in @@ -141,7 +140,7 @@ public: If false, the sequence (1, 2, 3, ...) will always be used, even if there is a data-sequence with role "values-x" */ - SAL_DLLPRIVATE static void initializeCurveCalculator( + void initializeCurveCalculator( const css::uno::Reference<css::chart2::XRegressionCurveCalculator>& xOutCurveCalculator, const css::uno::Reference<css::chart2::data::XDataSource>& xSource, bool bUseXValuesIfAvailable = true ); @@ -151,41 +150,37 @@ public: necessary that the data::XDataSource is an XDataSeries, thus this parameter also changed. */ - static void initializeCurveCalculator( + OOO_DLLPUBLIC_CHARTTOOLS void initializeCurveCalculator( const css::uno::Reference<css::chart2::XRegressionCurveCalculator>& xOutCurveCalculator, const css::uno::Reference<css::chart2::XDataSeries>& xSeries, const css::uno::Reference<css::frame::XModel>& xModel ); - static OUString getUINameForRegressionCurve( + OOO_DLLPUBLIC_CHARTTOOLS OUString getUINameForRegressionCurve( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); - static OUString getRegressionCurveName( + OOO_DLLPUBLIC_CHARTTOOLS OUString getRegressionCurveName( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); - static OUString getRegressionCurveGenericName( + OOO_DLLPUBLIC_CHARTTOOLS OUString getRegressionCurveGenericName( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); - static OUString getRegressionCurveSpecificName( + OOO_DLLPUBLIC_CHARTTOOLS OUString getRegressionCurveSpecificName( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); - static std::vector<css::uno::Reference<css::chart2::XRegressionCurve> > + OOO_DLLPUBLIC_CHARTTOOLS std::vector<css::uno::Reference<css::chart2::XRegressionCurve> > getAllRegressionCurvesNotMeanValueLine( const css::uno::Reference<css::chart2::XDiagram>& xDiagram ); - static void resetEquationPosition( + OOO_DLLPUBLIC_CHARTTOOLS void resetEquationPosition( const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); /// @return the index of the given curve in the given container. -1 if not contained - static sal_Int32 getRegressionCurveIndex( + OOO_DLLPUBLIC_CHARTTOOLS sal_Int32 getRegressionCurveIndex( const css::uno::Reference<css::chart2::XRegressionCurveContainer>& xContainer, const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); - static bool hasEquation(const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); - -private: - // instatiation not allowed - RegressionCurveHelper(); -}; + OOO_DLLPUBLIC_CHARTTOOLS bool hasEquation(const css::uno::Reference<css::chart2::XRegressionCurve>& xCurve ); +} } // namespace chart diff --git a/chart2/source/inc/RelativeSizeHelper.hxx b/chart2/source/inc/RelativeSizeHelper.hxx index 03923772c885..a6fa1a665dd5 100644 --- a/chart2/source/inc/RelativeSizeHelper.hxx +++ b/chart2/source/inc/RelativeSizeHelper.hxx @@ -41,8 +41,7 @@ public: const ::com::sun::star::awt::Size & rNewReferenceSize ); private: - // not implemented - RelativeSizeHelper(); + RelativeSizeHelper() SAL_DELETED_FUNCTION; }; } // namespace chart diff --git a/chart2/source/inc/ResourceManager.hxx b/chart2/source/inc/ResourceManager.hxx index bbe31c5d8418..d5c3272db684 100644 --- a/chart2/source/inc/ResourceManager.hxx +++ b/chart2/source/inc/ResourceManager.hxx @@ -27,17 +27,10 @@ class ResMgr; namespace chart { -class ResourceManager +namespace ResourceManager { -public: - static ::ResMgr & getResourceManager(); - -private: - // not implemented -- avoid instantiation - ResourceManager(); - - static ::ResMgr * m_pResourceManager; -}; + ::ResMgr & getResourceManager(); +} } // namespace chart diff --git a/chart2/source/inc/SceneProperties.hxx b/chart2/source/inc/SceneProperties.hxx index 811d9211e189..982cc06ad521 100644 --- a/chart2/source/inc/SceneProperties.hxx +++ b/chart2/source/inc/SceneProperties.hxx @@ -30,9 +30,8 @@ namespace chart { // implements service SceneProperties -class OOO_DLLPUBLIC_CHARTTOOLS SceneProperties +namespace SceneProperties { -public: // FastProperty Ids for properties enum { @@ -72,15 +71,11 @@ public: PROP_SCENE_LIGHT_ON_8 }; - static void AddPropertiesToVector( + OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); - static void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); - -private: - // not implemented - SceneProperties(); -}; + OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); +} } // namespace chart diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx index 96cbaeadf610..b590325ccbb6 100644 --- a/chart2/source/inc/StatisticsHelper.hxx +++ b/chart2/source/inc/StatisticsHelper.hxx @@ -29,9 +29,8 @@ namespace chart { -class OOO_DLLPUBLIC_CHARTTOOLS StatisticsHelper +namespace StatisticsHelper { -public: /** Calculates 1/n * sum (x_i - x_mean)^2. @see http://mathworld.wolfram.com/Variance.html @@ -39,16 +38,16 @@ public: @param bUnbiasedEstimator If true, 1/(n-1) * sum (x_i - x_mean)^2 is returned. */ - static double getVariance( const ::com::sun::star::uno::Sequence< double > & rData, + OOO_DLLPUBLIC_CHARTTOOLS double getVariance( const ::com::sun::star::uno::Sequence< double > & rData, bool bUnbiasedEstimator = false ); // square root of the variance - static double getStandardDeviation( const ::com::sun::star::uno::Sequence< double > & rData ); + OOO_DLLPUBLIC_CHARTTOOLS double getStandardDeviation( const ::com::sun::star::uno::Sequence< double > & rData ); // also called "Standard deviation of the mean (SDOM)" - static double getStandardError( const ::com::sun::star::uno::Sequence< double > & rData ); + OOO_DLLPUBLIC_CHARTTOOLS double getStandardError( const ::com::sun::star::uno::Sequence< double > & rData ); - static ::com::sun::star::uno::Reference< + OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > getErrorLabeledDataSequenceFromDataSource( const ::com::sun::star::uno::Reference< @@ -56,7 +55,7 @@ public: bool bPositiveValue, bool bYError = true ); - static ::com::sun::star::uno::Reference< + OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > getErrorDataSequenceFromDataSource( const ::com::sun::star::uno::Reference< @@ -64,14 +63,14 @@ public: bool bPositiveValue, bool bYError = true ); - static double getErrorFromDataSource( + OOO_DLLPUBLIC_CHARTTOOLS double getErrorFromDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > & xDataSource, sal_Int32 nIndex, bool bPositiveValue, bool bYError = true ); - static void setErrorDataSequence( + OOO_DLLPUBLIC_CHARTTOOLS void setErrorDataSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > & xDataSource, const ::com::sun::star::uno::Reference< @@ -82,7 +81,7 @@ public: OUString * pXMLRange = 0 ); /// @return the newly created or existing error bar object - static ::com::sun::star::uno::Reference< + OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > addErrorBars( const ::com::sun::star::uno::Reference< @@ -92,32 +91,28 @@ public: sal_Int32 nStyle, bool bYError = true ); - static ::com::sun::star::uno::Reference< + OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getErrorBars( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xDataSeries, bool bYError = true ); - static bool hasErrorBars( + OOO_DLLPUBLIC_CHARTTOOLS bool hasErrorBars( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xDataSeries, bool bYError = true ); - static void removeErrorBars( + OOO_DLLPUBLIC_CHARTTOOLS void removeErrorBars( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xDataSeries, bool bYError = true ); - static bool usesErrorBarRanges( + OOO_DLLPUBLIC_CHARTTOOLS bool usesErrorBarRanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > & xDataSeries, bool bYError = true ); - -private: - // not implemented - StatisticsHelper(); -}; +} } // namespace chart diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx index d26fd1819b66..c8ef988b55f8 100644 --- a/chart2/source/inc/UserDefinedProperties.hxx +++ b/chart2/source/inc/UserDefinedProperties.hxx @@ -30,9 +30,8 @@ namespace chart { // implements service com.sun.star.xml.UserDefinedAttributesSupplier -class OOO_DLLPUBLIC_CHARTTOOLS UserDefinedProperties +namespace UserDefinedProperties { -public: // FastProperty Ids for properties enum { @@ -47,13 +46,9 @@ public: PROP_XML_USERDEF }; - static void AddPropertiesToVector( + OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); - -private: - // not implemented - UserDefinedProperties(); -}; +} } // namespace chart diff --git a/chart2/source/model/main/DataPointProperties.hxx b/chart2/source/model/main/DataPointProperties.hxx index 721e02bf6296..f4fbf0e2d00e 100644 --- a/chart2/source/model/main/DataPointProperties.hxx +++ b/chart2/source/model/main/DataPointProperties.hxx @@ -29,9 +29,8 @@ namespace chart { // implements service DataPointProperties -class DataPointProperties +namespace DataPointProperties { -public: // FastProperty Ids for properties enum { @@ -85,15 +84,11 @@ public: // additionally some properites from ::chart::LineProperties }; - static void AddPropertiesToVector( + void AddPropertiesToVector( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); - static void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); - -private: - // not implemented - DataPointProperties(); -}; + void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap ); +} } // namespace chart diff --git a/chart2/source/model/main/DataSeriesProperties.hxx b/chart2/source/model/main/DataSeriesProperties.hxx index bc7c31306558..0c3a70b6aef6 100644 --- a/chart2/source/model/main/DataSeriesProperties.hxx +++ b/chart2/source/model/main/DataSeriesProperties.hxx @@ -28,9 +28,8 @@ namespace chart { -class DataSeriesProperties +namespace DataSeriesProperties { -public: enum { PROP_DATASERIES_ATTRIBUTED_DATA_POINTS = FAST_PROPERTY_ID_START_DATA_SERIES, @@ -39,15 +38,11 @@ public: PROP_DATASERIES_ATTACHED_AXIS_INDEX }; - static void AddPropertiesToVector( + void AddPropertiesToVector( ::std::vector< ::com::sun::star::beans::Property > & rOutProperties ); - static void AddDefaultsToMap( tPropertyValueMap & rOutMap ); - -private: - // not implemented - DataSeriesProperties(); -}; + void AddDefaultsToMap( tPropertyValueMap & rOutMap ); +} } // namespace chart diff --git a/chart2/source/tools/ResourceManager.cxx b/chart2/source/tools/ResourceManager.cxx index 5016e14bef63..42dbcbeee944 100644 --- a/chart2/source/tools/ResourceManager.cxx +++ b/chart2/source/tools/ResourceManager.cxx @@ -24,15 +24,14 @@ namespace chart { -ResMgr * ResourceManager::m_pResourceManager = 0; - ResMgr & ResourceManager::getResourceManager() { // not threadsafe - if( ! m_pResourceManager ) - m_pResourceManager = ResMgr::CreateResMgr("chartcontroller"); - OSL_ASSERT( m_pResourceManager ); - return *m_pResourceManager; + static ResMgr * pResourceManager = 0; + if( ! pResourceManager ) + pResourceManager = ResMgr::CreateResMgr("chartcontroller"); + OSL_ASSERT( pResourceManager ); + return *pResourceManager; } } // namespace chart diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index a57cc1482cbc..8b4b0e9bc3d4 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -78,7 +78,7 @@ private: //methods void adjustAspectRatio3d( const ::com::sun::star::awt::Size& rAvailableSize ); private: //members - VDiagram(const VDiagram& rD); + VDiagram(const VDiagram& rD) SAL_DELETED_FUNCTION; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xTarget; diff --git a/chart2/source/view/inc/VLegendSymbolFactory.hxx b/chart2/source/view/inc/VLegendSymbolFactory.hxx index 3ad0a83f3eba..4342d2cf64a0 100644 --- a/chart2/source/view/inc/VLegendSymbolFactory.hxx +++ b/chart2/source/view/inc/VLegendSymbolFactory.hxx @@ -27,9 +27,8 @@ namespace chart { -class VLegendSymbolFactory +namespace VLegendSymbolFactory { -public: enum tPropertyType { PROP_TYPE_FILLED_SERIES, @@ -39,7 +38,7 @@ public: PROP_TYPE_FILL_AND_LINE }; - static ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createSymbol( const ::com::sun::star::awt::Size& rEntryKeyAspectRatio, @@ -52,10 +51,7 @@ public: ::com::sun::star::beans::XPropertySet > & xLegendEntryProperties, tPropertyType ePropertyType, const ::com::sun::star::uno::Any& rExplicitSymbol /*should contain a ::com::sun::star::chart2::Symbol without automatic symbol if the charttype does support symbols else empty*/); - -private: - VLegendSymbolFactory(); -}; +} } // namespace chart |