[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - toolkit/source

[Caolán McNamara (via logerrit)]

 toolkit/source/awt/vclxtoolkit.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 839fb5486ed517bc4f08a408279588ca777432eb
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Nov 14 09:40:48 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Nov 14 20:29:25 2019 +0100

    Resolves: tdf#128792 progressbar control not created
    
    Change-Id: I81ff4e56d5ea2a4f5b7c034c2a99df881969b119
    Reviewed-on: https://gerrit.libreoffice.org/82656
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index dced58ba0b53..2121e14c3e15 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -707,6 +707,7 @@ static ComponentInfo const aComponentInfos [] =
     { OUStringLiteral("edit"),               WindowType::EDIT },
     { OUStringLiteral("errorbox"),           WindowType::ERRORBOX },
     { OUStringLiteral("fixedbitmap"),        WindowType::FIXEDBITMAP },
+    { OUStringLiteral("fixedhyperlink"),     WindowType::CONTROL },
     { OUStringLiteral("fixedimage"),         WindowType::FIXEDIMAGE },
     { OUStringLiteral("fixedline"),          WindowType::FIXEDLINE },
     { OUStringLiteral("fixedtext"),          WindowType::FIXEDTEXT },
@@ -734,9 +735,11 @@ static ComponentInfo const aComponentInfos [] =
     { OUStringLiteral("okbutton"),           WindowType::OKBUTTON },
     { OUStringLiteral("patternbox"),         WindowType::PATTERNBOX },
     { OUStringLiteral("patternfield"),       WindowType::PATTERNFIELD },
+    { OUStringLiteral("progressbar"),        WindowType::CONTROL },
     { OUStringLiteral("pushbutton"),         WindowType::PUSHBUTTON },
     { OUStringLiteral("querybox"),           WindowType::QUERYBOX },
     { OUStringLiteral("radiobutton"),        WindowType::RADIOBUTTON },
+    { OUStringLiteral("roadmap"),            WindowType::CONTROL },
     { OUStringLiteral("scrollbar"),          WindowType::SCROLLBAR },
     { OUStringLiteral("scrollbarbox"),       WindowType::SCROLLBARBOX },
     { OUStringLiteral("spinbutton"),         WindowType::SPINBUTTON },
@@ -1792,12 +1795,12 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                     pNewWindow = VclPtr<::vcl::ORoadmap>::Create( pParent, WB_TABSTOP );
                     *ppNewComp = new SVTXRoadmap;
                 }
-                else if (aServiceName == "FixedHyperlink")
+                else if (aServiceName == "fixedhyperlink")
                 {
                     pNewWindow = VclPtr<FixedHyperlink>::Create( pParent, nWinBits );
                     *ppNewComp = new VCLXFixedHyperlink;
                 }
-                else if (aServiceName == "ProgressBar")
+                else if (aServiceName == "progressbar")
                 {
                     pNewWindow = VclPtr<ProgressBar>::Create( pParent, nWinBits );
                     *ppNewComp = new VCLXProgressBar;