summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-08-10 15:55:50 +0100
committerXisco Fauli <xiscofauli@libreoffice.org>2020-08-11 10:19:43 +0200
commitf14a738fa8c5579c2ef8cb8387b771e94ea5bdfe (patch)
tree3c0c7eb4c57d9803f6b17834f5a3d2528f908c5d
parent8f61c0e58dfbda8d797faaa400389857db69e34f (diff)
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 <xiscofauli@libreoffice.org>
-rw-r--r--vcl/source/window/builder.cxx3
1 files changed, 2 insertions, 1 deletions
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")