move HyperLabel into vcl

could this be merged with FixedHyperlink?

Change-Id: I00abe4bfa62a55c7b62ccd40e6c0294699317f26
Reviewed-on: https://gerrit.libreoffice.org/76897
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

include/vcl/hyperlabel.hxx

@@ -16,22 +16,20 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SVTOOLS_HYPERLABEL_HXX
-#define INCLUDED_SVTOOLS_HYPERLABEL_HXX
+#ifndef INCLUDED_VCL_HYPERLABEL_HXX
+#define INCLUDED_VCL_HYPERLABEL_HXX
 
 #include <memory>
 
-
 #include <vcl/fixed.hxx>
 
 #define LABELBASEMAPHEIGHT      8
 
-
-namespace svt
+namespace vcl
 {
     class HyperLabelImpl;
 
-    class HyperLabel final : public FixedText
+    class VCL_DLLPUBLIC HyperLabel final : public FixedText
     {
         std::unique_ptr<HyperLabelImpl>     m_pImpl;
         Link<HyperLabel*,void>  maClickHdl;

solenv/clang-format/blacklist

@@ -6963,7 +6963,6 @@ include/svtools/htmlcfg.hxx
 include/svtools/htmlkywd.hxx
 include/svtools/htmlout.hxx
 include/svtools/htmltokn.h
-include/svtools/hyperlabel.hxx
 include/svtools/iconview.hxx
 include/svtools/imagemgr.hxx
 include/svtools/imageresourceaccess.hxx
@@ -7849,6 +7848,7 @@ include/vcl/graphictools.hxx
 include/vcl/hatch.hxx
 include/vcl/headbar.hxx
 include/vcl/help.hxx
+include/vcl/hyperlabel.hxx
 include/vcl/i18nhelp.hxx
 include/vcl/idle.hxx
 include/vcl/image.hxx
@@ -13733,7 +13733,6 @@ svtools/source/control/ctrlbox.cxx
 svtools/source/control/ctrltool.cxx
 svtools/source/control/filectrl.cxx
 svtools/source/control/fileurlbox.cxx
-svtools/source/control/hyperlabel.cxx
 svtools/source/control/indexentryres.cxx
 svtools/source/control/inettbc.cxx
 svtools/source/control/managedmenubutton.cxx
@@ -17780,6 +17779,7 @@ vcl/source/control/field2.cxx
 vcl/source/control/fixed.cxx
 vcl/source/control/fixedhyper.cxx
 vcl/source/control/fmtfield.cxx
+vcl/source/control/hyperlabel.cxx
 vcl/source/control/imgctrl.cxx
 vcl/source/control/imivctl.hxx
 vcl/source/control/imivctl1.cxx

svtools/Library_svt.mk

@@ -105,7 +105,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/control/ctrltool \
     svtools/source/control/filectrl \
     svtools/source/control/fileurlbox \
-    svtools/source/control/hyperlabel \
     svtools/source/control/indexentryres \
     svtools/source/control/inettbc \
     svtools/source/control/managedmenubutton \

svtools/inc/roadmap.hxx

@@ -21,9 +21,8 @@
 
 #include <svtools/svtdllapi.h>
 #include <vcl/ctrl.hxx>
+#include <vcl/hyperlabel.hxx>
 #include <vcl/imgctrl.hxx>
-
-#include <svtools/hyperlabel.hxx>
 #include <memory>
 
 class Bitmap;
@@ -83,7 +82,7 @@ private:
     /// called when an item has been selected by any means
     void            Select();
 
-    DECL_LINK(ImplClickHdl, HyperLabel*, void);
+    DECL_LINK(ImplClickHdl, vcl::HyperLabel*, void);
 
     RoadmapItem*         GetByIndex( ItemIndex _nItemIndex );
     const RoadmapItem*   GetByIndex( ItemIndex _nItemIndex ) const;

svtools/source/control/roadmap.cxx

@@ -49,7 +49,7 @@ class RoadmapItem : public RoadmapTypes
 {
 private:
     VclPtr<IDLabel>         mpID;
-    VclPtr<HyperLabel>      mpDescription;
+    VclPtr<vcl::HyperLabel>      mpDescription;
     const Size              m_aItemPlayground;
 
 public:
@@ -69,7 +69,7 @@ public:
     void                    ToggleBackgroundColor( const Color& _rGBColor );
     void                    SetInteractive( bool _bInteractive );
 
-    void                    SetClickHdl( const Link<HyperLabel*,void>& rLink );
+    void                    SetClickHdl( const Link<vcl::HyperLabel*,void>& rLink );
     void                    Enable( bool bEnable );
     bool                    IsEnabled() const;
     void                    GrabFocus();
@@ -622,7 +622,7 @@ bool ORoadmap::PreNotify(NotifyEvent& _rNEvt)
     return Window::PreNotify( _rNEvt );
 }
 
-IMPL_LINK(ORoadmap, ImplClickHdl, HyperLabel*, CurHyperLabel, void)
+IMPL_LINK(ORoadmap, ImplClickHdl, vcl::HyperLabel*, CurHyperLabel, void)
 {
    SelectRoadmapItemByID( CurHyperLabel->GetID() );
 }
@@ -666,7 +666,7 @@ RoadmapItem::RoadmapItem(ORoadmap& _rParent, const Size& _rItemPlayground)
 {
     mpID = VclPtr<IDLabel>::Create( &_rParent, WB_WORDBREAK );
     mpID->Show();
-    mpDescription = VclPtr<HyperLabel>::Create( &_rParent, WB_NOTABSTOP | WB_WORDBREAK );
+    mpDescription = VclPtr<vcl::HyperLabel>::Create( &_rParent, WB_NOTABSTOP | WB_WORDBREAK );
     mpDescription->Show();
 }
 
@@ -794,7 +794,7 @@ void RoadmapItem::Update(ItemIndex RMIndex, const OUString& _rText)
     ImplUpdateIndex( RMIndex );
 }
 
-void RoadmapItem::SetClickHdl(const Link<HyperLabel*,void>& rLink)
+void RoadmapItem::SetClickHdl(const Link<vcl::HyperLabel*,void>& rLink)
 {
     if ( mpDescription )
         mpDescription->SetClickHdl( rLink);

vcl/Library_vcl.mk

@@ -189,6 +189,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
     vcl/source/control/field \
     vcl/source/control/fixed \
     vcl/source/control/fixedhyper \
+    vcl/source/control/hyperlabel \
     vcl/source/control/fmtfield \
     vcl/source/control/imgctrl \
     vcl/source/control/imivctl1 \

vcl/source/control/hyperlabel.cxx

@@ -17,15 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svtools/hyperlabel.hxx>
+#include <vcl/hyperlabel.hxx>
 #include <tools/color.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/ptrstyle.hxx>
 
-
-namespace svt
+namespace vcl
 {
     class HyperLabelImpl
     {
@@ -197,7 +196,6 @@ namespace svt
         }
     }
 
-}   // namespace svt
-
+}   // namespace vcl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */