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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon May 11 14:57:55 UTC 2020


 forms/source/component/clickableimage.cxx |   11 -----------
 1 file changed, 11 deletions(-)

New commits:
commit a892669ec2887f5e51c403b3a9710d9191909443
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon May 11 14:10:07 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon May 11 16:57:08 2020 +0200

    USE_REGISTER_TRANSFER is never defined
    
    and each branch of the ifdef is the same anyway
    
    Change-Id: Iebffb0120915f6f7f735a37dc84f3f9bc6fd76ea
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93966
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index a78b1908fc65..68861e42cf30 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -752,7 +752,6 @@ namespace frm
 
             SfxObjectShell *pObjSh = GetObjectShell();
 
-    #ifdef USE_REGISTER_TRANSFER
             if( pObjSh )
             {
                 // Transfer target frame, so that javascript: URLs
@@ -761,16 +760,6 @@ namespace frm
                 if( pShMedium )
                     m_pMedium->SetLoadTargetFrame(pShMedium->GetLoadTargetFrame());
             }
-    #else
-            if( pObjSh )
-            {
-                // Transfer target frame, so that javascript: URLs
-                // can also be "loaded"
-                const SfxMedium *pShMedium = pObjSh->GetMedium();
-                if( pShMedium )
-                    m_pMedium->SetLoadTargetFrame(pShMedium->GetLoadTargetFrame());
-            }
-    #endif
 
             m_bProdStarted = false;
 


More information about the Libreoffice-commits mailing list