diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-18 14:01:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-19 08:18:37 +0200 |
| commit | 6078d593fa27eab2035d97e7ef69872564e30f60 (patch) | |
| tree | 754c743681207eba8cea639dc53d7639f7356314 /svx/source/table/svdotable.cxx | |
| parent | 1a37d46c794fd8aa5cf2dba0d74103c5c74e9ca2 (diff) | |
convert TableHitKind to scoped enum
Change-Id: Ie9cde732a85adadc4edead9a29b456ff15b3f750
Diffstat (limited to 'svx/source/table/svdotable.cxx')
| -rw-r--r-- | svx/source/table/svdotable.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 768506ce09af..028ce8c2fa31 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -1054,7 +1054,7 @@ void SdrTableObj::setTableStyleSettings( const TableStyleSettings& rStyle ) TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_Int32& rnY, const sal_uInt16 aTol ) const { if( !mpImpl.is() || !mpImpl->mxTable.is() ) - return SDRTABLEHIT_NONE; + return TableHitKind::NONE; rnX = 0; rnY = 0; @@ -1066,7 +1066,7 @@ TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_ sal_Int32 nY = rPos.Y() - maRect.Top(); if( (nX < 0) || (nX > maRect.GetWidth()) || (nY < 0) || (nY > maRect.GetHeight() ) ) - return SDRTABLEHIT_NONE; + return TableHitKind::NONE; // get vertical edge number and check for a hit const bool bRTL = (GetWritingMode() == WritingMode_RL_TB); @@ -1141,10 +1141,10 @@ TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_ // rnY is now the edge number above the pointer, if it was hit bVrtHit is also true if( bVrtHit && mpImpl->mpLayouter->isEdgeVisible( rnX, rnY, false ) ) - return SDRTABLEHIT_VERTICAL_BORDER; + return TableHitKind::VerticallBorder; if( bHrzHit && mpImpl->mpLayouter->isEdgeVisible( rnX, rnY, true ) ) - return SDRTABLEHIT_HORIZONTAL_BORDER; + return TableHitKind::HorizontalBorder; CellRef xCell( mpImpl->getCell( CellPos( rnX, rnY ) ) ); if( xCell.is() && xCell->isMerged() ) @@ -1166,10 +1166,10 @@ TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_ } if( nX < xCell->GetTextLeftDistance() ) - return SDRTABLEHIT_CELL; + return TableHitKind::Cell; } - return SDRTABLEHIT_CELLTEXTAREA; + return TableHitKind::CellTextArea; } const SfxItemSet& SdrTableObj::GetActiveCellItemSet() const @@ -1271,7 +1271,7 @@ sal_Int32 SdrTableObj::CheckTextHit(const Point& rPnt) const if( mpImpl.is() && mpImpl->mxTable.is() ) { CellPos aPos; - if( CheckTableHit( rPnt, aPos.mnCol, aPos.mnRow ) == SDRTABLEHIT_CELLTEXTAREA ) + if( CheckTableHit( rPnt, aPos.mnCol, aPos.mnRow ) == TableHitKind::CellTextArea ) return aPos.mnRow * mpImpl->mxTable->getColumnCount() + aPos.mnCol; } |