Kaydet (Commit) bea25d18 authored tarafından Noel Grandin's avatar Noel Grandin

convert Action enum in SC to enum class

to get the NONE constant out of the global namespace

Change-Id: I68b7ab93fe0d4f8d02beb96798cd79e8aa3a0c71
üst d8a0ecc9
...@@ -124,7 +124,7 @@ const SwCrsrShell* SwAccessibleContext::GetCrsrShell() const ...@@ -124,7 +124,7 @@ const SwCrsrShell* SwAccessibleContext::GetCrsrShell() const
return pCrsrShell; return pCrsrShell;
} }
enum Action { NONE, SCROLLED, SCROLLED_WITHIN, enum class Action { NONE, SCROLLED, SCROLLED_WITHIN,
SCROLLED_IN, SCROLLED_OUT }; SCROLLED_IN, SCROLLED_OUT };
void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
...@@ -141,23 +141,23 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, ...@@ -141,23 +141,23 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
const SwRect aBox( rLower.GetBox( *(GetMap()) ) ); const SwRect aBox( rLower.GetBox( *(GetMap()) ) );
if( rLower.IsAccessible( GetShell()->IsPreview() ) ) if( rLower.IsAccessible( GetShell()->IsPreview() ) )
{ {
Action eAction = NONE; Action eAction = Action::NONE;
if( aBox.IsOver( rNewVisArea ) ) if( aBox.IsOver( rNewVisArea ) )
{ {
if( aBox.IsOver( rOldVisArea ) ) if( aBox.IsOver( rOldVisArea ) )
{ {
eAction = SCROLLED_WITHIN; eAction = Action::SCROLLED_WITHIN;
} }
else else
{ {
if ( bVisibleChildrenOnly && if ( bVisibleChildrenOnly &&
!rLower.AlwaysIncludeAsChild() ) !rLower.AlwaysIncludeAsChild() )
{ {
eAction = SCROLLED_IN; eAction = Action::SCROLLED_IN;
} }
else else
{ {
eAction = SCROLLED; eAction = Action::SCROLLED;
} }
} }
} }
...@@ -166,11 +166,11 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, ...@@ -166,11 +166,11 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
if ( bVisibleChildrenOnly && if ( bVisibleChildrenOnly &&
!rLower.AlwaysIncludeAsChild() ) !rLower.AlwaysIncludeAsChild() )
{ {
eAction = SCROLLED_OUT; eAction = Action::SCROLLED_OUT;
} }
else else
{ {
eAction = SCROLLED; eAction = Action::SCROLLED;
} }
} }
else if( !bVisibleChildrenOnly || else if( !bVisibleChildrenOnly ||
...@@ -178,9 +178,9 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, ...@@ -178,9 +178,9 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
{ {
// This wouldn't be required if the SwAccessibleFrame, // This wouldn't be required if the SwAccessibleFrame,
// wouldn't know about the visible area. // wouldn't know about the visible area.
eAction = SCROLLED; eAction = Action::SCROLLED;
} }
if( NONE != eAction ) if( Action::NONE != eAction )
{ {
if ( rLower.GetSwFrm() ) if ( rLower.GetSwFrm() )
{ {
...@@ -193,19 +193,19 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, ...@@ -193,19 +193,19 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
{ {
switch( eAction ) switch( eAction )
{ {
case SCROLLED: case Action::SCROLLED:
xAccImpl->Scrolled( rOldVisArea ); xAccImpl->Scrolled( rOldVisArea );
break; break;
case SCROLLED_WITHIN: case Action::SCROLLED_WITHIN:
xAccImpl->ScrolledWithin( rOldVisArea ); xAccImpl->ScrolledWithin( rOldVisArea );
break; break;
case SCROLLED_IN: case Action::SCROLLED_IN:
xAccImpl->ScrolledIn(); xAccImpl->ScrolledIn();
break; break;
case SCROLLED_OUT: case Action::SCROLLED_OUT:
xAccImpl->ScrolledOut( rOldVisArea ); xAccImpl->ScrolledOut( rOldVisArea );
break; break;
case NONE: case Action::NONE:
break; break;
} }
} }
...@@ -226,24 +226,24 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, ...@@ -226,24 +226,24 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
{ {
switch( eAction ) switch( eAction )
{ {
case SCROLLED: case Action::SCROLLED:
case SCROLLED_WITHIN: case Action::SCROLLED_WITHIN:
xAccImpl->ViewForwarderChanged( xAccImpl->ViewForwarderChanged(
::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, ::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA,
GetMap() ); GetMap() );
break; break;
case SCROLLED_IN: case Action::SCROLLED_IN:
ScrolledInShape( rLower.GetDrawObject(), ScrolledInShape( rLower.GetDrawObject(),
xAccImpl.get() ); xAccImpl.get() );
break; break;
case SCROLLED_OUT: case Action::SCROLLED_OUT:
{ {
xAccImpl->ViewForwarderChanged( xAccImpl->ViewForwarderChanged(
::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, ::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA,
GetMap() ); GetMap() );
} }
break; break;
case NONE: case Action::NONE:
break; break;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment