[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - forms/source

Julien Nabet (via logerrit) logerrit at kemper.freedesktop.org
Thu Dec 3 17:29:13 UTC 2020


 forms/source/component/clickableimage.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6b5ca41c5d78e6a45f7a39d99c5a7ae283d243de
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Wed Dec 2 00:05:14 2020 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Thu Dec 3 18:28:39 2020 +0100

    tdf#46579: fix form fields 'Image Button' in Forms
    
    urls have this form:
    .uno:FormController/moveToFirst
    .uno:FormController/moveToPrev
    etc.
    
    So we must use these links for hyperlinks
    + interceptor with ControlFeatureInterception
    
    + includes https://gerrit.libreoffice.org/c/core/+/107158
    Change-Id: I9cff19833d859624239ca6c76152cc88f9cbb278
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107037
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 07be45d03f80fa681c697ca9f5a13084a81c7a26)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107098
    Tested-by: Jenkins

diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 68861e42cf30..bc2a2ba739e5 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -310,9 +310,9 @@ namespace frm
                 }
                 else
                 {
-                    URL aHyperLink = m_pFeatureInterception->getTransformer().getStrictURLFromAscii( ".uno:OpenHyperlink" );
+                    URL aHyperLink = m_pFeatureInterception->getTransformer().getStrictURL(aURL.Complete);
 
-                    Reference< XDispatch >  xDisp = Reference< XDispatchProvider > (xFrame,UNO_QUERY_THROW)->queryDispatch(aHyperLink, OUString() , 0);
+                    Reference< XDispatch > xDisp =  m_pFeatureInterception->queryDispatch(aHyperLink);
 
                     if ( xDisp.is() )
                     {


More information about the Libreoffice-commits mailing list