diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-17 15:37:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-18 08:49:02 +0200 |
| commit | d4ec2ed0c598273479eb658b8cd10e043fe0bc73 (patch) | |
| tree | 1525ac9c9508ad6862e2ea190840c2c80cbad380 /cui | |
| parent | d643cad3f067764ad0d7d7d8f238c590e6e509b5 (diff) | |
convert SdrMeasureTextVPos to scoped enum
Change-Id: I89cc8bc2cfdd3fe059bb38216a10d36dcfea3953
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/measure.cxx | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 3c8d08dc2a62..4585938afc4a 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -352,7 +352,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) RECT_POINT eRP = RP_MM; switch( eVPos ) { - case SDRMEASURE_ABOVE: + case SdrMeasureTextVPos::Above: switch( eHPos ) { case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LT; break; @@ -361,7 +361,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) case SDRMEASURE_TEXTHAUTO: eRP = RP_MT; break; } break; - case SDRMEASURETEXT_VERTICALCENTERED: + case SdrMeasureTextVPos::VerticalCentered: switch( eHPos ) { case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break; @@ -370,7 +370,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) case SDRMEASURE_TEXTHAUTO: eRP = RP_MM; break; } break; - case SDRMEASURE_BELOW: + case SdrMeasureTextVPos::Below: switch( eHPos ) { case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LB; break; @@ -379,7 +379,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) case SDRMEASURE_TEXTHAUTO: eRP = RP_MB; break; } break; - case SDRMEASURE_TEXTVAUTO: + case SdrMeasureTextVPos::Auto: switch( eHPos ) { case SDRMEASURE_TEXTLEFTOUTSIDE: eRP = RP_LM; break; @@ -399,7 +399,7 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) nState = CTL_STATE::NOHORZ; } - if( eVPos == SDRMEASURE_TEXTVAUTO ) + if( eVPos == SdrMeasureTextVPos::Auto ) { m_pTsbAutoPosV->SetState( TRISTATE_TRUE ); nState |= CTL_STATE::NOVERT; @@ -525,30 +525,30 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet* rAttrs) switch( eRP ) { default: - case RP_LT: eVPos = SDRMEASURE_ABOVE; + case RP_LT: eVPos = SdrMeasureTextVPos::Above; eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break; - case RP_LM: eVPos = SDRMEASURETEXT_VERTICALCENTERED; + case RP_LM: eVPos = SdrMeasureTextVPos::VerticalCentered; eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break; - case RP_LB: eVPos = SDRMEASURE_BELOW; + case RP_LB: eVPos = SdrMeasureTextVPos::Below; eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break; - case RP_MT: eVPos = SDRMEASURE_ABOVE; + case RP_MT: eVPos = SdrMeasureTextVPos::Above; eHPos = SDRMEASURE_TEXTINSIDE; break; - case RP_MM: eVPos = SDRMEASURETEXT_VERTICALCENTERED; + case RP_MM: eVPos = SdrMeasureTextVPos::VerticalCentered; eHPos = SDRMEASURE_TEXTINSIDE; break; - case RP_MB: eVPos = SDRMEASURE_BELOW; + case RP_MB: eVPos = SdrMeasureTextVPos::Below; eHPos = SDRMEASURE_TEXTINSIDE; break; - case RP_RT: eVPos = SDRMEASURE_ABOVE; + case RP_RT: eVPos = SdrMeasureTextVPos::Above; eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; - case RP_RM: eVPos = SDRMEASURETEXT_VERTICALCENTERED; + case RP_RM: eVPos = SdrMeasureTextVPos::VerticalCentered; eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; - case RP_RB: eVPos = SDRMEASURE_BELOW; + case RP_RB: eVPos = SdrMeasureTextVPos::Below; eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; } if( m_pTsbAutoPosH->GetState() == TRISTATE_TRUE ) eHPos = SDRMEASURE_TEXTHAUTO; if( m_pTsbAutoPosV->GetState() == TRISTATE_TRUE ) - eVPos = SDRMEASURE_TEXTVAUTO; + eVPos = SdrMeasureTextVPos::Auto; if ( rAttrs->GetItemState( SDRATTR_MEASURETEXTVPOS ) != SfxItemState::DONTCARE ) { @@ -754,23 +754,23 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p ) switch( eRP ) { default: - case RP_LT: eVPos = SDRMEASURE_ABOVE; + case RP_LT: eVPos = SdrMeasureTextVPos::Above; eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break; - case RP_LM: eVPos = SDRMEASURETEXT_VERTICALCENTERED; + case RP_LM: eVPos = SdrMeasureTextVPos::VerticalCentered; eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break; - case RP_LB: eVPos = SDRMEASURE_BELOW; + case RP_LB: eVPos = SdrMeasureTextVPos::Below; eHPos = SDRMEASURE_TEXTLEFTOUTSIDE; break; - case RP_MT: eVPos = SDRMEASURE_ABOVE; + case RP_MT: eVPos = SdrMeasureTextVPos::Above; eHPos = SDRMEASURE_TEXTINSIDE; break; - case RP_MM: eVPos = SDRMEASURETEXT_VERTICALCENTERED; + case RP_MM: eVPos = SdrMeasureTextVPos::VerticalCentered; eHPos = SDRMEASURE_TEXTINSIDE; break; - case RP_MB: eVPos = SDRMEASURE_BELOW; + case RP_MB: eVPos = SdrMeasureTextVPos::Below; eHPos = SDRMEASURE_TEXTINSIDE; break; - case RP_RT: eVPos = SDRMEASURE_ABOVE; + case RP_RT: eVPos = SdrMeasureTextVPos::Above; eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; - case RP_RM: eVPos = SDRMEASURETEXT_VERTICALCENTERED; + case RP_RM: eVPos = SdrMeasureTextVPos::VerticalCentered; eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; - case RP_RB: eVPos = SDRMEASURE_BELOW; + case RP_RB: eVPos = SdrMeasureTextVPos::Below; eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; } @@ -784,7 +784,7 @@ void SvxMeasurePage::ChangeAttrHdl_Impl( void* p ) if( m_pTsbAutoPosV->GetState() == TRISTATE_TRUE ) { - eVPos = SDRMEASURE_TEXTVAUTO; + eVPos = SdrMeasureTextVPos::Auto; nState |= CTL_STATE::NOVERT; } |