vcl/source/app/salvtables.cxx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
New commits: commit 6eb0c740603c2ea7326e4b9cbfeab144e4a2b781 Author: Caolán McNamara <[email protected]> Date: Thu Apr 5 14:11:19 2018 +0100 we want get_active_text to return edit text in editable case Change-Id: Ib95e0b10e2291eef8c7a4dd0849dc5ef215f3104 Reviewed-on: https://gerrit.libreoffice.org/52464 Tested-by: Jenkins <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 62e5873b8501..905e29f5b33d 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1488,11 +1488,6 @@ public: m_xComboBoxText->SelectEntryPos(pos); } - virtual OUString get_active_text() const override - { - return m_xComboBoxText->GetSelectedEntry(); - } - virtual OUString get_text(int pos) const override { return m_xComboBoxText->GetEntry(pos); @@ -1576,6 +1571,11 @@ public: m_xComboBoxText->SetSelectHdl(LINK(this, SalInstanceComboBoxTextWithoutEdit, SelectHdl)); } + virtual OUString get_active_text() const override + { + return m_xComboBoxText->GetSelectedEntry(); + } + virtual void set_entry_error(bool /*bError*/) override { assert(false); @@ -1632,6 +1632,11 @@ public: m_xComboBoxText->SetControlForeground(); } + virtual OUString get_active_text() const override + { + return m_xComboBoxText->GetText(); + } + virtual void set_entry_text(const OUString& rText) override { m_xComboBoxText->SetText(rText); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
