summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-04-22 15:24:59 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-04-23 09:37:54 +0200
commit0e75f025419f878dc772391cea8d55765bceb9fc (patch)
treee7eaa47f113644ea03dbb17fe634345e9702bb08 /framework
parentc2a7705afd597e4cb39e7a7b239448807372dd3d (diff)
fix assert in empty complextoolbarcontrols combobox sdk example addon
Change-Id: Icf73bb97aa98430c9380e500574b93f248749c62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92704 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/comboboxtoolbarcontroller.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index fedb1b75d9a7..e4be0c413c63 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -318,7 +318,11 @@ void ComboboxToolbarController::executeControlCommand( const css::frame::Control
{
OUString aText;
if ( rControlCommand.Arguments[i].Value >>= aText )
- m_pComboBox->RemoveEntry( aText );
+ {
+ auto nPos = m_pComboBox->GetEntryPos(aText);
+ if (nPos != COMBOBOX_ENTRY_NOTFOUND)
+ m_pComboBox->RemoveEntryAt(nPos);
+ }
break;
}
}