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 /xmloff/source/draw | |
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 'xmloff/source/draw')
33 files changed, 0 insertions, 123 deletions
diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index ed81d6ef4ce9..8abc0ed7185b 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -45,7 +45,6 @@ using ::xmloff::token::XML_TEXT_PROPERTIES; using ::xmloff::token::XML_GRAPHIC_PROPERTIES; using ::xmloff::token::XML_PARAGRAPH_PROPERTIES; -TYPEINIT1( XMLGraphicsDefaultStyle, XMLPropStyleContext ); XMLGraphicsDefaultStyle::XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< XAttributeList >& xAttrList, SvXMLStylesContext& rStyles ) : XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, XML_STYLE_FAMILY_SD_GRAPHICS_ID, true ) diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index 24daf511706d..2a4dc6d43da6 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -125,7 +125,6 @@ protected: bool bValid; public: - TYPEINFO_OVERRIDE(); XMLImageMapObjectContext( SvXMLImport& rImport, @@ -159,7 +158,6 @@ protected: }; -TYPEINIT1( XMLImageMapObjectContext, SvXMLImportContext ); XMLImageMapObjectContext::XMLImageMapObjectContext( SvXMLImport& rImport, @@ -319,7 +317,6 @@ class XMLImageMapRectangleContext : public XMLImageMapObjectContext bool bHeightOK; public: - TYPEINFO_OVERRIDE(); XMLImageMapRectangleContext( SvXMLImport& rImport, @@ -342,7 +339,6 @@ protected: -TYPEINIT1(XMLImageMapRectangleContext, XMLImageMapObjectContext); XMLImageMapRectangleContext::XMLImageMapRectangleContext( SvXMLImport& rImport, @@ -429,7 +425,6 @@ class XMLImageMapPolygonContext : public XMLImageMapObjectContext bool bPointsOK; public: - TYPEINFO_OVERRIDE(); XMLImageMapPolygonContext( SvXMLImport& rImport, @@ -452,7 +447,6 @@ protected: -TYPEINIT1(XMLImageMapPolygonContext, XMLImageMapObjectContext); XMLImageMapPolygonContext::XMLImageMapPolygonContext( SvXMLImport& rImport, @@ -527,7 +521,6 @@ class XMLImageMapCircleContext : public XMLImageMapObjectContext bool bRadiusOK; public: - TYPEINFO_OVERRIDE(); XMLImageMapCircleContext( SvXMLImport& rImport, @@ -548,7 +541,6 @@ protected: ::com::sun::star::beans::XPropertySet> & rPropertySet) override; }; -TYPEINIT1(XMLImageMapCircleContext, XMLImageMapObjectContext); XMLImageMapCircleContext::XMLImageMapCircleContext( SvXMLImport& rImport, @@ -631,7 +623,6 @@ void XMLImageMapCircleContext::Prepare( -TYPEINIT1(XMLImageMapContext, SvXMLImportContext); XMLImageMapContext::XMLImageMapContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index 0fce93fde052..d7872d941f01 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -488,7 +488,6 @@ private: std::shared_ptr< SvXMLImportContext > mpSlaveContext; public: - TYPEINFO_OVERRIDE(); SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -509,7 +508,6 @@ public: virtual void Characters( const OUString& rChars ) override; }; -TYPEINIT1( SdXMLNumberFormatMemberImportContext, SvXMLImportContext ); SdXMLNumberFormatMemberImportContext::SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SdXMLNumberFormatImportContext* pParent, SvXMLImportContext* pSlaveContext ) : SvXMLImportContext(rImport, nPrfx, rLocalName), @@ -578,7 +576,6 @@ void SdXMLNumberFormatMemberImportContext::Characters( const OUString& rChars ) maText += rChars; } -TYPEINIT1( SdXMLNumberFormatImportContext, SvXMLImportContext ); SdXMLNumberFormatImportContext::SdXMLNumberFormatImportContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, SvXMLNumImpData* pNewData, sal_uInt16 nNewType, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, SvXMLStylesContext& rStyles) : SvXMLNumFormatContext(rImport, nPrfx, rLocalName, pNewData, nNewType, xAttrList, rStyles), diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index bf70fee4cfc6..4ceca19a46ac 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -32,7 +32,6 @@ using ::com::sun::star::uno::makeAny; using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::beans; -TYPEINIT1( XMLReplacementImageContext, SvXMLImportContext ); XMLReplacementImageContext::XMLReplacementImageContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx index a3e75e13008f..0b48378f1331 100644 --- a/xmloff/source/draw/XMLShapePropertySetContext.cxx +++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -TYPEINIT1( XMLShapePropertySetContext, SvXMLPropertySetContext ); XMLShapePropertySetContext::XMLShapePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index 9a8888d9dd82..f7e97373a66e 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -43,7 +43,6 @@ using ::xmloff::token::XML_TEXT_PROPERTIES; using ::xmloff::token::XML_GRAPHIC_PROPERTIES; using ::xmloff::token::XML_PARAGRAPH_PROPERTIES; -TYPEINIT1( XMLShapeStyleContext, XMLPropStyleContext ); XMLShapeStyleContext::XMLShapeStyleContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index d6f89e55d392..9d374e3a34dd 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -623,7 +623,6 @@ Any AnimationsImportHelperImpl::convertPath( const OUString& rValue ) return makeAny( rValue ); } -TYPEINIT1( AnimationNodeContext, SvXMLImportContext ); AnimationNodeContext::AnimationNodeContext( const Reference< XAnimationNode >& xParentNode, diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 04e910e30972..3ce0856dbc8b 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -380,7 +380,6 @@ public: OUString maPathShapeId; public: - TYPEINFO_OVERRIDE(); XMLAnimationsEffectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -400,13 +399,11 @@ class XMLAnimationsSoundContext : public SvXMLImportContext XMLAnimationsEffectContext* mpParent; public: - TYPEINFO_OVERRIDE(); XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent ); virtual ~XMLAnimationsSoundContext(); }; -TYPEINIT1( XMLAnimationsSoundContext, SvXMLImportContext ); XMLAnimationsSoundContext::XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent ) : SvXMLImportContext( rImport, nPrfx, rLocalName ), mpParent( pParent ) @@ -443,7 +440,6 @@ XMLAnimationsSoundContext::~XMLAnimationsSoundContext() { } -TYPEINIT1( XMLAnimationsEffectContext, SvXMLImportContext ); XMLAnimationsEffectContext::XMLAnimationsEffectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, AnimImpImpl* pImpl ) : SvXMLImportContext(rImport, nPrfx, rLocalName), @@ -650,7 +646,6 @@ void XMLAnimationsEffectContext::EndElement() } } -TYPEINIT1( XMLAnimationsContext, SvXMLImportContext ); XMLAnimationsContext::XMLAnimationsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& ) diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx index 5545edb1eb07..705528886271 100644 --- a/xmloff/source/draw/descriptionimp.cxx +++ b/xmloff/source/draw/descriptionimp.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::beans; using namespace ::xmloff::token; -TYPEINIT1( SdXMLDescriptionContext, SvXMLImportContext ); SdXMLDescriptionContext::SdXMLDescriptionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList>&, const Reference< XShape >& rxShape) diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx index d4e4065101a5..f820a830c59d 100644 --- a/xmloff/source/draw/descriptionimp.hxx +++ b/xmloff/source/draw/descriptionimp.hxx @@ -31,7 +31,6 @@ private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; OUString msText; public: - TYPEINFO_OVERRIDE(); SdXMLDescriptionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index 72eed8528074..b19b343f66ec 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -76,7 +76,6 @@ private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; public: - TYPEINFO_OVERRIDE(); SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, const Reference< XShape >& rxShape ); virtual ~SdXMLEventContext(); @@ -104,13 +103,11 @@ class XMLEventSoundContext : public SvXMLImportContext SdXMLEventContext* mpParent; public: - TYPEINFO_OVERRIDE(); XMLEventSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent ); virtual ~XMLEventSoundContext(); }; -TYPEINIT1( XMLEventSoundContext, SvXMLImportContext ); XMLEventSoundContext::XMLEventSoundContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent ) : SvXMLImportContext( rImp, nPrfx, rLocalName ), mpParent( pParent ) @@ -147,7 +144,6 @@ XMLEventSoundContext::~XMLEventSoundContext() { } -TYPEINIT1( SdXMLEventContext, SvXMLImportContext ); SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, const Reference< XShape >& rxShape ) : SvXMLImportContext(rImp, nPrfx, rLocalName) @@ -482,7 +478,6 @@ void SdXMLEventContext::EndElement() } while(false); } -TYPEINIT1( SdXMLEventsContext, SvXMLImportContext ); SdXMLEventsContext::SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList>&, const Reference< XShape >& rxShape) diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx index 61efd8e72d64..c190d8ca14a9 100644 --- a/xmloff/source/draw/eventimp.hxx +++ b/xmloff/source/draw/eventimp.hxx @@ -31,7 +31,6 @@ private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; public: - TYPEINFO_OVERRIDE(); SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index 13241312d7bd..3f42d3adc61a 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -142,7 +142,6 @@ void SdXMLLayerContext::EndElement() } -TYPEINIT1( SdXMLLayerSetContext, SvXMLImportContext ); SdXMLLayerSetContext::SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>&) diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx index dea7841f13d7..fe788f5cc2c2 100644 --- a/xmloff/source/draw/layerimp.hxx +++ b/xmloff/source/draw/layerimp.hxx @@ -31,7 +31,6 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxLayerManager; public: - TYPEINFO_OVERRIDE(); SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index e4409d1dd955..9a34294350d9 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -101,7 +101,6 @@ public: const uno::Reference<xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLDocContext_Impl(); - TYPEINFO_OVERRIDE(); virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, @@ -121,7 +120,6 @@ SdXMLDocContext_Impl::~SdXMLDocContext_Impl() { } -TYPEINIT1( SdXMLDocContext_Impl, SvXMLImportContext ); SvXMLImportContext *SdXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix, diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index 48f960eb3ae7..105b29004d96 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star; -TYPEINIT1( SdXML3DObjectContext, SdXMLShapeContext ); SdXML3DObjectContext::SdXML3DObjectContext( SvXMLImport& rImport, @@ -105,7 +104,6 @@ void SdXML3DObjectContext::EndElement() SdXMLShapeContext::EndElement(); } -TYPEINIT1( SdXML3DCubeObjectShapeContext, SdXML3DObjectContext); SdXML3DCubeObjectShapeContext::SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, @@ -207,7 +205,6 @@ void SdXML3DCubeObjectShapeContext::EndElement() SdXML3DObjectContext::EndElement(); } -TYPEINIT1( SdXML3DSphereObjectShapeContext, SdXML3DObjectContext); SdXML3DSphereObjectShapeContext::SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, @@ -306,7 +303,6 @@ void SdXML3DSphereObjectShapeContext::EndElement() SdXML3DObjectContext::EndElement(); } -TYPEINIT1( SdXML3DPolygonBasedShapeContext, SdXML3DObjectContext ); SdXML3DPolygonBasedShapeContext::SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, @@ -393,7 +389,6 @@ void SdXML3DPolygonBasedShapeContext::EndElement() SdXML3DObjectContext::EndElement(); } -TYPEINIT1( SdXML3DLatheObjectShapeContext, SdXML3DPolygonBasedShapeContext); SdXML3DLatheObjectShapeContext::SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, @@ -428,7 +423,6 @@ void SdXML3DLatheObjectShapeContext::EndElement() SdXML3DPolygonBasedShapeContext::EndElement(); } -TYPEINIT1( SdXML3DExtrudeObjectShapeContext, SdXML3DPolygonBasedShapeContext); SdXML3DExtrudeObjectShapeContext::SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index 0c05f850c02e..dc4080f6ce6d 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -24,7 +24,6 @@ #include "sdxmlimp_impl.hxx" #include <xmloff/nmspmap.hxx> #include <com/sun/star/drawing/XShapes.hpp> -#include <tools/rtti.hxx> #include <com/sun/star/drawing/HomogenMatrix.hpp> #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/drawing/Position3D.hpp> @@ -41,7 +40,6 @@ protected: bool mbSetTransform; public: - TYPEINFO_OVERRIDE(); SdXML3DObjectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -65,7 +63,6 @@ class SdXML3DCubeObjectShapeContext : public SdXML3DObjectContext bool mbMaxEdgeUsed; public: - TYPEINFO_OVERRIDE(); SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -88,7 +85,6 @@ class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext bool mbSizeUsed; public: - TYPEINFO_OVERRIDE(); SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -109,7 +105,6 @@ class SdXML3DPolygonBasedShapeContext : public SdXML3DObjectContext OUString maViewBox; public: - TYPEINFO_OVERRIDE(); SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -127,7 +122,6 @@ public: class SdXML3DLatheObjectShapeContext : public SdXML3DPolygonBasedShapeContext { public: - TYPEINFO_OVERRIDE(); SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -145,7 +139,6 @@ public: class SdXML3DExtrudeObjectShapeContext : public SdXML3DPolygonBasedShapeContext { public: - TYPEINFO_OVERRIDE(); SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 507dbbb2000f..5fc4b451b197 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -85,7 +85,6 @@ SdXML3DLightContext::~SdXML3DLightContext() { } -TYPEINIT1( SdXML3DSceneShapeContext, SdXMLShapeContext ); SdXML3DSceneShapeContext::SdXML3DSceneShapeContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index 49e82e155895..8c120acad652 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -24,7 +24,6 @@ #include "sdxmlimp_impl.hxx" #include <xmloff/nmspmap.hxx> #include <com/sun/star/drawing/XShapes.hpp> -#include <tools/rtti.hxx> #include <ximpshap.hxx> // dr3d:3dscene context @@ -36,7 +35,6 @@ class SdXML3DSceneShapeContext : public SdXMLShapeContext, public SdXML3DSceneAt com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren; public: - TYPEINFO_OVERRIDE(); SdXML3DSceneShapeContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index 5bb006cf9720..51aaca6cf328 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -51,7 +51,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; using namespace ::xmloff::EnhancedCustomShapeToken; -TYPEINIT1( XMLEnhancedCustomShapeContext, SvXMLImportContext ); XMLEnhancedCustomShapeContext::XMLEnhancedCustomShapeContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape, diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx index f3ce081cec87..cdc6c4f83a3e 100644 --- a/xmloff/source/draw/ximpcustomshape.hxx +++ b/xmloff/source/draw/ximpcustomshape.hxx @@ -51,7 +51,6 @@ class XMLEnhancedCustomShapeContext : public SvXMLImportContext public: - TYPEINFO_OVERRIDE(); XMLEnhancedCustomShapeContext( SvXMLImport& rImport, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, sal_uInt16 nPrefix, const OUString& rLocalName, std::vector< com::sun::star::beans::PropertyValue >& rCustomShapeGeometry ); diff --git a/xmloff/source/draw/ximpgrp.cxx b/xmloff/source/draw/ximpgrp.cxx index 4c6eca23b826..1757a88e5816 100644 --- a/xmloff/source/draw/ximpgrp.cxx +++ b/xmloff/source/draw/ximpgrp.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -TYPEINIT1( SdXMLGroupShapeContext, SvXMLImportContext ); SdXMLGroupShapeContext::SdXMLGroupShapeContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index 8f609ee49fbd..2ac189c85d59 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -24,7 +24,6 @@ #include "sdxmlimp_impl.hxx" #include <xmloff/nmspmap.hxx> #include <com/sun/star/drawing/XShapes.hpp> -#include <tools/rtti.hxx> #include "ximpshap.hxx" // draw:g context (RECURSIVE) @@ -35,7 +34,6 @@ class SdXMLGroupShapeContext : public SdXMLShapeContext com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxChildren; public: - TYPEINFO_OVERRIDE(); SdXMLGroupShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx index fdea3d9c3731..18349cf43936 100644 --- a/xmloff/source/draw/ximplink.cxx +++ b/xmloff/source/draw/ximplink.cxx @@ -24,7 +24,6 @@ using namespace ::com::sun::star; using namespace ::xmloff::token; -TYPEINIT1( SdXMLShapeLinkContext, SvXMLImportContext ); SdXMLShapeLinkContext::SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< xml::sax::XAttributeList>& xAttrList, uno::Reference< drawing::XShapes >& rShapes) : SvXMLShapeContext( rImport, nPrfx, rLocalName, false ) diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx index 85f3442cdec3..e1efa062b8ae 100644 --- a/xmloff/source/draw/ximplink.hxx +++ b/xmloff/source/draw/ximplink.hxx @@ -24,7 +24,6 @@ #include "sdxmlimp_impl.hxx" #include <xmloff/nmspmap.hxx> #include <com/sun/star/drawing/XShapes.hpp> -#include <tools/rtti.hxx> #include "ximpshap.hxx" // draw:a context @@ -39,7 +38,6 @@ class SdXMLShapeLinkContext : public SvXMLShapeContext OUString msHyperlink; public: - TYPEINFO_OVERRIDE(); SdXMLShapeLinkContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index bcf1871d274f..404fa163c20f 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -198,7 +198,6 @@ void DrawAnnotationContext::EndElement() } } -TYPEINIT1( SdXMLGenericPageContext, SvXMLImportContext ); SdXMLGenericPageContext::SdXMLGenericPageContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx index b0677fdff4cb..8f09146431c8 100644 --- a/xmloff/source/draw/ximppage.hxx +++ b/xmloff/source/draw/ximppage.hxx @@ -25,7 +25,6 @@ #include <xmloff/nmspmap.hxx> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/office/XAnnotationAccess.hpp> -#include <tools/rtti.hxx> #include "ximpshap.hxx" // draw:g context (RECURSIVE) @@ -61,7 +60,6 @@ protected: void SetNavigationOrder(); public: - TYPEINFO_OVERRIDE(); SdXMLGenericPageContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 7ce09b5c4d8d..dee62a3312e0 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -134,8 +134,6 @@ static bool ImpIsEmptyURL( const OUString& rURL ) return false; } -TYPEINIT1( SvXMLShapeContext, SvXMLImportContext ); -TYPEINIT1( SdXMLShapeContext, SvXMLShapeContext ); SdXMLShapeContext::SdXMLShapeContext( SvXMLImport& rImport, @@ -1009,7 +1007,6 @@ void SdXMLShapeContext::onDemandRescueUsefulDataFromTemporary( const SvXMLImport } } -TYPEINIT1( SdXMLRectShapeContext, SdXMLShapeContext ); SdXMLRectShapeContext::SdXMLRectShapeContext( SvXMLImport& rImport, @@ -1075,7 +1072,6 @@ void SdXMLRectShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib } } -TYPEINIT1( SdXMLLineShapeContext, SdXMLShapeContext ); SdXMLLineShapeContext::SdXMLLineShapeContext( SvXMLImport& rImport, @@ -1191,7 +1187,6 @@ void SdXMLLineShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib } } -TYPEINIT1( SdXMLEllipseShapeContext, SdXMLShapeContext ); SdXMLEllipseShapeContext::SdXMLEllipseShapeContext( SvXMLImport& rImport, @@ -1326,7 +1321,6 @@ void SdXMLEllipseShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } } -TYPEINIT1( SdXMLPolygonShapeContext, SdXMLShapeContext ); SdXMLPolygonShapeContext::SdXMLPolygonShapeContext( SvXMLImport& rImport, @@ -1435,7 +1429,6 @@ void SdXMLPolygonShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } } -TYPEINIT1( SdXMLPathShapeContext, SdXMLShapeContext ); SdXMLPathShapeContext::SdXMLPathShapeContext( SvXMLImport& rImport, @@ -1585,7 +1578,6 @@ void SdXMLPathShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib } } -TYPEINIT1( SdXMLTextBoxShapeContext, SdXMLShapeContext ); SdXMLTextBoxShapeContext::SdXMLTextBoxShapeContext( SvXMLImport& rImport, @@ -1776,7 +1768,6 @@ void SdXMLTextBoxShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } } -TYPEINIT1( SdXMLControlShapeContext, SdXMLShapeContext ); SdXMLControlShapeContext::SdXMLControlShapeContext( SvXMLImport& rImport, @@ -1841,7 +1832,6 @@ void SdXMLControlShapeContext::StartElement(const uno::Reference< xml::sax::XAtt } } -TYPEINIT1( SdXMLConnectorShapeContext, SdXMLShapeContext ); SdXMLConnectorShapeContext::SdXMLConnectorShapeContext( SvXMLImport& rImport, @@ -2110,7 +2100,6 @@ void SdXMLConnectorShapeContext::StartElement(const uno::Reference< xml::sax::XA } } -TYPEINIT1( SdXMLMeasureShapeContext, SdXMLShapeContext ); SdXMLMeasureShapeContext::SdXMLMeasureShapeContext( SvXMLImport& rImport, @@ -2222,7 +2211,6 @@ void SdXMLMeasureShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -TYPEINIT1( SdXMLPageShapeContext, SdXMLShapeContext ); SdXMLPageShapeContext::SdXMLPageShapeContext( SvXMLImport& rImport, @@ -2310,7 +2298,6 @@ void SdXMLPageShapeContext::StartElement(const uno::Reference< xml::sax::XAttrib } } -TYPEINIT1( SdXMLCaptionShapeContext, SdXMLShapeContext ); SdXMLCaptionShapeContext::SdXMLCaptionShapeContext( SvXMLImport& rImport, @@ -2411,7 +2398,6 @@ void SdXMLCaptionShapeContext::processAttribute( sal_uInt16 nPrefix, const OUStr SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -TYPEINIT1( SdXMLGraphicObjectShapeContext, SdXMLShapeContext ); SdXMLGraphicObjectShapeContext::SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, @@ -2577,7 +2563,6 @@ SdXMLGraphicObjectShapeContext::~SdXMLGraphicObjectShapeContext() } -TYPEINIT1( SdXMLChartShapeContext, SdXMLShapeContext ); SdXMLChartShapeContext::SdXMLChartShapeContext( SvXMLImport& rImport, @@ -2682,7 +2667,6 @@ SvXMLImportContext * SdXMLChartShapeContext::CreateChildContext( sal_uInt16 nPre return nullptr; } -TYPEINIT1( SdXMLObjectShapeContext, SdXMLShapeContext ); SdXMLObjectShapeContext::SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -2895,7 +2879,6 @@ SvXMLImportContext* SdXMLObjectShapeContext::CreateChildContext( return pContext; } -TYPEINIT1( SdXMLAppletShapeContext, SdXMLShapeContext ); SdXMLAppletShapeContext::SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -3057,7 +3040,6 @@ SvXMLImportContext * SdXMLAppletShapeContext::CreateChildContext( sal_uInt16 p_n return SdXMLShapeContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList ); } -TYPEINIT1( SdXMLPluginShapeContext, SdXMLShapeContext ); SdXMLPluginShapeContext::SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -3335,7 +3317,6 @@ SvXMLImportContext * SdXMLPluginShapeContext::CreateChildContext( sal_uInt16 p_n return SdXMLShapeContext::CreateChildContext( p_nPrefix, rLocalName, xAttrList ); } -TYPEINIT1( SdXMLFloatingFrameShapeContext, SdXMLShapeContext ); SdXMLFloatingFrameShapeContext::SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -3429,7 +3410,6 @@ void SdXMLFloatingFrameShapeContext::EndElement() SdXMLShapeContext::EndElement(); } -TYPEINIT1( SdXMLFrameShapeContext, SdXMLShapeContext ); SdXMLFrameShapeContext::SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -3722,7 +3702,6 @@ void SdXMLFrameShapeContext::processAttribute( sal_uInt16 nPrefix, SdXMLShapeContext::processAttribute( nPrefix, rLocalName, rValue ); } -TYPEINIT1( SdXMLCustomShapeContext, SdXMLShapeContext ); SdXMLCustomShapeContext::SdXMLCustomShapeContext( SvXMLImport& rImport, @@ -3948,7 +3927,6 @@ SvXMLImportContext* SdXMLCustomShapeContext::CreateChildContext( return pContext; } -TYPEINIT1( SdXMLTableShapeContext, SdXMLShapeContext ); SdXMLTableShapeContext::SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rShapes ) : SdXMLShapeContext( rImport, nPrfx, rLocalName, xAttrList, rShapes, false ) diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 972a03a6d3a9..e2f6b9b8e384 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/awt/Point.hpp> -#include <tools/rtti.hxx> #include "xexptran.hxx" #include <vector> #include <xmloff/shapeimport.hxx> @@ -102,7 +101,6 @@ protected: bool isPresentationShape() const; public: - TYPEINFO_OVERRIDE(); SdXMLShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -133,7 +131,6 @@ class SdXMLRectShapeContext : public SdXMLShapeContext sal_Int32 mnRadius; public: - TYPEINFO_OVERRIDE(); SdXMLRectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -157,7 +154,6 @@ class SdXMLLineShapeContext : public SdXMLShapeContext sal_Int32 mnY2; public: - TYPEINFO_OVERRIDE(); SdXMLLineShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -184,7 +180,6 @@ class SdXMLEllipseShapeContext : public SdXMLShapeContext sal_Int32 mnStartAngle; sal_Int32 mnEndAngle; public: - TYPEINFO_OVERRIDE(); SdXMLEllipseShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -207,7 +202,6 @@ class SdXMLPolygonShapeContext : public SdXMLShapeContext bool mbClosed; public: - TYPEINFO_OVERRIDE(); SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -228,7 +222,6 @@ class SdXMLPathShapeContext : public SdXMLShapeContext OUString maViewBox; public: - TYPEINFO_OVERRIDE(); SdXMLPathShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -250,7 +243,6 @@ class SdXMLTextBoxShapeContext : public SdXMLShapeContext OUString maChainNextName; public: - TYPEINFO_OVERRIDE(); SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -272,7 +264,6 @@ private: OUString maFormId; public: - TYPEINFO_OVERRIDE(); SdXMLControlShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -308,7 +299,6 @@ private: com::sun::star::uno::Any maPath; public: - TYPEINFO_OVERRIDE(); SdXMLConnectorShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -331,7 +321,6 @@ private: ::com::sun::star::awt::Point maEnd; public: - TYPEINFO_OVERRIDE(); SdXMLMeasureShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -353,7 +342,6 @@ class SdXMLPageShapeContext : public SdXMLShapeContext private: sal_Int32 mnPageNumber; public: - TYPEINFO_OVERRIDE(); SdXMLPageShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -376,7 +364,6 @@ private: sal_Int32 mnRadius; public: - TYPEINFO_OVERRIDE(); SdXMLCaptionShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -399,7 +386,6 @@ private: ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: - TYPEINFO_OVERRIDE(); SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -424,7 +410,6 @@ class SdXMLChartShapeContext : public SdXMLShapeContext SvXMLImportContext* mpChartContext; public: - TYPEINFO_OVERRIDE(); SdXMLChartShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -451,7 +436,6 @@ private: ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: - TYPEINFO_OVERRIDE(); SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -483,7 +467,6 @@ private: com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; public: - TYPEINFO_OVERRIDE(); SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -514,7 +497,6 @@ private: com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; public: - TYPEINFO_OVERRIDE(); SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -546,7 +528,6 @@ private: OUString maHref; public: - TYPEINFO_OVERRIDE(); SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -577,7 +558,6 @@ protected: virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const override; public: - TYPEINFO_OVERRIDE(); SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -607,7 +587,6 @@ protected: public: - TYPEINFO_OVERRIDE(); SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, @@ -630,7 +609,6 @@ public: class SdXMLTableShapeContext : public SdXMLShapeContext { public: - TYPEINFO_OVERRIDE(); SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, diff --git a/xmloff/source/draw/ximpshow.cxx b/xmloff/source/draw/ximpshow.cxx index 2ecde45c2f2c..4175ff79248b 100644 --- a/xmloff/source/draw/ximpshow.cxx +++ b/xmloff/source/draw/ximpshow.cxx @@ -61,7 +61,6 @@ public: {} }; -TYPEINIT1( SdXMLShowsContext, SvXMLImportContext ); SdXMLShowsContext::SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList ) : SvXMLImportContext(rImport, nPrfx, rLocalName) diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx index dd73785d51f6..0eb6c9a52af8 100644 --- a/xmloff/source/draw/ximpshow.hxx +++ b/xmloff/source/draw/ximpshow.hxx @@ -32,7 +32,6 @@ class SdXMLShowsContext : public SvXMLImportContext ShowsImpImpl* mpImpl; public: - TYPEINFO_OVERRIDE(); SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index dc2de24d8d8b..a45d36af00e1 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -55,7 +55,6 @@ class SdXMLDrawingPagePropertySetContext : public SvXMLPropertySetContext { public: - TYPEINFO_OVERRIDE(); SdXMLDrawingPagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -74,7 +73,6 @@ public: const XMLPropertyState& rProp) override; }; -TYPEINIT1( SdXMLDrawingPagePropertySetContext, SvXMLPropertySetContext ); SdXMLDrawingPagePropertySetContext::SdXMLDrawingPagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -132,7 +130,6 @@ SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext( class SdXMLDrawingPageStyleContext : public XMLPropStyleContext { public: - TYPEINFO_OVERRIDE(); SdXMLDrawingPageStyleContext( SvXMLImport& rImport, @@ -156,7 +153,6 @@ public: ::com::sun::star::beans::XPropertySet > & rPropSet ) override; }; -TYPEINIT1( SdXMLDrawingPageStyleContext, XMLPropStyleContext ); SdXMLDrawingPageStyleContext::SdXMLDrawingPageStyleContext( SvXMLImport& rImport, @@ -299,7 +295,6 @@ void SdXMLDrawingPageStyleContext::FillPropertySet( } } -TYPEINIT1( SdXMLPageMasterStyleContext, SvXMLStyleContext ); SdXMLPageMasterStyleContext::SdXMLPageMasterStyleContext( SdXMLImport& rImport, @@ -381,7 +376,6 @@ SdXMLPageMasterStyleContext::~SdXMLPageMasterStyleContext() { } -TYPEINIT1( SdXMLPageMasterContext, SvXMLStyleContext ); SdXMLPageMasterContext::SdXMLPageMasterContext( SdXMLImport& rImport, @@ -448,7 +442,6 @@ SvXMLImportContext *SdXMLPageMasterContext::CreateChildContext( return pContext; } -TYPEINIT1( SdXMLPresentationPageLayoutContext, SvXMLStyleContext ); SdXMLPresentationPageLayoutContext::SdXMLPresentationPageLayoutContext( SdXMLImport& rImport, @@ -775,7 +768,6 @@ SdXMLPresentationPlaceholderContext::~SdXMLPresentationPlaceholderContext() { } -TYPEINIT1( SdXMLMasterPageContext, SdXMLGenericPageContext ); SdXMLMasterPageContext::SdXMLMasterPageContext( SdXMLImport& rImport, @@ -944,7 +936,6 @@ SvXMLImportContext* SdXMLMasterPageContext::CreateChildContext( return pContext; } -TYPEINIT1( SdXMLStylesContext, SvXMLStyleContext ); SdXMLStylesContext::SdXMLStylesContext( SdXMLImport& rImport, @@ -1469,7 +1460,6 @@ uno::Reference< container::XNameAccess > SdXMLStylesContext::getPageLayouts() co } -TYPEINIT1( SdXMLMasterStylesContext, SvXMLImportContext ); SdXMLMasterStylesContext::SdXMLMasterStylesContext( SdXMLImport& rImport, diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index b342b76c57a4..dc19de9db795 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -46,7 +46,6 @@ class SdXMLPageMasterStyleContext: public SvXMLStyleContext SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); } public: - TYPEINFO_OVERRIDE(); SdXMLPageMasterStyleContext( SdXMLImport& rImport, @@ -75,7 +74,6 @@ class SdXMLPageMasterContext: public SvXMLStyleContext SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); } public: - TYPEINFO_OVERRIDE(); SdXMLPageMasterContext( SdXMLImport& rImport, @@ -101,7 +99,6 @@ class SdXMLMasterPageContext: public SdXMLGenericPageContext OUString msStyleName; public: - TYPEINFO_OVERRIDE(); SdXMLMasterPageContext( SdXMLImport& rImport, @@ -159,7 +156,6 @@ class SdXMLPresentationPageLayoutContext: public SvXMLStyleContext SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); } public: - TYPEINFO_OVERRIDE(); SdXMLPresentationPageLayoutContext( SdXMLImport& rImport, @@ -211,7 +207,6 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) override; public: - TYPEINFO_OVERRIDE(); SdXMLStylesContext( SdXMLImport& rImport, @@ -240,7 +235,6 @@ class SdXMLMasterStylesContext : public SvXMLImportContext SdXMLImport& GetSdImport() { return static_cast<SdXMLImport&>(GetImport()); } public: - TYPEINFO_OVERRIDE(); SdXMLMasterStylesContext( SdXMLImport& rImport, |