[Libreoffice-commits] core.git: extensions/source

[Caolán McNamara (via logerrit)]

 extensions/source/propctrlr/commoncontrol.cxx   |    7 ++++++-
 extensions/source/propctrlr/commoncontrol.hxx   |    2 ++
 extensions/source/propctrlr/standardcontrol.cxx |    7 +++++++
 extensions/source/propctrlr/standardcontrol.hxx |    2 ++
 4 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 5bb908656475ed982bd7d63447df8e740171c6e3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Mar 25 11:45:43 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Mar 25 15:23:18 2020 +0100

    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 at redhat.com>

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 ) );