include/tools/wintypes.hxx           |   15 ++++++---------
 toolkit/source/awt/vclxtoolkit.cxx   |    4 ----
 toolkit/source/helper/unowrapper.cxx |    3 ---
 vcl/source/control/edit.cxx          |    2 --
 vcl/source/control/spinfld.cxx       |    2 --
 vcl/source/uitest/logger.cxx         |    3 +--
 vcl/source/uitest/uiobject.cxx       |    3 +--
 vcl/source/window/accessibility.cxx  |    5 -----
 vcl/source/window/brdwin.cxx         |    4 ----
 vcl/source/window/window.cxx         |    4 ----
 10 files changed, 8 insertions(+), 37 deletions(-)

New commits:
commit 7b14b4b377c1b94e4899860e1a45abd55230cdca
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jul 3 11:39:03 2020 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Jul 3 13:24:18 2020 +0200

    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.gran...@collabora.co.uk>

diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 58050521c8cb..4181d450aa85 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -37,8 +37,7 @@ enum class WindowType : sal_uInt16
     CONTAINER            ,
     FLOATINGWINDOW       ,
     DIALOG               ,
-    MODELESSDIALOG       , // 10 (314)
-    MODALDIALOG          ,
+    MODELESSDIALOG       ,
     CONTROL              ,
     PUSHBUTTON           ,
     OKBUTTON             ,
@@ -47,7 +46,7 @@ enum class WindowType : sal_uInt16
     IMAGEBUTTON          ,
     MENUBUTTON           ,
     MOREBUTTON           ,
-    SPINBUTTON           , // 20 (324)
+    SPINBUTTON           ,
     RADIOBUTTON          ,
     CHECKBOX             ,
     TRISTATEBOX          ,
@@ -57,7 +56,7 @@ enum class WindowType : sal_uInt16
     LISTBOX              ,
     MULTILISTBOX         ,
     FIXEDTEXT            ,
-    FIXEDLINE            , // 30 (334)
+    FIXEDLINE            ,
     FIXEDBITMAP          ,
     FIXEDIMAGE           ,
     GROUPBOX             ,
@@ -67,7 +66,6 @@ enum class WindowType : sal_uInt16
     SPLITWINDOW          ,
     SPINFIELD            ,
     PATTERNFIELD         ,
-    NUMERICFIELD         , // 40 (344)
     METRICFIELD          ,
     FORMATTEDFIELD       ,
     CURRENCYFIELD        ,
@@ -78,8 +76,7 @@ enum class WindowType : sal_uInt16
     METRICBOX            ,
     CURRENCYBOX          ,
     DATEBOX              ,
-    TIMEBOX              , // 50 (354)
-    LONGCURRENCYFIELD    ,
+    TIMEBOX              ,
     LONGCURRENCYBOX      ,
     SCROLLWINDOW         ,
     TOOLBOX              ,
@@ -88,7 +85,7 @@ enum class WindowType : sal_uInt16
     TABPAGE              ,
     TABCONTROL           ,
     TABDIALOG            ,
-    BORDERWINDOW         , // 60 (364)
+    BORDERWINDOW         ,
     BUTTONDIALOG         ,
     SYSTEMCHILDWINDOW    ,
     SLIDER               ,
@@ -98,7 +95,7 @@ enum class WindowType : sal_uInt16
     INTROWINDOW          ,
     LISTBOXWINDOW        ,
     DOCKINGAREA          ,
-    RULER                , // 70 (374)
+    RULER                ,
     CALCINPUTLINE        ,
     HEADERBAR            ,
     VERTICALTABCONTROL   ,
diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index eee471e9894e..b5407feef977 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -588,7 +588,6 @@ std::pair<WinBits,MessBoxStyle> ImplGetWinBits( sal_uInt32 
nComponentAttribs, Wi
     if  (   bMessBox
         ||  ( nCompType == WindowType::DIALOG )
         ||  ( nCompType == WindowType::MODELESSDIALOG )
-        ||  ( nCompType == WindowType::MODALDIALOG )
         ||  ( nCompType == WindowType::DOCKINGWINDOW )
         ||  ( nCompType == WindowType::TABDIALOG )
         ||  ( nCompType == WindowType::BUTTONDIALOG )
@@ -729,7 +728,6 @@ ComponentInfo const aComponentInfos [] =
     { OUStringLiteral("messbox"),            WindowType::MESSBOX },
     { OUStringLiteral("metricbox"),          WindowType::METRICBOX },
     { OUStringLiteral("metricfield"),        WindowType::METRICFIELD },
-    { OUStringLiteral("modaldialog"),        WindowType::MODALDIALOG },
     { OUStringLiteral("modelessdialog"),     WindowType::MODELESSDIALOG },
     { OUStringLiteral("morebutton"),         WindowType::MOREBUTTON },
     { OUStringLiteral("multilineedit"),      WindowType::MULTILINEEDIT },
@@ -1412,7 +1410,6 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** 
ppNewComp,
         // some time later css::uno::Exception...
         bool bException = true;
         if  (   ( nType == WindowType::DIALOG )
-            ||  ( nType == WindowType::MODALDIALOG )
             ||  ( nType == WindowType::MODELESSDIALOG )
             ||  ( nType == WindowType::MESSBOX )
             ||  ( nType == WindowType::INFOBOX )
@@ -1549,7 +1546,6 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** 
ppNewComp,
                 
static_cast<VCLXFormattedSpinField*>(*ppNewComp)->SetFormatter( 
static_cast<FormatterBase*>(static_cast<MetricField*>(pNewWindow.get())) );
             break;
             case WindowType::DIALOG:
-            case WindowType::MODALDIALOG:
             case WindowType::MODELESSDIALOG:
             {
                 // Modal/Modeless only via Show/Execute
diff --git a/toolkit/source/helper/unowrapper.cxx 
b/toolkit/source/helper/unowrapper.cxx
index aae650261e2d..1078973864dc 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -54,7 +54,6 @@ static css::uno::Reference< css::awt::XWindowPeer > 
CreateXWindow( vcl::Window c
         case WindowType::METRICBOX:
         case WindowType::COMBOBOX:       return new VCLXComboBox;
         case WindowType::SPINFIELD:
-        case WindowType::NUMERICFIELD:
         case WindowType::CURRENCYFIELD:  return new VCLXNumericField;
         case WindowType::DATEFIELD:      return new VCLXDateField;
         case WindowType::MULTILINEEDIT:
@@ -69,9 +68,7 @@ static css::uno::Reference< css::awt::XWindowPeer > 
CreateXWindow( vcl::Window c
         case WindowType::FIXEDTEXT:      return new VCLXFixedText;
         case WindowType::MULTILISTBOX:
         case WindowType::LISTBOX:        return new VCLXListBox;
-        case WindowType::LONGCURRENCYFIELD:  return new VCLXCurrencyField;
         case WindowType::DIALOG:
-        case WindowType::MODALDIALOG:
         case WindowType::TABDIALOG:
         case WindowType::BUTTONDIALOG:
         case WindowType::MODELESSDIALOG: return new VCLXDialog;
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";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to