diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-16 16:24:59 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-17 07:57:52 +0200 |
commit | 802a76d4a972db180a21efb9cb6e05220b724c22 (patch) | |
tree | a1bce0c75d9b02eaecc7b9c0cc889411f024d26d /chart2 | |
parent | 58f75fb66a83b1bc7d8297dedc14ade88a9bbc9d (diff) |
drop TimeBasedMode enum
since we only ever use the AUTOMATIC enumerator
Change-Id: I1370bf30ea31d0631e56524638ee843f18583933
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/inc/ChartView.hxx | 10 | ||||
-rw-r--r-- | chart2/source/view/main/ChartView.cxx | 10 |
2 files changed, 3 insertions, 17 deletions
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index b82a3086f45f..fcb4f2b05593 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -55,22 +55,14 @@ class GL3DPlotterBase; class GL2DRenderer; struct CreateShapeParam2D; -enum TimeBasedMode -{ - MANUAL, - AUTOMATIC -}; - struct TimeBasedInfo { TimeBasedInfo(): bTimeBased(false), - nFrame(0), - eMode(AUTOMATIC) {} + nFrame(0) {} bool bTimeBased; size_t nFrame; - TimeBasedMode eMode; Timer maTimer; // only valid when we are in the time based mode diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index fce14c83e5b2..12fc658f6d03 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -3342,16 +3342,10 @@ void ChartView::createShapes2D( const awt::Size& rPageSize ) } } - if(maTimeBased.eMode != MANUAL) - { - mrChartModel.setTimeBased(true); - mrChartModel.getNextTimePoint(); - } - else - maTimeBased.maTimer.Stop(); + maTimeBased.maTimer.Stop(); } - if(maTimeBased.bTimeBased && maTimeBased.eMode != MANUAL && !maTimeBased.maTimer.IsActive()) + if(maTimeBased.bTimeBased && !maTimeBased.maTimer.IsActive()) { maTimeBased.maTimer.SetTimeout(15); maTimeBased.maTimer.SetInvokeHandler(LINK(this, ChartView, UpdateTimeBased)); |