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 /svx | |
parent | 9fb3b992df26283e21e89bb2121b3cadd4b22c4d (diff) |
convert CS_ constants to scoped enum
Change-Id: I7fb03a04f086c1952a6f186a00fffad0b6c1236b
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index e799033780f2..230ea82e8b25 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -76,7 +76,7 @@ SvxRectCtl::SvxRectCtl(vcl::Window* pParent, RECT_POINT eRpt, , eDefRP(eRpt) , eCS(eStyle) , pBitmap(NULL) - , m_nState(0) + , m_nState(CTL_STATE::NONE) , mbCompleteDisable(false) { SetMapMode(MAP_100TH_MM); @@ -289,7 +289,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) { case KEY_DOWN: { - if( !(m_nState & CS_NOVERT) ) + if( !(m_nState & CTL_STATE::NOVERT) ) switch( eNewRP ) { case RP_LT: eNewRP = RP_LM; break; @@ -304,7 +304,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) break; case KEY_UP: { - if( !(m_nState & CS_NOVERT) ) + if( !(m_nState & CTL_STATE::NOVERT) ) switch( eNewRP ) { case RP_LM: eNewRP = RP_LT; break; @@ -319,7 +319,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) break; case KEY_LEFT: { - if( !(m_nState & CS_NOHORZ) ) + if( !(m_nState & CTL_STATE::NOHORZ) ) switch( eNewRP ) { case RP_MT: eNewRP = RP_LT; break; @@ -334,7 +334,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) break; case KEY_RIGHT: { - if( !(m_nState & CS_NOHORZ) ) + if( !(m_nState & CTL_STATE::NOHORZ) ) switch( eNewRP ) { case RP_LT: eNewRP = RP_MT; break; @@ -462,8 +462,8 @@ void SvxRectCtl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& Point aBtnPnt2( 11,0 ); Point aBtnPnt3( 22,0 ); - bool bNoHorz = (m_nState & CS_NOHORZ) != 0; - bool bNoVert = (m_nState & CS_NOVERT) != 0; + bool bNoHorz = bool(m_nState & CTL_STATE::NOHORZ); + bool bNoVert = bool(m_nState & CTL_STATE::NOVERT); Bitmap& rBitmap = GetRectBitmap(); @@ -549,10 +549,10 @@ Point SvxRectCtl::SetActualRPWithoutInvalidate( RECT_POINT eNewRP ) Point aPtLast = aPtNew; aPtNew = GetPointFromRP( eNewRP ); - if( (m_nState & CS_NOHORZ) != 0 ) + if( m_nState & CTL_STATE::NOHORZ ) aPtNew.X() = aPtMM.X(); - if( (m_nState & CS_NOVERT) != 0 ) + if( m_nState & CTL_STATE::NOVERT ) aPtNew.Y() = aPtMM.Y(); // fdo#74751 this fix reverse base point on RTL UI. @@ -590,7 +590,7 @@ Point SvxRectCtl::GetApproxLogPtFromPixPt( const Point& rPt ) const long x; long y; - if( ( m_nState & CS_NOHORZ ) == 0 ) + if( !( m_nState & CTL_STATE::NOHORZ ) ) { if( aPt.X() < aSize.Width() / 3 ) x = aPtLT.X(); @@ -602,7 +602,7 @@ Point SvxRectCtl::GetApproxLogPtFromPixPt( const Point& rPt ) const else x = aPtMM.X(); - if( ( m_nState & CS_NOVERT ) == 0 ) + if( !( m_nState & CTL_STATE::NOVERT ) ) { if( aPt.Y() < aSize.Height() / 3 ) y = aPtLT.Y(); @@ -667,10 +667,10 @@ void SvxRectCtl::SetState( CTL_STATE nState ) Point aPtLast( GetPointFromRP( eRP ) ); Point _aPtNew( aPtLast ); - if( (m_nState & CS_NOHORZ) != 0 ) + if( m_nState & CTL_STATE::NOHORZ ) _aPtNew.X() = aPtMM.X(); - if( (m_nState & CS_NOVERT) != 0 ) + if( m_nState & CTL_STATE::NOVERT) _aPtNew.Y() = aPtMM.Y(); eRP = GetRPFromPoint( _aPtNew ); |