diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-31 12:27:01 +0200 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-11-28 00:12:51 -0500 |
commit | bf8fe9eaa36a9f8fc407ddbb2e7b561e5f9594c5 (patch) | |
tree | af3c777e1408b1216d0c71539b570e3a3363158a | |
parent | eb0e8093c325f895f735626ac1326b5e7a1d88b2 (diff) |
convert ScChartGlue to scoped enum
Change-Id: Ia3dd20988d26e23e94581b019ff32c9ebc8663fe
Reviewed-on: https://gerrit.libreoffice.org/33753
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 256ec177f90d43862a7422f01523d22bdb2cd681)
-rw-r--r-- | sc/inc/chartpos.hxx | 12 | ||||
-rw-r--r-- | sc/source/core/tool/chartpos.cxx | 30 |
2 files changed, 21 insertions, 21 deletions
diff --git a/sc/inc/chartpos.hxx b/sc/inc/chartpos.hxx index 664cbc966c08..8801f2c3ac63 100644 --- a/sc/inc/chartpos.hxx +++ b/sc/inc/chartpos.hxx @@ -90,12 +90,12 @@ public: } }; -enum ScChartGlue { - SC_CHARTGLUE_NA, - SC_CHARTGLUE_NONE, // old mimic - SC_CHARTGLUE_COLS, // old mimic - SC_CHARTGLUE_ROWS, - SC_CHARTGLUE_BOTH +enum class ScChartGlue { + NA, + NONE, // old mimic + Cols, // old mimic + Rows, + Both }; class ScDocument; diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index fa95a3553acb..ad16dcfe472d 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -45,7 +45,7 @@ ScChartPositioner::ScChartPositioner( ScDocument* pDoc, SCTAB nTab, SCCOL nStartColP, SCROW nStartRowP, SCCOL nEndColP, SCROW nEndRowP) : pDocument( pDoc ), pPositionMap( nullptr ), - eGlue( SC_CHARTGLUE_NA ), + eGlue( ScChartGlue::NA ), nStartCol(0), nStartRow(0), bColHeaders( false ), @@ -60,7 +60,7 @@ ScChartPositioner::ScChartPositioner( ScDocument* pDoc, const ScRangeListRef& rR aRangeListRef( rRangeList ), pDocument( pDoc ), pPositionMap( nullptr ), - eGlue( SC_CHARTGLUE_NA ), + eGlue( ScChartGlue::NA ), nStartCol(0), nStartRow(0), bColHeaders( false ), @@ -97,7 +97,7 @@ void ScChartPositioner::SetRangeList( const ScRange& rRange ) void ScChartPositioner::GlueState() { - if ( eGlue != SC_CHARTGLUE_NA ) + if ( eGlue != ScChartGlue::NA ) return; bDummyUpperLeft = false; ScRange* pR; @@ -107,9 +107,9 @@ void ScChartPositioner::GlueState() { pR = aRangeListRef->front(); if ( pR->aStart.Tab() == pR->aEnd.Tab() ) - eGlue = SC_CHARTGLUE_NONE; + eGlue = ScChartGlue::NONE; else - eGlue = SC_CHARTGLUE_COLS; // several tables column by column + eGlue = ScChartGlue::Cols; // several tables column by column nStartCol = pR->aStart.Col(); nStartRow = pR->aStart.Row(); } @@ -148,13 +148,13 @@ void ScChartPositioner::GlueState() SCCOL nC = nEndCol - nStartCol + 1; if ( nC == 1 ) { - eGlue = SC_CHARTGLUE_ROWS; + eGlue = ScChartGlue::Rows; return; } SCROW nR = nEndRow - nStartRow + 1; if ( nR == 1 ) { - eGlue = SC_CHARTGLUE_COLS; + eGlue = ScChartGlue::Cols; return; } sal_uLong nCR = (sal_uLong)nC * nR; @@ -249,17 +249,17 @@ void ScChartPositioner::GlueState() if ( bGlue ) { if ( bGlueCols && bGlueRows ) - eGlue = SC_CHARTGLUE_BOTH; + eGlue = ScChartGlue::Both; else if ( bGlueRows ) - eGlue = SC_CHARTGLUE_ROWS; + eGlue = ScChartGlue::Rows; else - eGlue = SC_CHARTGLUE_COLS; + eGlue = ScChartGlue::Cols; if ( pA[0] != CellState::Occupied ) bDummyUpperLeft = true; } else { - eGlue = SC_CHARTGLUE_NONE; + eGlue = ScChartGlue::NONE; } } @@ -293,7 +293,7 @@ void ScChartPositioner::CheckColRowHeaders() } else { - bool bVert = (eGlue == SC_CHARTGLUE_NONE || eGlue == SC_CHARTGLUE_ROWS); + bool bVert = (eGlue == ScChartGlue::NONE || eGlue == ScChartGlue::Rows); for ( size_t i = 0, nRanges = aRangeListRef->size(); (i < nRanges) && (bColStrings || bRowStrings); ++i @@ -335,7 +335,7 @@ const ScChartPositionMap* ScChartPositioner::GetPositionMap() void ScChartPositioner::CreatePositionMap() { - if ( eGlue == SC_CHARTGLUE_NA && pPositionMap ) + if ( eGlue == ScChartGlue::NA && pPositionMap ) { pPositionMap.reset(); } @@ -357,7 +357,7 @@ void ScChartPositioner::CreatePositionMap() GlueState(); - const bool bNoGlue = (eGlue == SC_CHARTGLUE_NONE); + const bool bNoGlue = (eGlue == ScChartGlue::NONE); ColumnMap* pCols = new ColumnMap; SCROW nNoGlueRow = 0; for ( size_t i = 0, nRanges = aRangeListRef->size(); i < nRanges; ++i ) @@ -469,7 +469,7 @@ void ScChartPositioner::CreatePositionMap() void ScChartPositioner::InvalidateGlue() { - eGlue = SC_CHARTGLUE_NA; + eGlue = ScChartGlue::NA; pPositionMap.reset(); } |