[Libreoffice-commits] core.git: include/sfx2 include/svl sfx2/source
Noel Grandin
noel at peralex.com
Wed Oct 15 01:43:42 PDT 2014
include/sfx2/app.hxx | 12 +++++++++++-
include/svl/smplhint.hxx | 19 -------------------
sfx2/source/appl/appcfg.cxx | 2 --
3 files changed, 11 insertions(+), 22 deletions(-)
New commits:
commit 872036c8e2e4a098a528a7f0083201433786d331
Author: Noel Grandin <noel at peralex.com>
Date: Wed Oct 15 10:41:58 2014 +0200
remove unused DECL_OBJHINT and IMPL_OBJHINT macros
these have been unused since we switch to using normal C++ RTTI with the
SfxHint subclasses
Change-Id: Ia271cfa01d2f49ed335e90f78309cd26d6ec9d8f
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 8017757..5993561 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -116,7 +116,17 @@ public:
//TODO/CLEANUP
//is apparently used only in SfxPickList/SfxFrameLoader
-DECL_OBJHINT( SfxStringHint, OUString );
+class SfxStringHint: public SfxSimpleHint
+{
+ OUString aObj;
+
+public:
+ SfxStringHint( sal_uInt16 nId, const OUString& rObject ):
+ SfxSimpleHint( nId ),
+ aObj(rObject) { }
+ const OUString& GetObject() const { return aObj; }
+ virtual ~SfxStringHint() {}
+};
#ifndef SFX_DECL_OBJECTSHELL_DEFINED
#define SFX_DECL_OBJECTSHELL_DEFINED
diff --git a/include/svl/smplhint.hxx b/include/svl/smplhint.hxx
index 058b91c..fdef63e 100644
--- a/include/svl/smplhint.hxx
+++ b/include/svl/smplhint.hxx
@@ -66,25 +66,6 @@ public:
sal_uLong GetId() const { return mnId; }
};
-
-
-#define DECL_OBJHINT(Name, Type) \
- class Name: public SfxSimpleHint \
- { \
- Type aObj; \
- \
- public: \
- Name( sal_uInt16 nId, const Type& rObject ); \
- virtual ~Name(); \
- const Type& GetObject() const { return aObj; } \
- }
-
-#define IMPL_OBJHINT(Name, Type) \
- Name::Name( sal_uInt16 nID, const Type& rObject ): \
- SfxSimpleHint( nID ), aObj(rObject) \
- { } \
- Name::~Name() {}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index f956a48..e4bf242 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -898,6 +898,4 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron
new SfxEventAsyncer_Impl( rEventHint );
}
-IMPL_OBJHINT( SfxStringHint, OUString )
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list