diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-10-07 20:38:56 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-10-09 16:33:36 -0400 |
| commit | d7e477c4518bb3f638af59fa48cae04eba8c76cc (patch) | |
| tree | 00384865a7aa70909e070b79ef010c889b7be318 /chart2/source/view/axes/VAxisProperties.cxx | |
| parent | 52781ca83d3ad90d8b8861692f2b10bf56fff601 (diff) | |
Use boost::optional for these members.
Change-Id: I60c52bf99d0e63e27f7c576e2582c26e19809c8c
Diffstat (limited to 'chart2/source/view/axes/VAxisProperties.cxx')
| -rw-r--r-- | chart2/source/view/axes/VAxisProperties.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index e6fb154b1473..ec63826627c2 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -156,8 +156,6 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel , m_eCrossoverType( ::com::sun::star::chart::ChartAxisPosition_ZERO ) , m_eLabelPos( ::com::sun::star::chart::ChartAxisLabelPosition_NEAR_AXIS ) , m_eTickmarkPos( ::com::sun::star::chart::ChartAxisMarkPosition_AT_LABELS_AND_AXIS ) - , m_pfMainLinePositionAtOtherAxis(NULL) - , m_pfExrtaLinePositionAtOtherAxis(NULL) , m_bCrossingAxisHasReverseDirection(false) , m_bCrossingAxisIsCategoryAxes(false) , m_fLabelDirectionSign(1.0) @@ -184,9 +182,6 @@ AxisProperties::AxisProperties( const AxisProperties& rAxisProperties ) , m_bSwapXAndY( rAxisProperties.m_bSwapXAndY ) , m_eCrossoverType( rAxisProperties.m_eCrossoverType ) , m_eLabelPos( rAxisProperties.m_eLabelPos ) - , m_eTickmarkPos( rAxisProperties.m_eTickmarkPos ) - , m_pfMainLinePositionAtOtherAxis( NULL ) - , m_pfExrtaLinePositionAtOtherAxis( NULL ) , m_bCrossingAxisHasReverseDirection( rAxisProperties.m_bCrossingAxisHasReverseDirection ) , m_bCrossingAxisIsCategoryAxes( rAxisProperties.m_bCrossingAxisIsCategoryAxes ) , m_fLabelDirectionSign( rAxisProperties.m_fLabelDirectionSign ) @@ -205,15 +200,13 @@ AxisProperties::AxisProperties( const AxisProperties& rAxisProperties ) , m_xAxisTextProvider( rAxisProperties.m_xAxisTextProvider ) { if( rAxisProperties.m_pfMainLinePositionAtOtherAxis ) - m_pfMainLinePositionAtOtherAxis = new double(*rAxisProperties.m_pfMainLinePositionAtOtherAxis); + m_pfMainLinePositionAtOtherAxis.reset(*rAxisProperties.m_pfMainLinePositionAtOtherAxis); if( rAxisProperties.m_pfExrtaLinePositionAtOtherAxis ) - m_pfExrtaLinePositionAtOtherAxis = new double (*rAxisProperties.m_pfExrtaLinePositionAtOtherAxis); + m_pfExrtaLinePositionAtOtherAxis.reset(*rAxisProperties.m_pfExrtaLinePositionAtOtherAxis); } AxisProperties::~AxisProperties() { - delete m_pfMainLinePositionAtOtherAxis; - delete m_pfExrtaLinePositionAtOtherAxis; } LabelAlignment lcl_getLabelAlignmentForZAxis( const AxisProperties& rAxisProperties ) @@ -256,10 +249,10 @@ void AxisProperties::initAxisPositioning( const uno::Reference< beans::XProperty if( m_bCrossingAxisIsCategoryAxes ) fValue = ::rtl::math::round(fValue); - m_pfMainLinePositionAtOtherAxis = new double(fValue); + m_pfMainLinePositionAtOtherAxis.reset(fValue); } else if( ::com::sun::star::chart::ChartAxisPosition_ZERO == m_eCrossoverType ) - m_pfMainLinePositionAtOtherAxis = new double(0.0); + m_pfMainLinePositionAtOtherAxis.reset(0.0); xAxisProp->getPropertyValue("LabelPosition") >>= m_eLabelPos; xAxisProp->getPropertyValue("MarkPosition") >>= m_eTickmarkPos; |