diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-11 15:12:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-12 08:44:50 +0200 |
| commit | 8aa1abe5afc52375d038710c4e7c68e97fd04fc6 (patch) | |
| tree | 51f6974aa46fd21883cd8e18a41a26a7fc05a074 /sc/source/ui/view/output2.cxx | |
| parent | 2f5fdd71dbeba5fd0bd21849817633cf64685f21 (diff) | |
convert SC_CLIPMARK constants to typed_flags_set
Change-Id: Ibdfe3c46da35b96b040f02a167d35651502a65ef
Diffstat (limited to 'sc/source/ui/view/output2.cxx')
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 0279dfc8b3a7..0d38a6eeb618 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -1313,14 +1313,14 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY // even if rThisRowInfo isn't for nCellY (merged cells). if ( nRightMissing > 0 && bMarkClipped && nRightX >= nX1 && nRightX <= nX2 && !bBreak && !bCellIsValue ) { - rThisRowInfo.pCellInfo[nRightX+1].nClipMark |= SC_CLIPMARK_RIGHT; + rThisRowInfo.pCellInfo[nRightX+1].nClipMark |= ScClipMark::Right; bAnyClipped = true; long nMarkPixel = (long)( SC_CLIPMARK_SIZE * mnPPTX ); rParam.maClipRect.Right() -= nMarkPixel * nLayoutSign; } if ( nLeftMissing > 0 && bMarkClipped && nLeftX >= nX1 && nLeftX <= nX2 && !bBreak && !bCellIsValue ) { - rThisRowInfo.pCellInfo[nLeftX+1].nClipMark |= SC_CLIPMARK_LEFT; + rThisRowInfo.pCellInfo[nLeftX+1].nClipMark |= ScClipMark::Left; bAnyClipped = true; long nMarkPixel = (long)( SC_CLIPMARK_SIZE * mnPPTX ); rParam.maClipRect.Left() += nMarkPixel * nLayoutSign; @@ -3057,7 +3057,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) else pClipMarkCell = &rParam.mpThisRowInfo->pCellInfo[rParam.mnX+1]; - pClipMarkCell->nClipMark |= SC_CLIPMARK_RIGHT; //! also allow left? + pClipMarkCell->nClipMark |= ScClipMark::Right; //! also allow left? bAnyClipped = true; long nMarkPixel = (long)( SC_CLIPMARK_SIZE * mnPPTX ); @@ -3187,7 +3187,7 @@ void ScOutputData::ShowClipMarks( DrawEditParam& rParam, long nEngineHeight, con else pClipMarkCell = &rParam.mpThisRowInfo->pCellInfo[rParam.mnX+1]; - pClipMarkCell->nClipMark |= SC_CLIPMARK_RIGHT; //! also allow left? + pClipMarkCell->nClipMark |= ScClipMark::Right; //! also allow left? bAnyClipped = true; const long nMarkPixel = static_cast<long>( SC_CLIPMARK_SIZE * mnPPTX ); @@ -4032,7 +4032,7 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) else pClipMarkCell = &rParam.mpThisRowInfo->pCellInfo[rParam.mnX+1]; - pClipMarkCell->nClipMark |= SC_CLIPMARK_RIGHT; //! also allow left? + pClipMarkCell->nClipMark |= ScClipMark::Right; //! also allow left? bAnyClipped = true; long nMarkPixel = (long)( SC_CLIPMARK_SIZE * mnPPTX ); @@ -4379,7 +4379,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) else pClipMarkCell = &rParam.mpThisRowInfo->pCellInfo[rParam.mnX+1]; - pClipMarkCell->nClipMark |= SC_CLIPMARK_RIGHT; //! also allow left? + pClipMarkCell->nClipMark |= ScClipMark::Right; //! also allow left? bAnyClipped = true; long nMarkPixel = (long)( SC_CLIPMARK_SIZE * mnPPTX ); |