diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2015-11-07 14:43:19 +0100 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2015-11-11 10:49:30 +0000 |
| commit | fa91dd31f39a24329d288d4e1cda28db3a16af0d (patch) | |
| tree | 603d7c206ac0ec1f1a08cc9f3bf8835bd8d2fb2f /include/tools | |
| parent | c21ddcdb30b8dd7be56176e00bc2d4780cb342e1 (diff) | |
5th step to remove tools/rtti.hxx
tools/rtti.hxx removed
completed the interface of some Sdr.* Items
and removed pseudo items
Change-Id: I0cdcd01494be35b97a27d5985aa908affa96048a
Reviewed-on: https://gerrit.libreoffice.org/19837
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'include/tools')
| -rw-r--r-- | include/tools/errinf.hxx | 6 | ||||
| -rw-r--r-- | include/tools/pstm.hxx | 4 | ||||
| -rw-r--r-- | include/tools/stream.hxx | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx index ea188e43b210..950a65ec5ea9 100644 --- a/include/tools/errinf.hxx +++ b/include/tools/errinf.hxx @@ -24,7 +24,6 @@ #include <limits.h> #include <rtl/ustring.hxx> -#include <tools/rtti.hxx> #include <tools/errcode.hxx> #include <tools/toolsdllapi.h> @@ -40,7 +39,6 @@ private: sal_uIntPtr lUserId; public: - TYPEINFO(); ErrorInfo( sal_uIntPtr lArgUserId ) : lUserId( lArgUserId ){} @@ -59,7 +57,6 @@ private: EDcr_Impl* pImpl; public: - TYPEINFO_OVERRIDE(); DynamicErrorInfo(sal_uIntPtr lUserId, sal_uInt16 nMask); virtual ~DynamicErrorInfo(); @@ -74,7 +71,6 @@ private: OUString aString; public: - TYPEINFO_OVERRIDE(); StringErrorInfo( sal_uIntPtr lUserId, const OUString& aStringP, @@ -89,7 +85,6 @@ private: OUString aArg2; public: - TYPEINFO_OVERRIDE(); TwoStringErrorInfo(sal_uIntPtr nUserID, const OUString & rTheArg1, const OUString & rTheArg2, sal_uInt16 nFlags = 0): @@ -104,7 +99,6 @@ public: class TOOLS_DLLPUBLIC MessageInfo : public DynamicErrorInfo { public: - TYPEINFO_OVERRIDE(); MessageInfo(sal_uIntPtr UserId, sal_uInt16 nFlags = 0) : DynamicErrorInfo(UserId, nFlags) {} diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx index 402a0c9e0635..e1e584334bc7 100644 --- a/include/tools/pstm.hxx +++ b/include/tools/pstm.hxx @@ -22,7 +22,6 @@ #include <tools/toolsdllapi.h> #include <tools/unqidx.hxx> #include <tools/ref.hxx> -#include <tools/rtti.hxx> #include <tools/stream.hxx> #include <map> #include <unordered_map> @@ -49,11 +48,9 @@ public: class TOOLS_DLLPUBLIC SvRttiBase : public SvRefBase { public: - TYPEINFO(); }; #define SV_DECL_PERSIST1( Class, Super1, CLASS_ID ) \ - TYPEINFO_OVERRIDE(); \ static sal_Int32 StaticClassId() { return CLASS_ID; } \ static void * CreateInstance( SvPersistBase ** ppBase ); \ friend SvPersistStream& operator >> ( SvPersistStream & rStm, \ @@ -80,7 +77,6 @@ public: } #define SV_IMPL_PERSIST1( Class, Super1 ) \ - TYPEINIT1( Class, Super1 ) \ PRV_SV_IMPL_PERSIST( Class ) class SvPersistStream; diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx index 8c68a211fe56..6e0ecb8d073c 100644 --- a/include/tools/stream.hxx +++ b/include/tools/stream.hxx @@ -25,7 +25,6 @@ #include <tools/lineend.hxx> #include <tools/errinf.hxx> #include <tools/ref.hxx> -#include <tools/rtti.hxx> #include <rtl/string.hxx> #include <o3tl/typed_flags_set.hxx> @@ -112,7 +111,6 @@ protected: void close(); public: - TYPEINFO(); SvLockBytes() : m_pStream(nullptr), m_bOwner(false), m_bSync(false) {} @@ -145,7 +143,6 @@ typedef tools::SvRef<SvLockBytes> SvLockBytesRef; class TOOLS_DLLPUBLIC SvOpenLockBytes: public SvLockBytes { public: - TYPEINFO_OVERRIDE(); SvOpenLockBytes() : SvLockBytes(nullptr, false) {} SvOpenLockBytes(SvStream * pStream, bool bOwner): @@ -164,7 +161,6 @@ class SvAsyncLockBytes: public SvOpenLockBytes bool m_bTerminated; public: - TYPEINFO_OVERRIDE(); SvAsyncLockBytes(SvStream * pStream, bool bOwner): SvOpenLockBytes(pStream, bOwner), m_nSize(0), m_bTerminated(false) {} |