diff options
| -rw-r--r-- | include/vcl/hyperlabel.hxx (renamed from include/svtools/hyperlabel.hxx) | 10 | ||||
| -rw-r--r-- | solenv/clang-format/blacklist | 4 | ||||
| -rw-r--r-- | svtools/Library_svt.mk | 1 | ||||
| -rw-r--r-- | svtools/inc/roadmap.hxx | 5 | ||||
| -rw-r--r-- | svtools/source/control/roadmap.cxx | 10 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
| -rw-r--r-- | vcl/source/control/hyperlabel.cxx (renamed from svtools/source/control/hyperlabel.cxx) | 8 |
7 files changed, 17 insertions, 22 deletions
diff --git a/include/svtools/hyperlabel.hxx b/include/vcl/hyperlabel.hxx index b4a6b22dbff1..864c9888f2b6 100644 --- a/include/svtools/hyperlabel.hxx +++ b/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; diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 925add79640c..037c6db78dbe 100644 --- a/solenv/clang-format/blacklist +++ b/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 diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index c2ebdbfb4e47..0c811012b30a 100644 --- a/svtools/Library_svt.mk +++ b/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 \ diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx index 3056dfb0bff6..b09afcd4e238 100644 --- a/svtools/inc/roadmap.hxx +++ b/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; diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index bee30e776af3..7813a2394a0f 100644 --- a/svtools/source/control/roadmap.cxx +++ b/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); diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 1c3f0b31eb2d..2fdff2495f81 100644 --- a/vcl/Library_vcl.mk +++ b/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 \ diff --git a/svtools/source/control/hyperlabel.cxx b/vcl/source/control/hyperlabel.cxx index d81f0cbdece6..d65a35959f5a 100644 --- a/svtools/source/control/hyperlabel.cxx +++ b/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: */ |