From 7763692e50191e2074f56e9bf698c843eed0ad00 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 15 Dec 2020 15:17:27 +0000 Subject: tdf#138701 leave current combobox cursor valid if the contents won't change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6d7f5de7b79d447590fcfa325f4be7430eaffd5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107779 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- extensions/source/propctrlr/standardcontrol.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'extensions') 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() -- cgit