commit f9eea764389eae7e6b77076c1a80a8e6f280f9c4
author Caolán McNamara <caolanm@redhat.com> Mon Aug 10 15:55:50 2020 +0100
committer Caolán McNamara <caolanm@redhat.com> Mon Aug 10 18:35:12 2020 +0200
tree b89a5967c48c8206a2467c23b9a94c4d0591c146
parent 54ffd565154bd1ad890bbb8e8a252ba14d85d4b2

tdf#135495 builder file format has annoyingly escaped into user config

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

vcl/source/window/builder.cxx

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 2cdc339..2d27f27 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1910,8 +1910,9 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
            xWindow = xListBox;
        }
    }
    else if (name == "VclOptionalBox")
    else if (name == "VclOptionalBox" || name == "sfxlo-OptionalBox")
    {
        // tdf#135495 fallback sfxlo-OptionalBox to VclOptionalBox as a stopgap
        xWindow = VclPtr<OptionalBox>::Create(pParent);
    }
    else if (name == "GtkIconView")