[Libreoffice-commits] core.git: svtools/source toolkit/source

[Caolán McNamara (via logerrit)]

 svtools/source/uno/unoiface.cxx    |   14 --------------
 toolkit/source/awt/vclxtoolkit.cxx |    6 ++++++
 2 files changed, 6 insertions(+), 14 deletions(-)

New commits:
commit 2ecce5b58b965cf69fdb98966d7e2aab09d2f030
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 4 11:49:23 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 4 14:41:11 2019 +0100

    move VCLXFixedHyperlink creation to toolkit
    
    Change-Id: I3aa47a194f2b10b15faaa142c7dc6d57dffff96e
    Reviewed-on: https://gerrit.libreoffice.org/82002
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 6cfd6f304905..0a1344feac92 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -19,7 +19,6 @@
 
 
 #include <tools/debug.hxx>
-#include <vcl/fixedhyper.hxx>
 #include <vcl/prgsbar.hxx>
 #include <vcl/svapp.hxx>
 #include <svl/zforlist.hxx>
@@ -132,19 +131,6 @@ SAL_DLLPUBLIC_EXPORT vcl::Window* CreateWindow( VCLXWindow** ppNewComp, const cs
         *ppNewComp = pPeer;
         pWindow = pPeer->createVclControl( pParent, nWinBits );
     }
-    else if ( aServiceName.equalsIgnoreAsciiCase( "FixedHyperlink" ) )
-    {
-        if ( pParent )
-        {
-            pWindow = VclPtr<FixedHyperlink>::Create( pParent, nWinBits );
-            *ppNewComp = new VCLXFixedHyperlink;
-        }
-        else
-        {
-            *ppNewComp = nullptr;
-            return nullptr;
-        }
-    }
     else if ( aServiceName.equalsIgnoreAsciiCase( "Grid" ) )
     {
         if ( pParent )
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 754176927e2e..18b4a5c2aabe 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -88,6 +88,7 @@
 #include <vcl/event.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
+#include <vcl/fixedhyper.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/scheduler.hxx>
 #include <vcl/longcurr.hxx>
@@ -1790,6 +1791,11 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                     pNewWindow = VclPtr<::vcl::ORoadmap>::Create( pParent, WB_TABSTOP );
                     *ppNewComp = new SVTXRoadmap;
                 }
+                else if (aServiceName == "FixedHyperlink")
+                {
+                    pNewWindow = VclPtr<FixedHyperlink>::Create( pParent, nWinBits );
+                    *ppNewComp = new VCLXFixedHyperlink;
+                }
             break;
             default:
                 OSL_ENSURE( false, "VCLXToolkit::ImplCreateWindow: unknown window type!" );