vcl/source/window/builder.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f14a738fa8c5579c2ef8cb8387b771e94ea5bdfe
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 10 15:55:50 2020 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Aug 11 10:19:43 2020 +0200
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 <xiscofa...@libreoffice.org>
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<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")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
