diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2016-04-24 00:55:14 +0200 |
---|---|---|
committer | jan iversen <jani@documentfoundation.org> | 2016-05-25 07:05:29 +0000 |
commit | 8a83562dd09fa1c38629e5250f20c4b091e934b1 (patch) | |
tree | bc632b090174c4bbabe7a640a9152227478d2b5b /vcl | |
parent | 62ddce422ce80592107d9125e8e9bd59f7f770a5 (diff) |
VclBuilder: pStore may indeed be empty
eg: sd/uiconfig/simpress/ui/photoalbum.ui
It just prepares an empty store for being able to add some files
Change-Id: I1481a09fa37d85c78b052026ac612dcd039025cc
Reviewed-on: https://gerrit.libreoffice.org/24328
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/source/window/builder.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 17c3b8ff558e..dc75b24f8135 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -265,8 +265,9 @@ VclBuilder::VclBuilder(vcl::Window *pParent, const OUString& sUIDir, const OUStr aEnd = m_pParserState->m_aModelMaps.end(); aI != aEnd; ++aI) { ListBox *pTarget = get<ListBox>(aI->m_sID); + // pStore may be empty const ListStore *pStore = get_model_by_name(aI->m_sValue); - SAL_WARN_IF(!pTarget || !pStore, "vcl", "missing elements of combobox/liststore"); + SAL_WARN_IF(!pTarget, "vcl", "missing elements of combobox"); if (pTarget && pStore) mungeModel(*pTarget, *pStore, aI->m_nActiveId); } |