[Libreoffice-commits] core.git: include/svl svl/source

[Noel Grandin]

 include/svl/hint.hxx          |   18 ------------------
 include/svl/inethist.hxx      |    9 ++++++++-
 include/svl/poolitem.hxx      |    9 ++++++++-
 svl/source/items/poolitem.cxx |    2 --
 svl/source/misc/inethist.cxx  |    5 -----
 5 files changed, 16 insertions(+), 27 deletions(-)

New commits:
commit ec7f227f90fbdd0bd17c0b885a832e6408106deb
Author: Noel Grandin <noelgrandin at gmail.com>
Date:   Sat Apr 25 21:07:12 2015 +0200

    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 at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/svl/hint.hxx b/include/svl/hint.hxx
index 70df074..4aec700 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 b54f8dc..3fcca5e 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 8857002..4cd3c88 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 0e2a8d9..d6480b0 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 984cef0..68428eb 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