diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-22 14:29:44 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-29 10:41:38 +0200 |
| commit | 0779e5a6a7bd4388638c337718ff3f934b64bd3a (patch) | |
| tree | c409b1835bf82d351eb0ac1d0bba43cb45d8da83 /cui | |
| parent | 9fb3b992df26283e21e89bb2121b3cadd4b22c4d (diff) | |
convert CS_ constants to scoped enum
Change-Id: I7fb03a04f086c1952a6f186a00fffad0b6c1236b
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/measure.cxx | 12 | ||||
| -rw-r--r-- | cui/source/tabpages/textattr.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 2053ecf37977..0f4213da4a2d 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -392,18 +392,18 @@ void SvxMeasurePage::Reset( const SfxItemSet* rAttrs ) default: ;//prevent warning } - CTL_STATE nState = 0; + CTL_STATE nState = CTL_STATE::NONE; if( eHPos == SDRMEASURE_TEXTHAUTO ) { m_pTsbAutoPosH->SetState( TRISTATE_TRUE ); - nState = CS_NOHORZ; + nState = CTL_STATE::NOHORZ; } if( eVPos == SDRMEASURE_TEXTVAUTO ) { m_pTsbAutoPosV->SetState( TRISTATE_TRUE ); - nState |= CS_NOVERT; + nState |= CTL_STATE::NOVERT; } m_pCtlPosition->SetState( nState ); @@ -766,18 +766,18 @@ IMPL_LINK( SvxMeasurePage, ChangeAttrHdl_Impl, void *, p ) eHPos = SDRMEASURE_TEXTRIGHTOUTSIDE; break; } - CTL_STATE nState = 0; + CTL_STATE nState = CTL_STATE::NONE; if( m_pTsbAutoPosH->GetState() == TRISTATE_TRUE ) { eHPos = SDRMEASURE_TEXTHAUTO; - nState = CS_NOHORZ; + nState = CTL_STATE::NOHORZ; } if( m_pTsbAutoPosV->GetState() == TRISTATE_TRUE ) { eVPos = SDRMEASURE_TEXTVAUTO; - nState |= CS_NOVERT; + nState |= CTL_STATE::NOVERT; } if( p == m_pTsbAutoPosV || p == m_pTsbAutoPosH ) diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index d04a830b9dbd..9d7a3af424f9 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -298,7 +298,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs ) // VertAdjust or HorAdjust is not unequivocal m_pCtlPosition->Reset(); - m_pCtlPosition->SetState(TRISTATE_INDET); + m_pCtlPosition->SetState(CTL_STATE::NOVERT); m_pCtlPosition->DoCompletelyDisable(true); m_pTsbFullWidth->SetState(TRISTATE_INDET); |