commit 2e412c5354134fe3cd66ea0266011c5b87dc9eb3
author Caolán McNamara <caolanm@redhat.com> Thu Oct 15 09:08:46 2020 +0100
committer Caolán McNamara <caolanm@redhat.com> Fri Oct 16 12:54:34 2020 +0200
tree 321a2f72ad3d9bef17db9a8c1b11768b5cf1e405
parent e087e25f05e689091cbf1c4f91b6e93878ac17ec

WindowType::CALCINPUTLINE newly unused

originally introduced by...

commit cba0dad4566652f63ea3114660da4e5c7dd88c31
Date:   Wed Jun 13 14:08:28 2012 +0200

    calc input line: Fix crash with accessibility enabled.

Change-Id: Iee0914b79d3b48f4479e62622fbdb5dbdf26d527
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104356
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

include/tools/wintypes.hxx

diff --git a/include/tools/wintypes.hxx b/include/tools/wintypes.hxx
index 4181d45..75557c4 100644
--- a/include/tools/wintypes.hxx
+++ b/include/tools/wintypes.hxx
@@ -96,7 +96,6 @@ enum class WindowType : sal_uInt16
    LISTBOXWINDOW        ,
    DOCKINGAREA          ,
    RULER                ,
    CALCINPUTLINE        ,
    HEADERBAR            ,
    VERTICALTABCONTROL   ,
    LAST                 = VERTICALTABCONTROL,

vcl/source/window/accessibility.cxx

diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx
index f8649bb..4e37682 100644
--- a/vcl/source/window/accessibility.cxx
+++ b/vcl/source/window/accessibility.cxx
@@ -263,8 +263,6 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
        case WindowType::PATTERNFIELD:
        case WindowType::EDIT: nRole = static_cast<Edit const *>(this)->IsPassword() ? accessibility::AccessibleRole::PASSWORD_TEXT : accessibility::AccessibleRole::TEXT; break;

        case WindowType::CALCINPUTLINE: nRole = accessibility::AccessibleRole::TEXT; break;

        case WindowType::PATTERNBOX:
        case WindowType::NUMERICBOX:
        case WindowType::METRICBOX:
@@ -390,7 +388,6 @@ OUString Window::getDefaultAccessibleName() const
        case WindowType::PATTERNFIELD:
        case WindowType::METRICFIELD:
        case WindowType::CURRENCYFIELD:
        case WindowType::CALCINPUTLINE:
        case WindowType::EDIT:

        case WindowType::DATEBOX:

vcl/source/window/brdwin.cxx

diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index a3a72d3..a6af674 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -469,7 +469,6 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
                    case WindowType::TIMEFIELD:
                    case WindowType::SPINFIELD:
                    case WindowType::FORMATTEDFIELD:
                    case WindowType::CALCINPUTLINE:
                        mbNWFBorder = true;
                        if (pCtrl->GetStyle() & WB_SPIN)
                            aCtrlType = ControlType::Spinbox;
@@ -609,7 +608,6 @@ void ImplSmallBorderWindowView::DrawWindow(vcl::RenderContext& rRenderContext, c
            case WindowType::TIMEFIELD:
            case WindowType::SPINFIELD:
            case WindowType::FORMATTEDFIELD:
            case WindowType::CALCINPUTLINE:
                if (pCtrl->GetStyle() & WB_SPIN)
                    aCtrlType = ControlType::Spinbox;
                else

vcl/source/window/window.cxx

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 1ba367a..7fd200c 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -3317,7 +3317,6 @@ const char* windowTypeName(WindowType nWindowType)
        case WindowType::LISTBOXWINDOW:             return "listboxwindow";
        case WindowType::DOCKINGAREA:               return "dockingarea";
        case WindowType::RULER:                     return "ruler";
        case WindowType::CALCINPUTLINE:             return "calcinputline";
        case WindowType::HEADERBAR:                 return "headerbar";
        case WindowType::VERTICALTABCONTROL:        return "verticaltabcontrol";