diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-12-15 15:17:27 +0000 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-12-17 14:07:43 +0100 |
| commit | 4cc753b6b9a7011da3ea50a1c90ed10870b9a2e0 (patch) | |
| tree | 149c7dfa325aa0af857fbb03acb63aeea9cc1711 | |
| parent | Resolves: tdf#138789 disable widgets on 'none' when status changes (diff) | |
| download | core-4cc753b6b9a7011da3ea50a1c90ed10870b9a2e0.tar.gz core-4cc753b6b9a7011da3ea50a1c90ed10870b9a2e0.zip | |
tdf#138701 leave current combobox cursor valid if the contents won't change
Change-Id: I6d7f5de7b79d447590fcfa325f4be7430eaffd5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107708
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index a9b422440932..0b64c9518ef2 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -583,7 +583,10 @@ namespace pcr { OUString sText; _rValue >>= sText; - getTypedControlWindow()->set_entry_text( sText ); + weld::ComboBox* pControlWindow = getTypedControlWindow(); + // tdf#138701 leave current cursor valid if the contents won't change + if (pControlWindow->get_active_text() != sText) + pControlWindow->set_entry_text(sText); } Any SAL_CALL OComboboxControl::getValue() |