[Libreoffice-commits] core.git: chart2/source

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/DataBrowserModel.cxx |    2 +-
 chart2/source/controller/dialogs/DialogModel.cxx      |    4 ++--
 chart2/source/controller/dialogs/DialogModel.hxx      |    7 +++----
 chart2/source/controller/dialogs/tp_DataSource.cxx    |    4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 8f4e9ea8705af4b6bdced8890410cd537363d18d
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Jan 18 10:06:30 2019 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jan 18 12:40:57 2019 +0100

    convert MoveDirection to scoped enum
    
    Change-Id: I077604051af8af05a3a6ea278d7164d39303f09f
    Reviewed-on: https://gerrit.libreoffice.org/66568
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 22df32c24849..c0dea7817ebc 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -510,7 +510,7 @@ void DataBrowserModel::swapDataSeries( sal_Int32 nFirstColumnIndex )
         Reference< chart2::XDataSeries > xSeries( m_aColumns[nFirstColumnIndex].m_xDataSeries );
         if( xSeries.is())
         {
-            m_apDialogModel->moveSeries( xSeries, DialogModel::MOVE_DOWN );
+            m_apDialogModel->moveSeries( xSeries, DialogModel::MoveDirection::Down );
             updateFromModel();
         }
     }
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 5f361953c1ec..a648aff121ca 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -543,13 +543,13 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
 
 void DialogModel::moveSeries(
     const Reference< XDataSeries > & xSeries,
-    eMoveDirection eDirection )
+    MoveDirection eDirection )
 {
     m_aTimerTriggeredControllerLock.startTimer();
     ControllerLockGuardUNO aLockedControllers( Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY ) );
 
     Reference< XDiagram > xDiagram( m_xChartDocument->getFirstDiagram());
-    DiagramHelper::moveSeries( xDiagram, xSeries, eDirection==MOVE_UP );
+    DiagramHelper::moveSeries( xDiagram, xSeries, eDirection==MoveDirection::Up );
 }
 
 Reference< chart2::XDataSeries > DialogModel::insertSeriesAfter(
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index 400302762a93..a5acf7f37d50 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -99,14 +99,13 @@ public:
         const OUString & aRoleOfSequenceForLabel,
         const css::uno::Reference< css::chart2::XChartType > & xChartType );
 
-    enum eMoveDirection
+    enum class MoveDirection
     {
-        MOVE_DOWN,
-        MOVE_UP
+        Down, Up
     };
 
     void moveSeries( const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
-                     eMoveDirection eDirection );
+                     MoveDirection eDirection );
 
     /// @return the newly inserted series
     css::uno::Reference<
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 3fddd55005ac..535e401ac1bd 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -664,7 +664,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl, weld::Button&, void)
 
     if (bHasSelectedEntry)
     {
-        m_rDialogModel.moveSeries( pEntry->m_xDataSeries, DialogModel::MOVE_UP );
+        m_rDialogModel.moveSeries( pEntry->m_xDataSeries, DialogModel::MoveDirection::Up );
         setDirty();
         fillSeriesListBox();
         SeriesSelectionChangedHdl(*m_xLB_SERIES);
@@ -684,7 +684,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl, weld::Button&, void)
 
     if (bHasSelectedEntry)
     {
-        m_rDialogModel.moveSeries( pEntry->m_xDataSeries, DialogModel::MOVE_DOWN );
+        m_rDialogModel.moveSeries( pEntry->m_xDataSeries, DialogModel::MoveDirection::Down );
         setDirty();
         fillSeriesListBox();
         SeriesSelectionChangedHdl(*m_xLB_SERIES);