summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-10-09 17:05:41 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-10-09 17:48:23 -0400
commit700ed579f9db3958b22df90558db358cac899452 (patch)
tree99c40b6003cd1f8b79ed6eda0c25ebe990444136
parentd5b0697cebd7d66ee90d12f7b893c193ae36eaa6 (diff)
Make AxisProperties non-virtual; nobody derives from it.
Change-Id: I1cb5203374b6d13a914c335d73a7db6d8a47c4bb
-rw-r--r--chart2/source/view/axes/VAxisProperties.cxx4
-rw-r--r--chart2/source/view/axes/VAxisProperties.hxx11
2 files changed, 5 insertions, 10 deletions
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index ec63826627c2..da0461609044 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -205,10 +205,6 @@ AxisProperties::AxisProperties( const AxisProperties& rAxisProperties )
m_pfExrtaLinePositionAtOtherAxis.reset(*rAxisProperties.m_pfExrtaLinePositionAtOtherAxis);
}
-AxisProperties::~AxisProperties()
-{
-}
-
LabelAlignment lcl_getLabelAlignmentForZAxis( const AxisProperties& rAxisProperties )
{
LabelAlignment aRet( LABEL_ALIGN_RIGHT );
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 6ad35c5b39eb..b43f97b03f46 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -57,7 +57,7 @@ enum AxisLabelStaggering
, STAGGER_AUTO
};
-struct AxisLabelProperties
+struct AxisLabelProperties SAL_FINAL
{
AxisLabelProperties();
@@ -84,7 +84,7 @@ struct AxisLabelProperties
bool getIsStaggered() const;
};
-struct AxisProperties
+struct AxisProperties SAL_FINAL
{
css::uno::Reference<css::chart2::XAxis> m_xAxisModel;
@@ -133,8 +133,8 @@ struct AxisProperties
AxisProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxisModel
, ExplicitCategoriesProvider* pExplicitCategoriesProvider );
AxisProperties( const AxisProperties& rAxisProperties );
- virtual ~AxisProperties();
- virtual void init(bool bCartesian=false);//init from model data (m_xAxisModel)
+
+ void init(bool bCartesian=false);//init from model data (m_xAxisModel)
void initAxisPositioning( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProp );
@@ -144,8 +144,7 @@ struct AxisProperties
private:
AxisProperties();
-protected:
- virtual TickmarkProperties makeTickmarkProperties( sal_Int32 nDepth ) const;
+ TickmarkProperties makeTickmarkProperties( sal_Int32 nDepth ) const;
//@todo get this from somewhere; maybe for each subincrement
//so far the model does not offer different settings for each tick depth
VLineProperties makeLinePropertiesForDepth( sal_Int32 /*nDepth*/ ) const { return m_aLineProperties; }