summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-12-15 15:17:27 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-12-15 18:36:29 +0100
commit402316c8df19ec9714a39ff5d7863d03dbe93720 (patch)
treef32330d72006e192250f60f314bae2ca4d5c20d8
parentd2055db8d7b13b34e526cc16f5c084505e6de331 (diff)
tdf#138701 leave current combobox cursor valid if the contents won't change
Change-Id: I6d7f5de7b79d447590fcfa325f4be7430eaffd5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107707 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index 436f5b412e27..c5b03aa270e5 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -587,7 +587,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()