diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-08 09:21:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-09 09:41:34 +0000 |
| commit | 50ac0f503b763d08aef4a193c38e64b70220bfba (patch) | |
| tree | 9e02808b2736ac75852060bb3367c8236b9ac334 /cui | |
| parent | 26d314d2e25945941d49a4872d7ffa27cfc2fdc8 (diff) | |
convert FONT_EMPHASIS_MARK to scoped enum
Change-Id: I137c78b337e57d3442db08334128e79d186b278f
Reviewed-on: https://gerrit.libreoffice.org/24753
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index d278b35fa1f2..9f53b7a97680 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1537,7 +1537,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl() nPos = m_pPositionLB->GetSelectEntryPos(); bool bUnder = ( CHRDLG_POSITION_UNDER == reinterpret_cast<sal_uLong>(m_pPositionLB->GetEntryData( nPos )) ); FontEmphasisMark eMark = (FontEmphasisMark)m_pEmphasisLB->GetSelectEntryPos(); - eMark |= bUnder ? EMPHASISMARK_POS_BELOW : EMPHASISMARK_POS_ABOVE; + eMark |= bUnder ? FontEmphasisMark::PosBelow : FontEmphasisMark::PosAbove; rFont.SetEmphasisMark( eMark ); rCJKFont.SetEmphasisMark( eMark ); rCTLFont.SetEmphasisMark( eMark ); @@ -1982,11 +1982,11 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet ) rCJKFont.SetEmphasisMark( eMark ); rCTLFont.SetEmphasisMark( eMark ); - m_pEmphasisLB->SelectEntryPos( (sal_Int32)( eMark & EMPHASISMARK_STYLE ) ); - eMark &= ~EMPHASISMARK_STYLE; - sal_uLong nEntryData = ( eMark == EMPHASISMARK_POS_ABOVE ) + m_pEmphasisLB->SelectEntryPos( (sal_Int32)( eMark & FontEmphasisMark::Style ) ); + eMark &= ~FontEmphasisMark::Style; + sal_uLong nEntryData = ( eMark == FontEmphasisMark::PosAbove ) ? CHRDLG_POSITION_OVER - : ( eMark == EMPHASISMARK_POS_BELOW ) ? CHRDLG_POSITION_UNDER : 0; + : ( eMark == FontEmphasisMark::PosBelow ) ? CHRDLG_POSITION_UNDER : 0; for ( sal_Int32 i = 0; i < m_pPositionLB->GetEntryCount(); i++ ) { @@ -2371,7 +2371,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet* rSet ) if ( m_pPositionLB->IsEnabled() ) { eMark |= ( CHRDLG_POSITION_UNDER == reinterpret_cast<sal_uLong>(m_pPositionLB->GetEntryData( nPosPos )) ) - ? EMPHASISMARK_POS_BELOW : EMPHASISMARK_POS_ABOVE; + ? FontEmphasisMark::PosBelow : FontEmphasisMark::PosAbove; } if ( pOld ) |