[Libreoffice-commits] core.git: vcl/source

[Julien Nabet]

 vcl/source/window/builder.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8a83562dd09fa1c38629e5250f20c4b091e934b1
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Apr 24 00:55:14 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 17c3b8f..dc75b24 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);
     }