diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-04-25 21:07:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-04-28 11:58:32 +0000 |
| commit | ec7f227f90fbdd0bd17c0b885a832e6408106deb (patch) | |
| tree | ae6da93b5f65435d4dca598415c54aa560a5fd31 | |
| parent | 6b84bc7d24e2a862dd5edbd600be4959cd22c633 (diff) | |
expand and remove DECL_PTRHINT macro
since there are only 2 uses of it
Change-Id: I49543168d5d9aeaae66d99663707657d67002fdc
Reviewed-on: https://gerrit.libreoffice.org/15531
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | include/svl/hint.hxx | 18 | ||||
| -rw-r--r-- | include/svl/inethist.hxx | 9 | ||||
| -rw-r--r-- | include/svl/poolitem.hxx | 9 | ||||
| -rw-r--r-- | svl/source/items/poolitem.cxx | 2 | ||||
| -rw-r--r-- | svl/source/misc/inethist.cxx | 5 |
5 files changed, 16 insertions, 27 deletions
diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx index 70df0743b47a..4aec70090c54 100644 --- a/include/svl/hint.hxx +++ b/include/svl/hint.hxx @@ -28,24 +28,6 @@ public: }; - -#define DECL_PTRHINT(Visibility, Name, Type) \ - class Visibility Name: public SfxHint \ - { \ - Type* pObj; \ - \ - public: \ - explicit Name( Type* Object ); \ - virtual ~Name(); \ - \ - Type* GetObject() const { return pObj; } \ - } - -#define IMPL_PTRHINT(Name, Type) \ - Name::Name( Type* pObject ) { pObj = pObject; } \ - Name::~Name() {} - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svl/inethist.hxx b/include/svl/inethist.hxx index b54f8dc426ff..3fcca5eb0d49 100644 --- a/include/svl/inethist.hxx +++ b/include/svl/inethist.hxx @@ -107,7 +107,14 @@ public: }; // broadcasted from PutUrl(). -DECL_PTRHINT (SVL_DLLPUBLIC, INetURLHistoryHint, const INetURLObject); +class SVL_DLLPUBLIC INetURLHistoryHint: public SfxHint +{ + const INetURLObject* pObj; +public: + explicit INetURLHistoryHint( const INetURLObject* Object ) : pObj(Object) {} + virtual ~INetURLHistoryHint() {} + const INetURLObject* GetObject() const { return pObj; } +}; #endif // INCLUDED_SVL_INETHIST_HXX diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 8857002b69ca..4cd3c88947e4 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -339,7 +339,14 @@ public: }; -DECL_PTRHINT(SVL_DLLPUBLIC, SfxPoolItemHint, SfxPoolItem); +class SVL_DLLPUBLIC SfxPoolItemHint: public SfxHint +{ + SfxPoolItem* pObj; +public: + explicit SfxPoolItemHint( SfxPoolItem* Object ) : pObj(Object) {} + virtual ~SfxPoolItemHint() {} + SfxPoolItem* GetObject() const { return pObj; } +}; diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 0e2a8d93bb2a..d6480b01cd41 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -40,8 +40,6 @@ const char* pw4 = "Wow! 50.000.000 items!"; const char* pw5 = "Wow! 10.000.000 items!"; #endif -IMPL_PTRHINT(SfxPoolItemHint,SfxPoolItem) - SfxPoolItem::SfxPoolItem(sal_uInt16 const nWhich) : m_nRefCount(0) , m_nWhich(nWhich) diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 984cef027120..68428ebda073 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -41,11 +41,6 @@ #define INETHIST_SIZE_LIMIT 1024 #define INETHIST_MAGIC_HEAD 0x484D4849UL -/* - * INetURLHistoryHint implementation. - */ -IMPL_PTRHINT (INetURLHistoryHint, const INetURLObject); - class INetURLHistory_Impl: private boost::noncopyable { struct head_entry |