diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-30 11:20:37 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-01 09:36:19 +0200 |
commit | 4b66829390b286010b37b37ec1537a320d8cea8f (patch) | |
tree | e3070f55a80dd8d6f5944db4594608865d0fbbcc /sw/source/core/frmedt/tblsel.cxx | |
parent | 427ef167e1a49ba7fcdef082de43622e02a84ce5 (diff) |
convert BOX_LINE and BOXINFO_LINE to enum class
since their usage is intertwined.
Also introduce new o3tl utilities enumrange and enumarray to make
working with scoped enums a little simpler.
Change-Id: I2e1cc65dd7c638e59f17d96dfae504747cad6533
Diffstat (limited to 'sw/source/core/frmedt/tblsel.cxx')
-rw-r--r-- | sw/source/core/frmedt/tblsel.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index 4a1f369b8cb7..d08835d11cde 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -1030,7 +1030,7 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, .GetItemState( RES_BOX, false, &pItem )) { SvxBoxItem aBox( *static_cast<const SvxBoxItem*>(pItem) ); - aBox.SetLine( 0, BOX_LINE_RIGHT ); + aBox.SetLine( 0, SvxBoxItemLine::RIGHT ); pBox->GetFrmFmt()->SetFmtAttr( aBox ); } } @@ -1313,8 +1313,8 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, { SvxBoxItem aBox( pFirstBox->GetFrmFmt()->GetBox() ); const SvxBoxItem& rBox = pLastBox->GetFrmFmt()->GetBox(); - aBox.SetLine( rBox.GetRight(), BOX_LINE_RIGHT ); - aBox.SetLine( rBox.GetBottom(), BOX_LINE_BOTTOM ); + aBox.SetLine( rBox.GetRight(), SvxBoxItemLine::RIGHT ); + aBox.SetLine( rBox.GetBottom(), SvxBoxItemLine::BOTTOM ); if( aBox.GetLeft() || aBox.GetTop() || aBox.GetRight() || aBox.GetBottom() ) (*ppMergeBox)->GetFrmFmt()->SetFmtAttr( aBox ); |