Kaydet (Commit) cc12a1b7 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin

Convert TextDirectionality to scoped enum

Change-Id: I1046e791a73ec07be5a946c63a2256939a323e91
Reviewed-on: https://gerrit.libreoffice.org/25497Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 9aa30865
......@@ -750,11 +750,11 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE
EditPaM aOldPaM( aPaM );
TextDirectionality eTextDirection = TextDirectionality_LeftToRight_TopToBottom;
TextDirectionality eTextDirection = TextDirectionality::LeftToRight_TopToBottom;
if ( IsVertical() )
eTextDirection = TextDirectionality_TopToBottom_RightToLeft;
eTextDirection = TextDirectionality::TopToBottom_RightToLeft;
else if ( IsRightToLeft( GetEditDoc().GetPos( aPaM.GetNode() ) ) )
eTextDirection = TextDirectionality_RightToLeft_TopToBottom;
eTextDirection = TextDirectionality::RightToLeft_TopToBottom;
KeyEvent aTranslatedKeyEvent = rKeyEvent.LogicalTextDirectionality( eTextDirection );
......
......@@ -38,10 +38,10 @@ namespace com { namespace sun { namespace star { namespace awt {
struct MouseEvent;
} } } }
enum TextDirectionality {
TextDirectionality_LeftToRight_TopToBottom,
TextDirectionality_RightToLeft_TopToBottom,
TextDirectionality_TopToBottom_RightToLeft
enum class TextDirectionality {
LeftToRight_TopToBottom,
RightToLeft_TopToBottom,
TopToBottom_RightToLeft
};
class VCL_DLLPUBLIC KeyEvent
......
......@@ -1175,9 +1175,9 @@ TextSelection TextView::ImpMoveCursor( const KeyEvent& rKeyEvent )
TextPaM aPaM( mpImpl->maSelection.GetEnd() );
TextPaM aOldEnd( aPaM );
TextDirectionality eTextDirection = TextDirectionality_LeftToRight_TopToBottom;
TextDirectionality eTextDirection = TextDirectionality::LeftToRight_TopToBottom;
if ( mpImpl->mpTextEngine->IsRightToLeft() )
eTextDirection = TextDirectionality_RightToLeft_TopToBottom;
eTextDirection = TextDirectionality::RightToLeft_TopToBottom;
KeyEvent aTranslatedKeyEvent = rKeyEvent.LogicalTextDirectionality( eTextDirection );
......
......@@ -37,7 +37,7 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const
switch (eMode)
{
case TextDirectionality_RightToLeft_TopToBottom:
case TextDirectionality::RightToLeft_TopToBottom:
switch (nCode)
{
case KEY_LEFT: aClone.maKeyCode = vcl::KeyCode(KEY_RIGHT, nMod); break;
......@@ -45,7 +45,7 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const
}
break;
case TextDirectionality_TopToBottom_RightToLeft:
case TextDirectionality::TopToBottom_RightToLeft:
switch (nCode)
{
case KEY_DOWN: aClone.maKeyCode = vcl::KeyCode(KEY_RIGHT, nMod); break;
......@@ -55,7 +55,7 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const
}
break;
case TextDirectionality_LeftToRight_TopToBottom:
case TextDirectionality::LeftToRight_TopToBottom:
/* do nothing */
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