remove some dead WindowType values

Change-Id: I7eb67e48a87e8cc2babbd46d482294877b08ab99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97828
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 2 insertions, 21 deletions

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 000b660ca04a..11121241868c 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -951,8 +951,6 @@ ControlType Edit::ImplGetNativeControlType() const
         case WindowType::CURRENCYFIELD:
         case WindowType::DATEFIELD:
         case WindowType::TIMEFIELD:
-        case WindowType::LONGCURRENCYFIELD:
-        case WindowType::NUMERICFIELD:
         case WindowType::SPINFIELD:
         case WindowType::FORMATTEDFIELD:
             if (pControl->GetStyle() & WB_SPIN)
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index a5206cf72a4d..07bc43cbc41d 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -174,8 +174,6 @@ void ImplDrawSpinButton(vcl::RenderContext& rRenderContext, vcl::Window* pWindow
             case WindowType::CURRENCYFIELD:
             case WindowType::DATEFIELD:
             case WindowType::TIMEFIELD:
-            case WindowType::LONGCURRENCYFIELD:
-            case WindowType::NUMERICFIELD:
             case WindowType::SPINFIELD:
             case WindowType::FORMATTEDFIELD:
                 aControl = ControlType::Spinbox;
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 13cbf5a7ab21..93edcc14ddfe 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -27,8 +27,7 @@ namespace
 bool isDialogWindow(vcl::Window const* pWindow)
 {
     WindowType nType = pWindow->GetType();
-    // DIALOG to MODALDIALOG
-    if (nType >= WindowType::DIALOG && nType <= WindowType::MODALDIALOG)
+    if (nType == WindowType::DIALOG || nType == WindowType::MODELESSDIALOG)
         return true;
 
     // MESSBOX, INFOBOX, WARNINGBOX, ERRORBOX, QUERYBOX
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 56d09ddebb0a..947dda576c73 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -92,8 +92,7 @@ namespace {
 bool isDialogWindow(vcl::Window const * pWindow)
 {
     WindowType nType = pWindow->GetType();
-    // DIALOG to MODALDIALOG
-    if (nType >= WindowType::DIALOG && nType <= WindowType::MODALDIALOG)
+    if (nType == WindowType::DIALOG || nType == WindowType::MODELESSDIALOG)
         return true;
 
     // MESSBOX, INFOBOX, WARNINGBOX, ERRORBOX, QUERYBOX
diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index 059585233a4d..f8649bb40782 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -241,7 +241,6 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
         case WindowType::QUERYBOX: nRole = accessibility::AccessibleRole::ALERT; break;
 
         case WindowType::MODELESSDIALOG:
-        case WindowType::MODALDIALOG:
         case WindowType::TABDIALOG:
         case WindowType::BUTTONDIALOG:
         case WindowType::DIALOG: nRole = accessibility::AccessibleRole::DIALOG; break;
@@ -300,10 +299,8 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
         case WindowType::DATEFIELD:
         case WindowType::TIMEFIELD: nRole = accessibility::AccessibleRole::DATE_EDITOR; break;
 
-        case WindowType::NUMERICFIELD:
         case WindowType::METRICFIELD:
         case WindowType::CURRENCYFIELD:
-        case WindowType::LONGCURRENCYFIELD:
         case WindowType::SPINFIELD:
         case WindowType::FORMATTEDFIELD: nRole = accessibility::AccessibleRole::SPIN_BOX; break;
 
@@ -391,10 +388,8 @@ OUString Window::getDefaultAccessibleName() const
     {
         case WindowType::MULTILINEEDIT:
         case WindowType::PATTERNFIELD:
-        case WindowType::NUMERICFIELD:
         case WindowType::METRICFIELD:
         case WindowType::CURRENCYFIELD:
-        case WindowType::LONGCURRENCYFIELD:
         case WindowType::CALCINPUTLINE:
         case WindowType::EDIT:
 
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 4195cf0bba95..07c3511bc5c8 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -467,8 +467,6 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
                     case WindowType::CURRENCYFIELD:
                     case WindowType::DATEFIELD:
                     case WindowType::TIMEFIELD:
-                    case WindowType::LONGCURRENCYFIELD:
-                    case WindowType::NUMERICFIELD:
                     case WindowType::SPINFIELD:
                     case WindowType::FORMATTEDFIELD:
                     case WindowType::CALCINPUTLINE:
@@ -609,8 +607,6 @@ void ImplSmallBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, c
             case WindowType::CURRENCYFIELD:
             case WindowType::DATEFIELD:
             case WindowType::TIMEFIELD:
-            case WindowType::LONGCURRENCYFIELD:
-            case WindowType::NUMERICFIELD:
             case WindowType::SPINFIELD:
             case WindowType::FORMATTEDFIELD:
             case WindowType::CALCINPUTLINE:
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e1c498de28ac..6b3d44e6d716 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1021,7 +1021,6 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p
         {
             case WindowType::DIALOG:
             case WindowType::TABDIALOG:
-            case WindowType::MODALDIALOG:
             case WindowType::MODELESSDIALOG:
             case WindowType::MESSBOX:
             case WindowType::INFOBOX:
@@ -3306,7 +3305,6 @@ const char* windowTypeName(WindowType nWindowType)
         case WindowType::FLOATINGWINDOW:            return "floatingwindow";
         case WindowType::DIALOG:                    return "dialog";
         case WindowType::MODELESSDIALOG:            return "modelessdialog";
-        case WindowType::MODALDIALOG:               return "modaldialog";
         case WindowType::CONTROL:                   return "control";
         case WindowType::PUSHBUTTON:                return "pushbutton";
         case WindowType::OKBUTTON:                  return "okbutton";
@@ -3335,7 +3333,6 @@ const char* windowTypeName(WindowType nWindowType)
         case WindowType::SPLITWINDOW:               return "splitwindow";
         case WindowType::SPINFIELD:                 return "spinfield";
         case WindowType::PATTERNFIELD:              return "patternfield";
-        case WindowType::NUMERICFIELD:              return "numericfield";
         case WindowType::METRICFIELD:               return "metricfield";
         case WindowType::FORMATTEDFIELD:            return "formattedfield";
         case WindowType::CURRENCYFIELD:             return "currencyfield";
@@ -3347,7 +3344,6 @@ const char* windowTypeName(WindowType nWindowType)
         case WindowType::CURRENCYBOX:               return "currencybox";
         case WindowType::DATEBOX:                   return "datebox";
         case WindowType::TIMEBOX:                   return "timebox";
-        case WindowType::LONGCURRENCYFIELD:         return "longcurrencyfield";
         case WindowType::LONGCURRENCYBOX:           return "longcurrencybox";
         case WindowType::SCROLLWINDOW:              return "scrollwindow";
         case WindowType::TOOLBOX:                   return "toolbox";