From f9eea764389eae7e6b77076c1a80a8e6f280f9c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Mon, 10 Aug 2020 15:55:50 +0100 Subject: [PATCH] tdf#135495 builder file format has annoyingly escaped into user config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I38882e2c6e1815ac5fd747642c8934e3e4ca3ffb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100438 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- 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 2cdc33966ff6..2d27f27e9f1a 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1910,8 +1910,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")