FixedHyperlink now only used in vcl and toolkit

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

9 files changed, 128 insertions, 124 deletions

diff --git a/include/vcl/fixedhyper.hxx b/include/vcl/fixedhyper.hxx
deleted file mode 100644
index b46a37a2688d..000000000000
--- a/include/vcl/fixedhyper.hxx
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   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_VCL_FIXEDHYPER_HXX
-#define INCLUDED_VCL_FIXEDHYPER_HXX
-
-#include <vcl/dllapi.h>
-#include <vcl/fixed.hxx>
-
-class VCL_DLLPUBLIC FixedHyperlink : public FixedText
-    {
-    private:
-        long                m_nTextLen;
-        PointerStyle        m_aOldPointer;
-        Link<FixedHyperlink&,void> m_aClickHdl;
-        OUString            m_sURL;
-
-        /** initializes the font (link color and underline).
-
-            Called by the Ctors.
-        */
-        void                Initialize();
-
-        /** is position X position hitting text */
-        SAL_DLLPRIVATE bool ImplIsOverText(Point rPosition);
-
-        DECL_LINK(HandleClick, FixedHyperlink&, void);
-
-    protected:
-        /** overwrites Window::MouseMove().
-
-            Changes the pointer only over the text.
-        */
-        virtual void        MouseMove( const MouseEvent& rMEvt ) override;
-
-        /** overwrites Window::MouseButtonUp().
-
-            Calls the set link if the mouse is over the text.
-        */
-        virtual void        MouseButtonUp( const MouseEvent& rMEvt ) override;
-
-        /** overwrites Window::RequestHelp().
-
-            Shows tooltip only if the mouse is over the text.
-        */
-        virtual void        RequestHelp( const HelpEvent& rHEvt ) override;
-
-    public:
-        /** ctors
-
-            With WinBits.
-        */
-        FixedHyperlink( vcl::Window* pParent, WinBits nWinStyle = 0 );
-
-        /** overwrites Window::GetFocus().
-
-            Changes the color of the text and shows a focus rectangle.
-        */
-        virtual void        GetFocus() override;
-
-        /** overwrites Window::LoseFocus().
-
-            Changes the color of the text and hides the focus rectangle.
-        */
-        virtual void        LoseFocus() override;
-
-        /** overwrites Window::KeyInput().
-
-            KEY_RETURN and KEY_SPACE calls the link handler.
-        */
-        virtual void        KeyInput( const KeyEvent& rKEvt ) override;
-
-        virtual bool        set_property(const OString &rKey, const OUString &rValue) override;
-
-
-        /** sets m_aClickHdl with rLink.
-
-            m_aClickHdl is called if the text is clicked.
-        */
-        void         SetClickHdl( const Link<FixedHyperlink&,void>& rLink ) { m_aClickHdl = rLink; }
-        const Link<FixedHyperlink&,void>& GetClickHdl() const { return m_aClickHdl; }
-
-        // ::FixedHyperbaseLink
-
-        /** sets the URL of the hyperlink and uses it as tooltip. */
-        void                SetURL(const OUString& rNewURL);
-
-        /** returns the URL of the hyperlink.
-
-            @return
-                m_sURL
-        */
-        const OUString&     GetURL() const { return m_sURL;}
-
-        /** sets new text and recalculates the text length. */
-        virtual void        SetText(const OUString& rNewDescription) override;
-    };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/toolkit/fixedhyper.hxx b/include/vcl/toolkit/fixedhyper.hxx
new file mode 100644
index 000000000000..9eb1af116e5e
--- /dev/null
+++ b/include/vcl/toolkit/fixedhyper.hxx
@@ -0,0 +1,121 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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_VCL_FIXEDHYPER_HXX
+#define INCLUDED_VCL_FIXEDHYPER_HXX
+
+#if !defined(VCL_DLLIMPLEMENTATION) && !defined(TOOLKIT_DLLIMPLEMENTATION)
+#error "don't use this in new code"
+#endif
+
+#include <vcl/dllapi.h>
+#include <vcl/fixed.hxx>
+
+class VCL_DLLPUBLIC FixedHyperlink : public FixedText
+{
+private:
+    long                m_nTextLen;
+    PointerStyle        m_aOldPointer;
+    Link<FixedHyperlink&,void> m_aClickHdl;
+    OUString            m_sURL;
+
+    /** initializes the font (link color and underline).
+
+        Called by the Ctors.
+    */
+    void                Initialize();
+
+    /** is position X position hitting text */
+    SAL_DLLPRIVATE bool ImplIsOverText(Point rPosition);
+
+    DECL_LINK(HandleClick, FixedHyperlink&, void);
+
+protected:
+    /** overwrites Window::MouseMove().
+
+        Changes the pointer only over the text.
+    */
+    virtual void        MouseMove( const MouseEvent& rMEvt ) override;
+
+    /** overwrites Window::MouseButtonUp().
+
+        Calls the set link if the mouse is over the text.
+    */
+    virtual void        MouseButtonUp( const MouseEvent& rMEvt ) override;
+
+    /** overwrites Window::RequestHelp().
+
+        Shows tooltip only if the mouse is over the text.
+    */
+    virtual void        RequestHelp( const HelpEvent& rHEvt ) override;
+
+public:
+    /** ctors
+
+        With WinBits.
+    */
+    FixedHyperlink( vcl::Window* pParent, WinBits nWinStyle = 0 );
+
+    /** overwrites Window::GetFocus().
+
+        Changes the color of the text and shows a focus rectangle.
+    */
+    virtual void        GetFocus() override;
+
+    /** overwrites Window::LoseFocus().
+
+        Changes the color of the text and hides the focus rectangle.
+    */
+    virtual void        LoseFocus() override;
+
+    /** overwrites Window::KeyInput().
+
+        KEY_RETURN and KEY_SPACE calls the link handler.
+    */
+    virtual void        KeyInput( const KeyEvent& rKEvt ) override;
+
+    virtual bool        set_property(const OString &rKey, const OUString &rValue) override;
+
+
+    /** sets m_aClickHdl with rLink.
+
+        m_aClickHdl is called if the text is clicked.
+    */
+    void         SetClickHdl( const Link<FixedHyperlink&,void>& rLink ) { m_aClickHdl = rLink; }
+    const Link<FixedHyperlink&,void>& GetClickHdl() const { return m_aClickHdl; }
+
+    // ::FixedHyperbaseLink
+
+    /** sets the URL of the hyperlink and uses it as tooltip. */
+    void                SetURL(const OUString& rNewURL);
+
+    /** returns the URL of the hyperlink.
+
+        @return
+            m_sURL
+    */
+    const OUString&     GetURL() const { return m_sURL;}
+
+    /** sets new text and recalculates the text length. */
+    virtual void        SetText(const OUString& rNewDescription) override;
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index c3693241d5af..cbc4723e32b8 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7791,7 +7791,6 @@ include/vcl/exceptiontypes.hxx
 include/vcl/extoutdevdata.hxx
 include/vcl/field.hxx
 include/vcl/fixed.hxx
-include/vcl/fixedhyper.hxx
 include/vcl/floatwin.hxx
 include/vcl/fltcall.hxx
 include/vcl/fmtfield.hxx
@@ -7898,6 +7897,7 @@ include/vcl/textview.hxx
 include/vcl/threadex.hxx
 include/vcl/timer.hxx
 include/vcl/toolbox.hxx
+include/vcl/toolkit/fixedhyper.hxx
 include/vcl/toolkit/group.hxx
 include/vcl/toolkit/imgctrl.hxx
 include/vcl/toolkit/morebtn.hxx
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 18b4a5c2aabe..2c3a6d81e1e3 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -88,7 +88,7 @@
 #include <vcl/event.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/fixedhyper.hxx>
+#include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/scheduler.hxx>
 #include <vcl/longcurr.hxx>
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 4d072ced46e6..65e24830862d 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -45,7 +45,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/field.hxx>
-#include <vcl/fixedhyper.hxx>
+#include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/longcurr.hxx>
 #include <vcl/toolkit/imgctrl.hxx>
 #include <vcl/dialog.hxx>
diff --git a/vcl/inc/aboutdialog.hxx b/vcl/inc/aboutdialog.hxx
index 02cc2e734b10..180c509aa77e 100644
--- a/vcl/inc/aboutdialog.hxx
+++ b/vcl/inc/aboutdialog.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_VCL_ABOUT_DIALOG_HXX
 
 #include <vcl/fixed.hxx>
-#include <vcl/fixedhyper.hxx>
+#include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/vclmedit.hxx>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 2a1c38d3a3ad..2c59c5868c3d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -47,7 +47,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/fixedhyper.hxx>
+#include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/fmtfield.hxx>
 #include <vcl/headbar.hxx>
 #include <vcl/ivctrl.hxx>
diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx
index e672e3ad30b4..b7f3500fc029 100644
--- a/vcl/source/control/fixedhyper.cxx
+++ b/vcl/source/control/fixedhyper.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <vcl/event.hxx>
-#include <vcl/fixedhyper.hxx>
+#include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index e0fcb5d63ebd..c06fa544e54a 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -26,7 +26,7 @@
 #include <vcl/field.hxx>
 #include <vcl/fmtfield.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/fixedhyper.hxx>
+#include <vcl/toolkit/fixedhyper.hxx>
 #include <vcl/headbar.hxx>
 #include <vcl/IPrioritable.hxx>
 #include <vcl/ivctrl.hxx>