vcl/source/window/builder.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 3f1682f3c2f1605331bcf2f5df079a3f585e4ace Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jan 1 19:26:05 2014 +0000 check internal children against prefix rather than equality Change-Id: I972a0fb4eb86dcafa230f82251d3f9c3cbed7f2b diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 2301d21..6b4cce4 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1867,12 +1867,12 @@ void VclBuilder::handleChild(Window *pParent, xmlreader::XmlReader &reader) if (VclFrame *pFrameParent = dynamic_cast<VclFrame*>(pParent)) pFrameParent->designate_label(pCurrentChild); } - if (sInternalChild.equals("vbox") || sInternalChild.equals("messagedialog-vbox")) + if (sInternalChild.startsWith("vbox") || sInternalChild.startsWith("messagedialog-vbox")) { if (Dialog *pBoxParent = dynamic_cast<Dialog*>(pParent)) pBoxParent->set_content_area(static_cast<VclBox*>(pCurrentChild)); } - else if (sInternalChild.equals("action_area") || sInternalChild.equals("messagedialog-action_area")) + else if (sInternalChild.startsWith("action_area") || sInternalChild.startsWith("messagedialog-action_area")) { Window *pContentArea = pCurrentChild->GetParent(); assert(pContentArea && pContentArea->GetType() == WINDOW_CONTAINER);
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits