Kaydet (Commit) 8f4e9ea8 authored tarafından Noel Grandin's avatar Noel Grandin

convert MoveDirection to scoped enum

Change-Id: I077604051af8af05a3a6ea278d7164d39303f09f
Reviewed-on: https://gerrit.libreoffice.org/66568
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 09451365
...@@ -510,7 +510,7 @@ void DataBrowserModel::swapDataSeries( sal_Int32 nFirstColumnIndex ) ...@@ -510,7 +510,7 @@ void DataBrowserModel::swapDataSeries( sal_Int32 nFirstColumnIndex )
Reference< chart2::XDataSeries > xSeries( m_aColumns[nFirstColumnIndex].m_xDataSeries ); Reference< chart2::XDataSeries > xSeries( m_aColumns[nFirstColumnIndex].m_xDataSeries );
if( xSeries.is()) if( xSeries.is())
{ {
m_apDialogModel->moveSeries( xSeries, DialogModel::MOVE_DOWN ); m_apDialogModel->moveSeries( xSeries, DialogModel::MoveDirection::Down );
updateFromModel(); updateFromModel();
} }
} }
......
...@@ -543,13 +543,13 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges( ...@@ -543,13 +543,13 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
void DialogModel::moveSeries( void DialogModel::moveSeries(
const Reference< XDataSeries > & xSeries, const Reference< XDataSeries > & xSeries,
eMoveDirection eDirection ) MoveDirection eDirection )
{ {
m_aTimerTriggeredControllerLock.startTimer(); m_aTimerTriggeredControllerLock.startTimer();
ControllerLockGuardUNO aLockedControllers( Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY ) ); ControllerLockGuardUNO aLockedControllers( Reference< frame::XModel >( m_xChartDocument, uno::UNO_QUERY ) );
Reference< XDiagram > xDiagram( m_xChartDocument->getFirstDiagram()); 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( Reference< chart2::XDataSeries > DialogModel::insertSeriesAfter(
......
...@@ -99,14 +99,13 @@ public: ...@@ -99,14 +99,13 @@ public:
const OUString & aRoleOfSequenceForLabel, const OUString & aRoleOfSequenceForLabel,
const css::uno::Reference< css::chart2::XChartType > & xChartType ); const css::uno::Reference< css::chart2::XChartType > & xChartType );
enum eMoveDirection enum class MoveDirection
{ {
MOVE_DOWN, Down, Up
MOVE_UP
}; };
void moveSeries( const css::uno::Reference< css::chart2::XDataSeries > & xSeries, void moveSeries( const css::uno::Reference< css::chart2::XDataSeries > & xSeries,
eMoveDirection eDirection ); MoveDirection eDirection );
/// @return the newly inserted series /// @return the newly inserted series
css::uno::Reference< css::uno::Reference<
......
...@@ -664,7 +664,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl, weld::Button&, void) ...@@ -664,7 +664,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl, weld::Button&, void)
if (bHasSelectedEntry) if (bHasSelectedEntry)
{ {
m_rDialogModel.moveSeries( pEntry->m_xDataSeries, DialogModel::MOVE_UP ); m_rDialogModel.moveSeries( pEntry->m_xDataSeries, DialogModel::MoveDirection::Up );
setDirty(); setDirty();
fillSeriesListBox(); fillSeriesListBox();
SeriesSelectionChangedHdl(*m_xLB_SERIES); SeriesSelectionChangedHdl(*m_xLB_SERIES);
...@@ -684,7 +684,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl, weld::Button&, void) ...@@ -684,7 +684,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl, weld::Button&, void)
if (bHasSelectedEntry) if (bHasSelectedEntry)
{ {
m_rDialogModel.moveSeries( pEntry->m_xDataSeries, DialogModel::MOVE_DOWN ); m_rDialogModel.moveSeries( pEntry->m_xDataSeries, DialogModel::MoveDirection::Down );
setDirty(); setDirty();
fillSeriesListBox(); fillSeriesListBox();
SeriesSelectionChangedHdl(*m_xLB_SERIES); SeriesSelectionChangedHdl(*m_xLB_SERIES);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment