commit 2481c7f308e0a30108fa7a8eedb05e34c457e0d9
author Caolán McNamara <caolanm@redhat.com> Thu Apr 01 17:31:58 2021 +0100
committer Xisco Fauli <xiscofauli@libreoffice.org> Tue Apr 06 10:00:19 2021 +0200
tree 017fc4638137515c5d3e5e5590a16ea2ec5b99a1
parent dbeec25e401d9e75ded4e6d58f46a448e286d03e

tdf#141084 don't notify that the control has changed content until focus-out

while also keeping tdf#140239 working too

Change-Id: I42833f6a4d2440781cf3f2297b78c6e313b3d239
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113474
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit d0628bd6813de2685f4367118dc0f9ca036d1eaf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113477
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>

extensions/source/propctrlr/usercontrol.cxx

diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index f262870..86fdb30 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -238,9 +238,7 @@ namespace pcr
        bool bSuccess = rValue >>= sURL;
        if (bSuccess && GraphicObject::isGraphicObjectUniqueIdURL(sURL))
            sURL = pControlWindow->GetPlaceHolder();
        // tdf#140239 leave current cursor valid if the contents won't change
        if (sURL != pControlWindow->GetURL())
            pControlWindow->set_entry_text(sURL);
        pControlWindow->set_entry_text(sURL);
    }

    Any SAL_CALL OFileUrlControl::getValue()
@@ -256,6 +254,11 @@ namespace pcr
        return ::cppu::UnoType<OUString>::get();
    }

    IMPL_LINK_NOARG(OFileUrlControl, URLModifiedHdl, weld::ComboBox&, void)
    {
        editChanged();
    }

} // namespace pcr

extensions/source/propctrlr/usercontrol.hxx

diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index b72fcbd..7104f09 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -119,6 +119,8 @@ namespace pcr
    typedef CommonBehaviourControl<css::inspection::XPropertyControl, SvtURLBox> OFileUrlControl_Base;
    class OFileUrlControl : public OFileUrlControl_Base
    {
    private:
        DECL_LINK(URLModifiedHdl, weld::ComboBox&, void);
    public:
        OFileUrlControl(std::unique_ptr<SvtURLBox> xWidget, std::unique_ptr<weld::Builder> xBuilder, bool bReadOnly);

@@ -130,7 +132,10 @@ namespace pcr
        virtual void SetModifyHandler() override
        {
            OFileUrlControl_Base::SetModifyHandler();
            getTypedControlWindow()->connect_changed(LINK(this, CommonBehaviourControlHelper, ModifiedHdl));
            SvtURLBox* pControlWindow = getTypedControlWindow();
            // tdf#140239 and tdf#141084 don't notify that the control has changed content until focus-out
            pControlWindow->connect_focus_out(LINK(this, CommonBehaviourControlHelper, LoseFocusHdl));
            pControlWindow->connect_changed(LINK(this, OFileUrlControl, URLModifiedHdl));
        }

        virtual weld::Widget* getWidget() override { return getTypedControlWindow()->getWidget(); }