Kaydet (Commit) 32935091 authored tarafından Noel Grandin's avatar Noel Grandin

remove custom RTTI from SvDataCopyStream

nothing is using it, except perhaps for XFillExchangeData, which was
using it incorrectly :-(

Change-Id: Ib9246a20bc97ad91d3e3e97fa642217686fc8c46
üst 7153fcb7
...@@ -42,8 +42,6 @@ protected: ...@@ -42,8 +42,6 @@ protected:
void ClearAll(); void ClearAll();
public: public:
TYPEINFO_OVERRIDE();
FileList() {}; FileList() {};
virtual ~FileList(); virtual ~FileList();
......
...@@ -334,9 +334,6 @@ protected: ...@@ -334,9 +334,6 @@ protected:
virtual void Assign( const SvDataCopyStream& ) SAL_OVERRIDE; virtual void Assign( const SvDataCopyStream& ) SAL_OVERRIDE;
public: public:
TYPEINFO_OVERRIDE();
GraphicObject( const GraphicManager* pMgr = NULL ); GraphicObject( const GraphicManager* pMgr = NULL );
GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr = NULL ); GraphicObject( const Graphic& rGraphic, const GraphicManager* pMgr = NULL );
GraphicObject( const GraphicObject& rCacheObj, const GraphicManager* pMgr = NULL ); GraphicObject( const GraphicObject& rCacheObj, const GraphicManager* pMgr = NULL );
......
...@@ -756,7 +756,6 @@ class TOOLS_DLLPUBLIC SvDataCopyStream ...@@ -756,7 +756,6 @@ class TOOLS_DLLPUBLIC SvDataCopyStream
{ {
public: public:
// repeated execution of Load or Assign is allowed // repeated execution of Load or Assign is allowed
TYPEINFO();
virtual ~SvDataCopyStream(){} virtual ~SvDataCopyStream(){}
virtual void Load( SvStream & ) = 0; virtual void Load( SvStream & ) = 0;
virtual void Save( SvStream & ) = 0; virtual void Save( SvStream & ) = 0;
......
...@@ -89,9 +89,6 @@ public: ...@@ -89,9 +89,6 @@ public:
SAL_DLLPRIVATE ImpGraphic* ImplGetImpGraphic() const { return mpImpGraphic; } SAL_DLLPRIVATE ImpGraphic* ImplGetImpGraphic() const { return mpImpGraphic; }
public: public:
TYPEINFO_OVERRIDE();
Graphic(); Graphic();
Graphic( const Graphic& rGraphic ); Graphic( const Graphic& rGraphic );
Graphic( const Bitmap& rBmp ); Graphic( const Bitmap& rBmp );
......
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
#include <osl/diagnose.h> #include <osl/diagnose.h>
#include <osl/thread.h> #include <osl/thread.h>
TYPEINIT1_AUTOFACTORY( FileList, SvDataCopyStream );
/************************************************************************* /*************************************************************************
|* |*
|* FileList - Ctor/Dtor |* FileList - Ctor/Dtor
......
...@@ -56,8 +56,6 @@ struct GrfSimpleCacheObj ...@@ -56,8 +56,6 @@ struct GrfSimpleCacheObj
maGraphic( rGraphic ), maAttr( rAttr ) {} maGraphic( rGraphic ), maAttr( rAttr ) {}
}; };
TYPEINIT1_AUTOFACTORY( GraphicObject, SvDataCopyStream );
// unique increasing ID for being able to detect the GraphicObject with the // unique increasing ID for being able to detect the GraphicObject with the
// oldest last data changes // oldest last data changes
static sal_uLong aIncrementingTimeOfLastDataChange = 1; static sal_uLong aIncrementingTimeOfLastDataChange = 1;
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
TYPEINIT1_AUTOFACTORY( XFillExchangeData, SvDataCopyStream ); TYPEINIT0_AUTOFACTORY( XFillExchangeData );
/// default CTOR, for Assign() /// default CTOR, for Assign()
XFillExchangeData::XFillExchangeData() : XFillExchangeData::XFillExchangeData() :
......
...@@ -2028,8 +2028,6 @@ bool SvScriptStream::good() const ...@@ -2028,8 +2028,6 @@ bool SvScriptStream::good() const
return mpHandle != NULL; return mpHandle != NULL;
} }
TYPEINIT0 ( SvDataCopyStream )
void SvDataCopyStream::Assign( const SvDataCopyStream& ) void SvDataCopyStream::Assign( const SvDataCopyStream& )
{ {
} }
......
...@@ -178,8 +178,6 @@ static void ImplDrawDefault( OutputDevice* pOutDev, const OUString* pText, ...@@ -178,8 +178,6 @@ static void ImplDrawDefault( OutputDevice* pOutDev, const OUString* pText,
pOutDev->Pop(); pOutDev->Pop();
} }
TYPEINIT1_AUTOFACTORY( Graphic, SvDataCopyStream );
Graphic::Graphic() Graphic::Graphic()
{ {
mpImpGraphic = new ImpGraphic; mpImpGraphic = new ImpGraphic;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment