convert EditedAndValid to scoped enum

Change-Id: I0f321de899771fe826224decddab1ec92d64a21a

3 files changed, 13 insertions, 13 deletions

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 2ec8336769da..9f325160e104 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1122,17 +1122,17 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
     {
         switch (pLangComboBox->GetEditedAndValid())
         {
-            case SvxLanguageComboBox::EDITED_NO:
+            case SvxLanguageComboBox::EditedAndValid::No:
                 ;   // nothing to do
                 break;
-            case SvxLanguageComboBox::EDITED_VALID:
+            case SvxLanguageComboBox::EditedAndValid::Valid:
                 {
                     const sal_Int32 nPos = pLangComboBox->SaveEditedAsEntry();
                     if (nPos != COMBOBOX_ENTRY_NOTFOUND)
                         pLangComboBox->SelectEntryPos( nPos);
                 }
                 break;
-            case SvxLanguageComboBox::EDITED_INVALID:
+            case SvxLanguageComboBox::EditedAndValid::Invalid:
                 pLangComboBox->SelectEntryPos( pLangComboBox->GetSavedValueLBB());
                 break;
         }
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 1f418f735708..474348e9a07f 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -149,11 +149,11 @@ class SVX_DLLPUBLIC SvxLanguageComboBox : public ComboBox, public SvxLanguageBox
 public:
     SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits );
 
-    enum EditedAndValid
+    enum class EditedAndValid
     {
-        EDITED_NO,
-        EDITED_VALID,
-        EDITED_INVALID
+        No,
+        Valid,
+        Invalid
     };
 
     EditedAndValid      GetEditedAndValid() const { return meEditedAndValid;}
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 690ce9f15155..11655fd32960 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -499,7 +499,7 @@ SvxLanguageComboBox::SvxLanguageComboBox( vcl::Window* pParent, WinBits nBits )
     : ComboBox( pParent, nBits )
     , SvxLanguageBoxBase( false )
     , mnSavedValuePos( COMBOBOX_ENTRY_NOTFOUND )
-    , meEditedAndValid( EDITED_NO )
+    , meEditedAndValid( EditedAndValid::No )
 {
     // display entries sorted
     SetStyle( GetStyle() | WB_SORT );
@@ -682,7 +682,7 @@ IMPL_LINK_NOARG_TYPED( SvxLanguageComboBox, EditModifyHdl, Edit&, void )
     EditedAndValid eOldState = meEditedAndValid;
     OUString aStr( vcl::I18nHelper::filterFormattingChars( GetText()));
     if (aStr.isEmpty())
-        meEditedAndValid = EDITED_INVALID;
+        meEditedAndValid = EditedAndValid::Invalid;
     else
     {
         const sal_Int32 nPos = GetEntryPos( aStr);
@@ -721,13 +721,13 @@ IMPL_LINK_NOARG_TYPED( SvxLanguageComboBox, EditModifyHdl, Edit&, void )
             if (bSetEditSelection)
                 SetSelection( aSel);
 
-            meEditedAndValid = EDITED_NO;
+            meEditedAndValid = EditedAndValid::No;
         }
         else
         {
             OUString aCanonicalized;
             bool bValid = LanguageTag::isValidBcp47( aStr, &aCanonicalized, true);
-            meEditedAndValid = (bValid ? EDITED_VALID : EDITED_INVALID);
+            meEditedAndValid = (bValid ? EditedAndValid::Valid : EditedAndValid::Invalid);
             if (bValid && aCanonicalized != aStr)
             {
                 SetText( aCanonicalized);
@@ -737,7 +737,7 @@ IMPL_LINK_NOARG_TYPED( SvxLanguageComboBox, EditModifyHdl, Edit&, void )
     }
     if (eOldState != meEditedAndValid)
     {
-        if (meEditedAndValid == EDITED_INVALID)
+        if (meEditedAndValid == EditedAndValid::Invalid)
         {
 #if 0
             //! Gives white on white!?! instead of white on reddish.
@@ -758,7 +758,7 @@ IMPL_LINK_NOARG_TYPED( SvxLanguageComboBox, EditModifyHdl, Edit&, void )
 
 sal_Int32 SvxLanguageComboBox::SaveEditedAsEntry()
 {
-    if (meEditedAndValid != EDITED_VALID)
+    if (meEditedAndValid != EditedAndValid::Valid)
         return COMBOBOX_ENTRY_NOTFOUND;
 
     LanguageTag aLanguageTag( vcl::I18nHelper::filterFormattingChars( GetText()));