From f14a738fa8c5579c2ef8cb8387b771e94ea5bdfe Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 10 Aug 2020 15:55:50 +0100 Subject: tdf#135495 builder file format has annoyingly escaped into user config Change-Id: I38882e2c6e1815ac5fd747642c8934e3e4ca3ffb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100361 Tested-by: Jenkins Reviewed-by: Xisco Fauli --- vcl/source/window/builder.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index dd57672d8b18..d15d3e668937 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -2123,8 +2123,9 @@ VclPtr 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::Create(pParent); } else if (name == "GtkIconView") -- cgit