diff options
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r-- | xmloff/source/draw/XMLImageMapContext.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/draw/XMLNumberStyles.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/animimp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/descriptionimp.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/eventimp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/eventimp.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/layerimp.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/sdxmlimp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximp3dobject.hxx | 12 | ||||
-rw-r--r-- | xmloff/source/draw/ximp3dscene.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpcustomshape.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpgrp.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximplink.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximppage.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpshap.hxx | 42 | ||||
-rw-r--r-- | xmloff/source/draw/ximpshow.hxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/ximpstyl.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/draw/ximpstyl.hxx | 12 |
18 files changed, 54 insertions, 54 deletions
diff --git a/xmloff/source/draw/XMLImageMapContext.cxx b/xmloff/source/draw/XMLImageMapContext.cxx index ea6f80aa6eab..1d71c2de9ffe 100644 --- a/xmloff/source/draw/XMLImageMapContext.cxx +++ b/xmloff/source/draw/XMLImageMapContext.cxx @@ -125,7 +125,7 @@ protected: sal_Bool bValid; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImageMapObjectContext( SvXMLImport& rImport, @@ -319,7 +319,7 @@ class XMLImageMapRectangleContext : public XMLImageMapObjectContext sal_Bool bHeightOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImageMapRectangleContext( SvXMLImport& rImport, @@ -429,7 +429,7 @@ class XMLImageMapPolygonContext : public XMLImageMapObjectContext sal_Bool bPointsOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImageMapPolygonContext( SvXMLImport& rImport, @@ -527,7 +527,7 @@ class XMLImageMapCircleContext : public XMLImageMapObjectContext sal_Bool bRadiusOK; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLImageMapCircleContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/XMLNumberStyles.cxx b/xmloff/source/draw/XMLNumberStyles.cxx index 7553458b9fb6..8022ebef8d4e 100644 --- a/xmloff/source/draw/XMLNumberStyles.cxx +++ b/xmloff/source/draw/XMLNumberStyles.cxx @@ -489,7 +489,7 @@ private: boost::shared_ptr< SvXMLImportContext > mpSlaveContext; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLNumberFormatMemberImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index 925e437fd823..61ceec7af45e 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -379,7 +379,7 @@ public: OUString maPathShapeId; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLAnimationsEffectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -399,7 +399,7 @@ class XMLAnimationsSoundContext : public SvXMLImportContext XMLAnimationsEffectContext* mpParent; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLAnimationsSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, XMLAnimationsEffectContext* pParent ); virtual ~XMLAnimationsSoundContext(); diff --git a/xmloff/source/draw/descriptionimp.hxx b/xmloff/source/draw/descriptionimp.hxx index 15e1b56cb557..c3403db8ca13 100644 --- a/xmloff/source/draw/descriptionimp.hxx +++ b/xmloff/source/draw/descriptionimp.hxx @@ -31,7 +31,7 @@ private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; OUString msText; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLDescriptionContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index f7158ff9c5c8..46cbb387d51e 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -75,7 +75,7 @@ private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLEventContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList>& xAttrList, const Reference< XShape >& rxShape ); virtual ~SdXMLEventContext(); @@ -103,7 +103,7 @@ class XMLEventSoundContext : public SvXMLImportContext SdXMLEventContext* mpParent; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); XMLEventSoundContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const Reference< XAttributeList >& xAttrList, SdXMLEventContext* pParent ); virtual ~XMLEventSoundContext(); diff --git a/xmloff/source/draw/eventimp.hxx b/xmloff/source/draw/eventimp.hxx index 55b45c7949e1..509fde887da1 100644 --- a/xmloff/source/draw/eventimp.hxx +++ b/xmloff/source/draw/eventimp.hxx @@ -31,7 +31,7 @@ private: com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLEventsContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/layerimp.hxx b/xmloff/source/draw/layerimp.hxx index ac40d09de3a8..4cee65efaafb 100644 --- a/xmloff/source/draw/layerimp.hxx +++ b/xmloff/source/draw/layerimp.hxx @@ -31,7 +31,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > mxLayerManager; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLLayerSetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 7ced7b0d1d0e..cb52bdc5741c 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -103,7 +103,7 @@ public: const uno::Reference<xml::sax::XAttributeList>& xAttrList); virtual ~SdXMLDocContext_Impl(); - TYPEINFO(); + TYPEINFO_OVERRIDE(); virtual SvXMLImportContext *CreateChildContext(sal_uInt16 nPrefix, const OUString& rLocalName, diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx index 3ebd8d706626..6a07181227af 100644 --- a/xmloff/source/draw/ximp3dobject.hxx +++ b/xmloff/source/draw/ximp3dobject.hxx @@ -41,7 +41,7 @@ protected: sal_Bool mbSetTransform; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DObjectContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -65,7 +65,7 @@ class SdXML3DCubeObjectShapeContext : public SdXML3DObjectContext sal_Bool mbMaxEdgeUsed; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DCubeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -88,7 +88,7 @@ class SdXML3DSphereObjectShapeContext : public SdXML3DObjectContext sal_Bool mbSizeUsed; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DSphereObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -109,7 +109,7 @@ class SdXML3DPolygonBasedShapeContext : public SdXML3DObjectContext OUString maViewBox; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DPolygonBasedShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -127,7 +127,7 @@ public: class SdXML3DLatheObjectShapeContext : public SdXML3DPolygonBasedShapeContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DLatheObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -145,7 +145,7 @@ public: class SdXML3DExtrudeObjectShapeContext : public SdXML3DPolygonBasedShapeContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DExtrudeObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index 3ac8354157fe..35b7ea5a0c3c 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -43,7 +43,7 @@ protected: { mxChildren = rNew; } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXML3DSceneShapeContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx index 26b6c143053c..822f25dad06e 100644 --- a/xmloff/source/draw/ximpcustomshape.hxx +++ b/xmloff/source/draw/ximpcustomshape.hxx @@ -51,7 +51,7 @@ class XMLEnhancedCustomShapeContext : public SvXMLImportContext public: - TYPEINFO(); + 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.hxx b/xmloff/source/draw/ximpgrp.hxx index 2df42a2b072c..2df524613ab5 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -39,7 +39,7 @@ protected: { mxShapes = rNew; } public: - TYPEINFO(); + 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.hxx b/xmloff/source/draw/ximplink.hxx index 015ae148db19..e51e71259eea 100644 --- a/xmloff/source/draw/ximplink.hxx +++ b/xmloff/source/draw/ximplink.hxx @@ -39,7 +39,7 @@ class SdXMLShapeLinkContext : public SvXMLShapeContext OUString msHyperlink; public: - TYPEINFO(); + 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.hxx b/xmloff/source/draw/ximppage.hxx index c93768d878bb..e850c4945aab 100644 --- a/xmloff/source/draw/ximppage.hxx +++ b/xmloff/source/draw/ximppage.hxx @@ -64,7 +64,7 @@ protected: void SetNavigationOrder(); public: - TYPEINFO(); + 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.hxx b/xmloff/source/draw/ximpshap.hxx index 6ddb83b12b79..2f267ac661e1 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -99,7 +99,7 @@ protected: sal_Bool isPresentationShape() const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -130,7 +130,7 @@ class SdXMLRectShapeContext : public SdXMLShapeContext sal_Int32 mnRadius; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLRectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -154,7 +154,7 @@ class SdXMLLineShapeContext : public SdXMLShapeContext sal_Int32 mnY2; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLLineShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -181,7 +181,7 @@ class SdXMLEllipseShapeContext : public SdXMLShapeContext sal_Int32 mnStartAngle; sal_Int32 mnEndAngle; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLEllipseShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -204,7 +204,7 @@ class SdXMLPolygonShapeContext : public SdXMLShapeContext sal_Bool mbClosed; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPolygonShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -225,7 +225,7 @@ class SdXMLPathShapeContext : public SdXMLShapeContext OUString maViewBox; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPathShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -246,7 +246,7 @@ class SdXMLTextBoxShapeContext : public SdXMLShapeContext sal_Int32 mnRadius; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLTextBoxShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -268,7 +268,7 @@ private: OUString maFormId; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLControlShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -304,7 +304,7 @@ private: com::sun::star::uno::Any maPath; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLConnectorShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -327,7 +327,7 @@ private: ::com::sun::star::awt::Point maEnd; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLMeasureShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -349,7 +349,7 @@ class SdXMLPageShapeContext : public SdXMLShapeContext private: sal_Int32 mnPageNumber; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPageShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -372,7 +372,7 @@ private: sal_Int32 mnRadius; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLCaptionShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -395,7 +395,7 @@ private: ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLGraphicObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -420,7 +420,7 @@ class SdXMLChartShapeContext : public SdXMLShapeContext SvXMLImportContext* mpChartContext; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLChartShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -448,7 +448,7 @@ private: ::com::sun::star::uno::Reference < ::com::sun::star::io::XOutputStream > mxBase64Stream; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLObjectShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -481,7 +481,7 @@ private: com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLAppletShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -512,7 +512,7 @@ private: com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maParams; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPluginShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -540,7 +540,7 @@ private: OUString maHref; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLFloatingFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -571,7 +571,7 @@ protected: virtual void removeGraphicFromImportContext(const SvXMLImportContext& rContext) const; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLFrameShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, @@ -601,7 +601,7 @@ protected : public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLCustomShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, const com::sun::star::uno::Reference< com::sun::star::xml::sax::XAttributeList>& xAttrList, @@ -624,7 +624,7 @@ public: class SdXMLTableShapeContext : public SdXMLShapeContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLTableShapeContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName, diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx index ffff1c9dc87c..a795b2ea5509 100644 --- a/xmloff/source/draw/ximpshow.hxx +++ b/xmloff/source/draw/ximpshow.hxx @@ -32,7 +32,7 @@ class SdXMLShowsContext : public SvXMLImportContext ShowsImpImpl* mpImpl; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLShowsContext( SdXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 34447403db3f..102664c3aa4b 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -54,7 +54,7 @@ class SdXMLDrawingPagePropertySetContext : public SvXMLPropertySetContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLDrawingPagePropertySetContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, @@ -131,7 +131,7 @@ SvXMLImportContext *SdXMLDrawingPagePropertySetContext::CreateChildContext( class SdXMLDrawingPageStyleContext : public XMLPropStyleContext { public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLDrawingPageStyleContext( SvXMLImport& rImport, diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index a338be79bbb5..cc01c1cab9ea 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -46,7 +46,7 @@ class SdXMLPageMasterStyleContext: public SvXMLStyleContext SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPageMasterStyleContext( SdXMLImport& rImport, @@ -75,7 +75,7 @@ class SdXMLPageMasterContext: public SvXMLStyleContext SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPageMasterContext( SdXMLImport& rImport, @@ -102,7 +102,7 @@ class SdXMLMasterPageContext: public SdXMLGenericPageContext OUString msStyleName; public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLMasterPageContext( SdXMLImport& rImport, @@ -166,7 +166,7 @@ class SdXMLPresentationPageLayoutContext: public SvXMLStyleContext SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLPresentationPageLayoutContext( SdXMLImport& rImport, @@ -218,7 +218,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLStylesContext( SdXMLImport& rImport, @@ -247,7 +247,7 @@ class SdXMLMasterStylesContext : public SvXMLImportContext SdXMLImport& GetSdImport() { return (SdXMLImport&)GetImport(); } public: - TYPEINFO(); + TYPEINFO_OVERRIDE(); SdXMLMasterStylesContext( SdXMLImport& rImport, |