diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-03-25 11:45:43 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-03-25 15:23:18 +0100 |
commit | 5bb908656475ed982bd7d63447df8e740171c6e3 (patch) | |
tree | 7bc8a17436ef3f41ebf36772caf8fc4be2108a3f | |
parent | eac806e8dcd9ee6439ac8695978ff6b62cc6b8d2 (diff) |
Resolves: tdf#131522 sync textview from edit when edit changes
Change-Id: I9a127f5066405225d35dd0590e84168b3bd86790
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91049
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | extensions/source/propctrlr/commoncontrol.cxx | 7 | ||||
-rw-r--r-- | extensions/source/propctrlr/commoncontrol.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 7 | ||||
-rw-r--r-- | extensions/source/propctrlr/standardcontrol.hxx | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx index 6eced5b222f3..02f52a6ecd80 100644 --- a/extensions/source/propctrlr/commoncontrol.cxx +++ b/extensions/source/propctrlr/commoncontrol.cxx @@ -63,11 +63,16 @@ namespace pcr } } - IMPL_LINK_NOARG( CommonBehaviourControlHelper, EditModifiedHdl, weld::Entry&, void ) + void CommonBehaviourControlHelper::editChanged() { setModified(); } + IMPL_LINK_NOARG( CommonBehaviourControlHelper, EditModifiedHdl, weld::Entry&, void ) + { + editChanged(); + } + IMPL_LINK_NOARG( CommonBehaviourControlHelper, ModifiedHdl, weld::ComboBox&, void ) { setModified(); diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index af9332c4696e..2097a88df3ff 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -69,6 +69,8 @@ namespace pcr virtual void setModified() { m_bModified = true; } + virtual void editChanged(); + // XPropertyControl /// @throws css::uno::RuntimeException ::sal_Int16 getControlType() const { return m_nControlType; } diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index a5e732497512..dc1891eab122 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -735,6 +735,13 @@ namespace pcr setModified(); } + void OMultilineEditControl::editChanged() + { + m_xTextView->set_text(m_xEntry->get_text()); + CheckEntryTextViewMisMatch(); + setModified(); + } + IMPL_LINK_NOARG(OMultilineEditControl, ButtonHandler, weld::Button&, void) { m_xButton->set_active(false); diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx index 710eff79e3e5..1b4fd2fd08dc 100644 --- a/extensions/source/propctrlr/standardcontrol.hxx +++ b/extensions/source/propctrlr/standardcontrol.hxx @@ -359,6 +359,8 @@ namespace pcr virtual css::uno::Type SAL_CALL getValueType() override; virtual weld::Widget* getWidget() override { return getTypedControlWindow(); } + virtual void editChanged() override; + virtual void SetModifyHandler() override { m_xEntry->connect_focus_in( LINK( this, CommonBehaviourControlHelper, GetFocusHdl ) ); |