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

[Caolán McNamara (via logerrit)]

 vcl/source/window/builder.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 264b78cbd7b049d323797cad332b664fe3af2088
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Jun 4 16:59:09 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Jun 5 18:31:37 2022 +0200

    assert if a model is used in duplicate widgets
    
    we never do this deliberately
    
    Change-Id: I6d6d8ea13fb5f09bcf631c0474e671d4605f4c69
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135427
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d92be39f11f3..c74d2038192a 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -544,9 +544,13 @@ VclBuilder::VclBuilder(vcl::Window* pParent, const 
OUString& sUIDir, const OUStr
         }
     }
 
+#ifndef NDEBUG
+    o3tl::sorted_vector<OUString> models;
+#endif
     //Set ComboBox models when everything has been imported
     for (auto const& elem : m_pParserState->m_aModelMaps)
     {
+        assert(models.insert(elem.m_sValue).second && "a liststore or 
treestore is used in duplicate widgets");
         vcl::Window* pTarget = get(elem.m_sID);
         ListBox *pListBoxTarget = dynamic_cast<ListBox*>(pTarget);
         ComboBox *pComboBoxTarget = dynamic_cast<ComboBox*>(pTarget);