move svtools's FixedHyper.hxx to vcl

merge with fixedhyperbase and map GtkLinkButton
to FixedHyper. Convert to String while I'm at it.

Change-Id: Ibc61fd29c01796561eeef952a159c82ff215a095

6 files changed, 19 insertions, 19 deletions

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index cb80e01ea78a..b7d924a9b5f7 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -149,7 +149,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
     DECL_DLLPRIVATE_LINK( HandleOptionsBtn, void * );
     DECL_DLLPRIVATE_LINK( HandleEnableBtn, void * );
     DECL_DLLPRIVATE_LINK( HandleRemoveBtn, void * );
-    DECL_DLLPRIVATE_LINK( HandleHyperlink, svt::FixedHyperlink * );
+    DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * );
 
 public:
                     ExtBoxWithBtns_Impl( ExtMgrDialog* pParent, TheExtensionManager *pManager );
@@ -1122,7 +1122,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn)
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( ExtMgrDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink )
+IMPL_LINK( ExtMgrDialog, HandleHyperlink, FixedHyperlink*, pHyperlink )
 {
     openWebBrowser( pHyperlink->GetURL(), GetText() );
 
@@ -1610,7 +1610,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn)
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( UpdateRequiredDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink )
+IMPL_LINK( UpdateRequiredDialog, HandleHyperlink, FixedHyperlink*, pHyperlink )
 {
     openWebBrowser( pHyperlink->GetURL(), GetText() );
 
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 0aecee3d6a51..542e04082545 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -32,9 +32,9 @@
 #include "vcl/dialog.hxx"
 #include "vcl/button.hxx"
 #include "vcl/fixed.hxx"
+#include "vcl/fixedhyper.hxx"
 #include "vcl/timer.hxx"
 
-#include "svtools/fixedhyper.hxx"
 #include "svtools/prgsbar.hxx"
 #include "svtools/svmedit.hxx"
 
@@ -118,7 +118,7 @@ class ExtMgrDialog : public ModelessDialog,
     CheckBox             m_aBundledCbx;
     CheckBox             m_aSharedCbx;
     CheckBox             m_aUserCbx;
-    svt::FixedHyperlink  m_aGetExtensions;
+    FixedHyperlink       m_aGetExtensions;
     FixedText            m_aProgressText;
     ProgressBar          m_aProgressBar;
     CancelButton         m_aCancelBtn;
@@ -145,7 +145,7 @@ class ExtMgrDialog : public ModelessDialog,
     DECL_DLLPRIVATE_LINK( HandleUpdateBtn, void * );
     DECL_DLLPRIVATE_LINK( HandleCancelBtn, void * );
     DECL_DLLPRIVATE_LINK( HandleExtTypeCbx, void * );
-    DECL_DLLPRIVATE_LINK( HandleHyperlink, svt::FixedHyperlink * );
+    DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * );
     DECL_DLLPRIVATE_LINK(TimeOutHdl, void *);
     DECL_DLLPRIVATE_LINK( startProgress, void * );
 
@@ -214,7 +214,7 @@ class UpdateRequiredDialog : public ModalDialog,
     DECL_DLLPRIVATE_LINK( HandleCancelBtn, void * );
     DECL_DLLPRIVATE_LINK(TimeOutHdl, void *);
     DECL_DLLPRIVATE_LINK( startProgress, void * );
-    DECL_DLLPRIVATE_LINK( HandleHyperlink, svt::FixedHyperlink * );
+    DECL_DLLPRIVATE_LINK( HandleHyperlink, FixedHyperlink * );
 
     bool            isEnabled( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
     bool            checkDependencies( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ) const;
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 29511d247515..4163dc53474f 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -542,7 +542,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
     // Init publisher link here
     if ( !pEntry->m_pPublisher && pEntry->m_sPublisher.Len() )
     {
-        pEntry->m_pPublisher = new svt::FixedHyperlink( this );
+        pEntry->m_pPublisher = new FixedHyperlink( this );
         pEntry->m_pPublisher->SetBackground();
         pEntry->m_pPublisher->SetPaintTransparent( true );
         pEntry->m_pPublisher->SetURL( pEntry->m_sPublisherURL );
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
index 0a6eca204c86..2ca3da7bb94c 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx
@@ -29,10 +29,10 @@
 #include "rtl/ustring.hxx"
 #include "vcl/scrbar.hxx"
 #include "vcl/fixed.hxx"
+#include "vcl/fixedhyper.hxx"
 #include "vcl/dialog.hxx"
 
 #include "svtools/extensionlistbox.hxx"
-#include "svtools/fixedhyper.hxx"
 #include "cppuhelper/implbase1.hxx"
 #include "unotools/collatorwrapper.hxx"
 
@@ -54,7 +54,7 @@ namespace dp_gui {
 
 class TheExtensionManager;
 
-typedef ::boost::shared_ptr< svt::FixedHyperlink > TFixedHyperlink;
+typedef ::boost::shared_ptr< FixedHyperlink > TFixedHyperlink;
 
 //------------------------------------------------------------------------------
 //                          struct Entry_Impl
@@ -85,7 +85,7 @@ struct Entry_Impl
     String          m_sLicenseText;
     Image           m_aIcon;
     Image           m_aIconHC;
-    svt::FixedHyperlink *m_pPublisher;
+    FixedHyperlink* m_pPublisher;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> m_xPackage;
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 129663a28dec..c9b5c4ff2042 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -1390,7 +1390,7 @@ IMPL_LINK_NOARG(UpdateDialog, closeHandler) {
     return 0;
 }
 
-IMPL_LINK( UpdateDialog, hyperlink_clicked, svt::FixedHyperlink*, pHyperlink )
+IMPL_LINK( UpdateDialog, hyperlink_clicked, FixedHyperlink*, pHyperlink )
 {
     ::rtl::OUString sURL;
     if ( pHyperlink )
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index ea1cc8d56201..d267e9d16014 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -41,10 +41,10 @@
 #include "svx/checklbx.hxx"
 #include "tools/link.hxx"
 #include "tools/solar.h"
-#include "vcl/button.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/fixed.hxx"
-#include <svtools/fixedhyper.hxx>
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
+#include <vcl/fixed.hxx>
+#include <vcl/fixedhyper.hxx>
 #include <vcl/throbber.hxx>
 
 #include "descedit.hxx"
@@ -177,7 +177,7 @@ private:
     DECL_LINK(allHandler, void *);
     DECL_LINK(okHandler, void *);
     DECL_LINK(closeHandler, void *);
-    DECL_LINK(hyperlink_clicked, svt::FixedHyperlink *);
+    DECL_LINK(hyperlink_clicked, FixedHyperlink *);
 
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
         m_context;
@@ -188,9 +188,9 @@ private:
     CheckBox m_all;
     FixedLine m_description;
     FixedText m_PublisherLabel;
-    svt::FixedHyperlink m_PublisherLink;
+    FixedHyperlink m_PublisherLink;
     FixedText m_ReleaseNotesLabel;
-    svt::FixedHyperlink m_ReleaseNotesLink;
+    FixedHyperlink m_ReleaseNotesLink;
     dp_gui::DescriptionEdit m_descriptions;
     FixedLine m_line;
     HelpButton m_help;