diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-06 11:08:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-06 13:54:37 +0100 |
| commit | aa528eadbf3f1fa46390ad5b25e0f4e3c89e0382 (patch) | |
| tree | abe4fb579903acd5926fa3bfd3da5a56fe727035 /extensions | |
| parent | 884714b336696202adffe6f4684127c0f2758c14 (diff) | |
Related: tdf#129484 overeager assert
its ok to show a page that's already shown
Change-Id: Iaf014669fcfbb4f91dd114fe8053ac4f91617b6c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86267
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/propertyeditor.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index 9a38153cd44d..9629e3d35dc7 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -302,12 +302,11 @@ namespace pcr void OPropertyEditor::ShowPropertyPage(sal_uInt16 nPageId, bool bShow) { + assert((m_aHiddenPages.find(nPageId) != m_aHiddenPages.end() || + m_aShownPages.find(nPageId) != m_aShownPages.end()) && "page doesn't exist"); OString sIdent(OString::number(nPageId)); if (!bShow) { - assert(m_aHiddenPages.find(nPageId) == m_aHiddenPages.end() && "OPropertyEditor::ShowPropertyPage: page already hidden!"); - assert(m_aShownPages.find(nPageId) != m_aShownPages.end() && "OPropertyEditor::ShowPropertyPage: page not shown to hide!"); - auto aPagePos = m_aShownPages.find(nPageId); if (aPagePos != m_aShownPages.end()) { @@ -320,9 +319,6 @@ namespace pcr } else { - assert(m_aShownPages.find(nPageId) == m_aShownPages.end() && "OPropertyEditor::ShowPropertyPage: page already shown!"); - assert(m_aHiddenPages.find(nPageId) != m_aHiddenPages.end() && "OPropertyEditor::ShowPropertyPage: page not hidden to show!"); - auto aPagePos = m_aHiddenPages.find(nPageId); if (aPagePos != m_aHiddenPages.end()) { |