summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-26 11:54:10 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-26 11:54:55 +0100
commit5fb78604c1c3e91beb867c352928af9e1ef57a26 (patch)
tree7d6a0f7c1bfe2f2803f5f2ffb5741dd3c05c5818 /include/svx
parentbc5060b32f08b0408fb929faea1f8140a58d3cc5 (diff)
Split TYPEINFO into plain and TYPEINFO_OVERRIDE
...where the latter contains SAL_OVERRIDE annotations Change-Id: Id64794b388d83dfe7026440e8b20a5b5efd412d1
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/AffineMatrixItem.hxx2
-rw-r--r--include/svx/SmartTagItem.hxx2
-rw-r--r--include/svx/algitem.hxx4
-rw-r--r--include/svx/chrtitem.hxx16
-rw-r--r--include/svx/clipfmtitem.hxx2
-rw-r--r--include/svx/cube3d.hxx2
-rw-r--r--include/svx/drawitem.hxx12
-rw-r--r--include/svx/e3ditem.hxx2
-rw-r--r--include/svx/e3dundo.hxx6
-rw-r--r--include/svx/extrud3d.hxx2
-rw-r--r--include/svx/extrusionbar.hxx2
-rw-r--r--include/svx/fmmodel.hxx2
-rw-r--r--include/svx/fmpage.hxx2
-rw-r--r--include/svx/fmshell.hxx4
-rw-r--r--include/svx/fmview.hxx2
-rw-r--r--include/svx/fontworkbar.hxx2
-rw-r--r--include/svx/galleryitem.hxx2
-rw-r--r--include/svx/grafctrl.hxx2
-rw-r--r--include/svx/hlnkitem.hxx2
-rw-r--r--include/svx/lathe3d.hxx2
-rw-r--r--include/svx/numinf.hxx2
-rw-r--r--include/svx/obj3d.hxx6
-rw-r--r--include/svx/pageitem.hxx2
-rw-r--r--include/svx/polygn3d.hxx2
-rw-r--r--include/svx/polysc3d.hxx2
-rw-r--r--include/svx/postattr.hxx6
-rw-r--r--include/svx/rotmodit.hxx2
-rw-r--r--include/svx/rulritem.hxx10
-rw-r--r--include/svx/scene3d.hxx2
-rw-r--r--include/svx/sdangitm.hxx2
-rw-r--r--include/svx/sdasaitm.hxx2
-rw-r--r--include/svx/sdasitm.hxx2
-rw-r--r--include/svx/sdgcoitm.hxx6
-rw-r--r--include/svx/sdgcpitm.hxx2
-rw-r--r--include/svx/sdggaitm.hxx2
-rw-r--r--include/svx/sdginitm.hxx2
-rw-r--r--include/svx/sdgluitm.hxx4
-rw-r--r--include/svx/sdgmoitm.hxx2
-rw-r--r--include/svx/sdgtritm.hxx2
-rw-r--r--include/svx/sdmetitm.hxx2
-rw-r--r--include/svx/sdooitm.hxx2
-rw-r--r--include/svx/sdprcitm.hxx4
-rw-r--r--include/svx/sdtaaitm.hxx2
-rw-r--r--include/svx/sdtaditm.hxx2
-rw-r--r--include/svx/sdtaitm.hxx4
-rw-r--r--include/svx/sdtakitm.hxx2
-rw-r--r--include/svx/sdtayitm.hxx2
-rw-r--r--include/svx/sdtfchim.hxx2
-rw-r--r--include/svx/sdtfsitm.hxx2
-rw-r--r--include/svx/sdynitm.hxx2
-rw-r--r--include/svx/sphere3d.hxx2
-rw-r--r--include/svx/svddrgmt.hxx6
-rw-r--r--include/svx/svdmodel.hxx4
-rw-r--r--include/svx/svdoashp.hxx2
-rw-r--r--include/svx/svdoattr.hxx2
-rw-r--r--include/svx/svdobj.hxx2
-rw-r--r--include/svx/svdocapt.hxx2
-rw-r--r--include/svx/svdocirc.hxx2
-rw-r--r--include/svx/svdoedge.hxx2
-rw-r--r--include/svx/svdograf.hxx2
-rw-r--r--include/svx/svdogrp.hxx2
-rw-r--r--include/svx/svdomeas.hxx2
-rw-r--r--include/svx/svdomedia.hxx2
-rw-r--r--include/svx/svdoole2.hxx2
-rw-r--r--include/svx/svdopage.hxx2
-rw-r--r--include/svx/svdopath.hxx2
-rw-r--r--include/svx/svdorect.hxx2
-rw-r--r--include/svx/svdotable.hxx2
-rw-r--r--include/svx/svdotext.hxx4
-rw-r--r--include/svx/svdouno.hxx2
-rw-r--r--include/svx/svdovirt.hxx2
-rw-r--r--include/svx/svdpage.hxx2
-rw-r--r--include/svx/svdpntv.hxx4
-rw-r--r--include/svx/svdundo.hxx2
-rw-r--r--include/svx/svdview.hxx2
-rw-r--r--include/svx/svxgrahicitem.hxx2
-rw-r--r--include/svx/sxcecitm.hxx2
-rw-r--r--include/svx/sxcikitm.hxx2
-rw-r--r--include/svx/sxctitm.hxx2
-rw-r--r--include/svx/sxekitm.hxx2
-rw-r--r--include/svx/sxmkitm.hxx2
-rw-r--r--include/svx/sxmtpitm.hxx4
-rw-r--r--include/svx/sxmuitm.hxx2
-rw-r--r--include/svx/sxsiitm.hxx2
-rw-r--r--include/svx/view3d.hxx2
-rw-r--r--include/svx/viewlayoutitem.hxx2
-rw-r--r--include/svx/xbtmpit.hxx2
-rw-r--r--include/svx/xcolit.hxx2
-rw-r--r--include/svx/xfillit0.hxx2
-rw-r--r--include/svx/xflasit.hxx2
-rw-r--r--include/svx/xflbckit.hxx2
-rw-r--r--include/svx/xflbmpit.hxx2
-rw-r--r--include/svx/xflbmsli.hxx2
-rw-r--r--include/svx/xflbmsxy.hxx4
-rw-r--r--include/svx/xflbmtit.hxx2
-rw-r--r--include/svx/xflboxy.hxx4
-rw-r--r--include/svx/xflbstit.hxx2
-rw-r--r--include/svx/xflbtoxy.hxx4
-rw-r--r--include/svx/xflclit.hxx2
-rw-r--r--include/svx/xflftrit.hxx2
-rw-r--r--include/svx/xflgrit.hxx2
-rw-r--r--include/svx/xflhtit.hxx2
-rw-r--r--include/svx/xfltrit.hxx2
-rw-r--r--include/svx/xftadit.hxx2
-rw-r--r--include/svx/xftdiit.hxx2
-rw-r--r--include/svx/xftmrit.hxx2
-rw-r--r--include/svx/xftouit.hxx2
-rw-r--r--include/svx/xftshcit.hxx2
-rw-r--r--include/svx/xftshit.hxx2
-rw-r--r--include/svx/xftshtit.hxx2
-rw-r--r--include/svx/xftshxy.hxx4
-rw-r--r--include/svx/xftstit.hxx2
-rw-r--r--include/svx/xgrscit.hxx2
-rw-r--r--include/svx/xit.hxx2
-rw-r--r--include/svx/xlineit0.hxx2
-rw-r--r--include/svx/xlinjoit.hxx2
-rw-r--r--include/svx/xlnasit.hxx2
-rw-r--r--include/svx/xlncapit.hxx2
-rw-r--r--include/svx/xlnclit.hxx2
-rw-r--r--include/svx/xlndsit.hxx2
-rw-r--r--include/svx/xlnedcit.hxx2
-rw-r--r--include/svx/xlnedit.hxx2
-rw-r--r--include/svx/xlnedwit.hxx2
-rw-r--r--include/svx/xlnstcit.hxx2
-rw-r--r--include/svx/xlnstit.hxx2
-rw-r--r--include/svx/xlnstwit.hxx2
-rw-r--r--include/svx/xlntrit.hxx2
-rw-r--r--include/svx/xlnwtit.hxx2
-rw-r--r--include/svx/xsflclit.hxx2
-rw-r--r--include/svx/xtextit0.hxx4
-rw-r--r--include/svx/zoomslideritem.hxx2
131 files changed, 171 insertions, 171 deletions
diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx
index 2f1746281b61..a6ce3dd2cc48 100644
--- a/include/svx/AffineMatrixItem.hxx
+++ b/include/svx/AffineMatrixItem.hxx
@@ -33,7 +33,7 @@ private:
com::sun::star::geometry::AffineMatrix2D maMatrix;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
AffineMatrixItem(const com::sun::star::geometry::AffineMatrix2D* pMatrix = 0);
AffineMatrixItem(SvStream& rIn);
AffineMatrixItem(const AffineMatrixItem&);
diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx
index 6ba81ac464b6..e5f8ea066003 100644
--- a/include/svx/SmartTagItem.hxx
+++ b/include/svx/SmartTagItem.hxx
@@ -51,7 +51,7 @@ class SVX_DLLPUBLIC SvxSmartTagItem : public SfxPoolItem
const OUString maRangeText;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxSmartTagItem( const sal_uInt16 nId,
const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence,
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index 67daf974b475..b2aab411008c 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -32,7 +32,7 @@ class SvStream;
class SVX_DLLPUBLIC SvxOrientationItem: public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxOrientationItem(
const SvxCellOrientation eOrientation /*= SVX_ORIENTATION_STANDARD*/,
@@ -78,7 +78,7 @@ class SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem
sal_Int16 nRightMargin;
sal_Int16 nBottomMargin;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxMarginItem( const sal_uInt16 nId );
SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop /*= 0*/,
sal_Int16 nRight /*= 0*/, sal_Int16 nBottom /*= 0*/,
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index f1d193d5dc3d..2f15a0436756 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -167,7 +167,7 @@ enum SvxChartRegress
class SVX_DLLPUBLIC SvxChartStyleItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxChartStyleItem(SvxChartStyle eStyle /*= CHSTYLE_2D_LINE*/,
sal_uInt16 nId );
SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId );
@@ -185,7 +185,7 @@ public:
class SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxChartRegressItem(SvxChartRegress eRegress /*= CHREGRESS_LINEAR*/,
sal_uInt16 nId );
SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId );
@@ -204,7 +204,7 @@ public:
class SVX_DLLPUBLIC SvxChartDataDescrItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxChartDataDescrItem(SvStream& rIn,
sal_uInt16 nId );
@@ -221,7 +221,7 @@ public:
class SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= CHTXTORDER_SIDEBYSIDE*/,
sal_uInt16 nId );
SvxChartTextOrderItem(SvStream& rIn,
@@ -243,7 +243,7 @@ public:
class SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxChartTextOrientItem(SvStream& rIn,
sal_uInt16 nId );
@@ -260,7 +260,7 @@ public:
class SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxChartKindErrorItem(SvxChartKindError /*eOrient = CHERROR_NONE*/,
sal_uInt16 nId );
SvxChartKindErrorItem(SvStream& rIn,
@@ -281,7 +281,7 @@ public:
class SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxChartIndicateItem(SvxChartIndicate eOrient /*= CHINDICATE_NONE*/,
sal_uInt16 nId );
SvxChartIndicateItem(SvStream& rIn,
@@ -304,7 +304,7 @@ class SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem
double fVal;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxDoubleItem(double fValue /*= 0.0*/, sal_uInt16 nId );
SvxDoubleItem(const SvxDoubleItem& rItem);
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index 3407b5e83290..5e0cd6a9689d 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -34,7 +34,7 @@ protected:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxClipboardFmtItem( sal_uInt16 nId = 0 );
SvxClipboardFmtItem( const SvxClipboardFmtItem& );
virtual ~SvxClipboardFmtItem();
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 53507026f72b..9f07b6325bc2 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -57,7 +57,7 @@ protected:
virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact();
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize);
E3dCubeObj();
diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx
index 1de3e4609446..2601174fb418 100644
--- a/include/svx/drawitem.hxx
+++ b/include/svx/drawitem.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC SvxColorListItem: public SfxPoolItem
XColorListRef pColorList;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxColorListItem();
SvxColorListItem( XColorListRef pTable,
sal_uInt16 nWhich );
@@ -64,7 +64,7 @@ class SVX_DLLPUBLIC SvxGradientListItem: public SfxPoolItem
XGradientListRef pGradientList;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxGradientListItem();
SvxGradientListItem( XGradientListRef pList,
sal_uInt16 nWhich );
@@ -94,7 +94,7 @@ class SVX_DLLPUBLIC SvxHatchListItem: public SfxPoolItem
XHatchListRef pHatchList;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxHatchListItem();
SvxHatchListItem( XHatchListRef pList,
sal_uInt16 nWhich );
@@ -125,7 +125,7 @@ class SVX_DLLPUBLIC SvxBitmapListItem: public SfxPoolItem
XBitmapListRef pBitmapList;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxBitmapListItem();
SvxBitmapListItem( XBitmapListRef pBL,
sal_uInt16 nWhich );
@@ -156,7 +156,7 @@ class SVX_DLLPUBLIC SvxDashListItem: public SfxPoolItem
XDashListRef pDashList;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxDashListItem();
SvxDashListItem( XDashListRef pList,
sal_uInt16 nWhich );
@@ -184,7 +184,7 @@ class SVX_DLLPUBLIC SvxLineEndListItem: public SfxPoolItem
XLineEndListRef pLineEndList;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxLineEndListItem();
SvxLineEndListItem( XLineEndListRef pList,
sal_uInt16 nWhich );
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index fae604d3ef36..ee258515cda7 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem
basegfx::B3DVector aVal;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxB3DVectorItem();
SvxB3DVectorItem( sal_uInt16 nWhich, const basegfx::B3DVector& rVal );
SvxB3DVectorItem( const SvxB3DVectorItem& );
diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index 27e50dd49d3f..96ebbd0cb9ee 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -36,7 +36,7 @@ class E3dUndoAction : public SdrUndoAction
E3dObject *pMy3DObj;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dUndoAction (SdrModel *pModel,
E3dObject *p3DObj) :
SdrUndoAction (*pModel),
@@ -60,7 +60,7 @@ class E3dRotateUndoAction : public E3dUndoAction
basegfx::B3DHomMatrix aMyNewRotation;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dRotateUndoAction (SdrModel *pModel,
E3dObject *p3DObj,
const basegfx::B3DHomMatrix &aOldRotation,
@@ -93,7 +93,7 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
const SfxItemSet aOldSet;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dAttributesUndoAction( SdrModel &rModel,
E3dObject* pInObject,
const SfxItemSet& rNewSet,
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index 5bea27dce930..10aa7d50d263 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -44,7 +44,7 @@ protected:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dExtrudeObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPP, double fDepth);
E3dExtrudeObj();
diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx
index 2f31c4ec4362..47800a22c16c 100644
--- a/include/svx/extrusionbar.hxx
+++ b/include/svx/extrusionbar.hxx
@@ -38,7 +38,7 @@ SVX_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyEx
class SVX_DLLPUBLIC ExtrusionBar : public SfxShell
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SVX_INTERFACE_EXTRUSION_BAR)
ExtrusionBar(SfxViewShell* pViewShell );
diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index a441ff2d726f..b74fdcb11ba4 100644
--- a/include/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
@@ -46,7 +46,7 @@ private:
SVX_DLLPRIVATE void operator=(const FmFormModel& rSrcModel); // never implemented
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
FmFormModel(SfxItemPool* pPool=NULL, SfxObjectShell* pPers=NULL );
FmFormModel(const OUString& rPath, SfxItemPool* pPool=NULL,
diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx
index 2d36c1576c09..1ba4bf0d4ce4 100644
--- a/include/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
@@ -45,7 +45,7 @@ class SVX_DLLPUBLIC FmFormPage : public SdrPage
OUString m_sPageName;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
FmFormPage(FmFormModel& rModel, bool bMasterPage=false);
FmFormPage(const FmFormPage& rPage);
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index ababcc43444c..92306858b64f 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -60,7 +60,7 @@ class SVX_DLLPUBLIC FmDesignModeChangedHint : public SfxHint
bool m_bDesignMode;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
FmDesignModeChangedHint( bool bDesMode );
virtual ~FmDesignModeChangedHint();
@@ -101,7 +101,7 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell
public:
SFX_DECL_INTERFACE(SVX_INTERFACE_FORM_SH)
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
FmFormShell(SfxViewShell* pParent, FmFormView* pView = NULL);
virtual ~FmFormShell();
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index 02103ca1bf1c..884b88211bd7 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -61,7 +61,7 @@ class SVX_DLLPUBLIC FmFormView : public E3dView
void Init();
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
FmFormView(FmFormModel* pModel, OutputDevice* pOut = 0L);
virtual ~FmFormView();
diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx
index ec5f0f3c2081..9efd7dc76dab 100644
--- a/include/svx/fontworkbar.hxx
+++ b/include/svx/fontworkbar.hxx
@@ -38,7 +38,7 @@ bool SVX_DLLPUBLIC checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nChe
class SVX_DLLPUBLIC FontworkBar : public SfxShell
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SVX_INTERFACE_FONTWORK_BAR)
FontworkBar(SfxViewShell* pViewShell );
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index 9509c8759aee..e6a586f0163f 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -47,7 +47,7 @@ class SVX_DLLPUBLIC SvxGalleryItem : public SfxPoolItem
com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > m_xGraphic;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxGalleryItem();
SvxGalleryItem( const SvxGalleryItem& );
diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx
index fa86b2787141..deea8b6d9c93 100644
--- a/include/svx/grafctrl.hxx
+++ b/include/svx/grafctrl.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index 11e6c4a032bb..e5c55f1029f0 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -50,7 +50,7 @@ class SVX_DLLPUBLIC SvxHyperlinkItem : public SfxPoolItem
sal_uInt16 nMacroEvents;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxHyperlinkItem( sal_uInt16 _nWhich = SID_HYPERLINK_GETLINK ):
SfxPoolItem(_nWhich), pMacroTable(NULL) { eType = HLINK_DEFAULT; nMacroEvents=0; };
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index 1c3dbbddeb2a..9aad4789ad87 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -46,7 +46,7 @@ private:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon rPoly2D);
E3dLatheObj();
diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx
index 8154f0063ed1..820f466d1988 100644
--- a/include/svx/numinf.hxx
+++ b/include/svx/numinf.hxx
@@ -34,7 +34,7 @@ This item is used as a transport medium for a number formatter
class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxNumberInfoItem( const sal_uInt16 nId );
SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 1a59ea45fad4..049f632dce4c 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -79,7 +79,7 @@ public:
class E3dObjList : public SdrObjList
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dObjList(SdrModel* pNewModel = 0, SdrPage* pNewPage = 0, E3dObjList* pNewUpList = 0);
SVX_DLLPUBLIC E3dObjList(const E3dObjList& rSrcList);
SVX_DLLPUBLIC virtual ~E3dObjList();
@@ -136,7 +136,7 @@ protected:
E3dObject(bool bIsFromChart);
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
virtual void RecalcSnapRect();
virtual void SetRectsDirty(bool bNotMyself = false);
@@ -239,7 +239,7 @@ protected:
basegfx::B2DPolyPolygon TransformToScreenCoor(const basegfx::B3DPolyPolygon& rCandidate);
public :
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dCompoundObject();
E3dCompoundObject(E3dDefaultAttributes& rDefault);
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index ac479ae65dc1..adbbbbd8005f 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -68,7 +68,7 @@ private:
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxPageItem( const sal_uInt16 nId );
SvxPageItem( const SvxPageItem& rItem );
diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx
index 7769a1703a08..06a174067625 100644
--- a/include/svx/polygn3d.hxx
+++ b/include/svx/polygn3d.hxx
@@ -43,7 +43,7 @@ public:
void SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D);
void SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyPoly2D);
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dPolygonObj(
E3dDefaultAttributes& rDefault,
diff --git a/include/svx/polysc3d.hxx b/include/svx/polysc3d.hxx
index cb661ff1ecd2..c7f76371fae0 100644
--- a/include/svx/polysc3d.hxx
+++ b/include/svx/polysc3d.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC E3dPolyScene : public E3dScene
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dPolyScene();
E3dPolyScene(E3dDefaultAttributes& rDefault);
diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx
index 1bf651be5a8e..ac4c8c1e5eb5 100644
--- a/include/svx/postattr.hxx
+++ b/include/svx/postattr.hxx
@@ -33,7 +33,7 @@ The author shorthand symbol of a note
class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxPostItAuthorItem( sal_uInt16 nWhich );
@@ -64,7 +64,7 @@ The date of a note
class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxPostItDateItem( sal_uInt16 nWhich );
@@ -95,7 +95,7 @@ The text of a note
class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxPostItTextItem( sal_uInt16 nWhich );
diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx
index f81adb3e918d..276542747c8c 100644
--- a/include/svx/rotmodit.hxx
+++ b/include/svx/rotmodit.hxx
@@ -37,7 +37,7 @@ enum SvxRotateMode
class SVX_DLLPUBLIC SvxRotateModeItem: public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, sal_uInt16 nWhich=0);
SvxRotateModeItem( const SvxRotateModeItem& rItem );
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 0891c1003160..6e5d0b5fd022 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -47,7 +47,7 @@ private:
SVX_DLLPRIVATE const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &); // n.i.
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxLongLRSpaceItem(long lLeft, long lRight, sal_uInt16 nId);
SvxLongLRSpaceItem(const SvxLongLRSpaceItem &);
SvxLongLRSpaceItem();
@@ -81,7 +81,7 @@ private:
SVX_DLLPRIVATE const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &); // n.i.
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxLongULSpaceItem(long lUpper, long lLower, sal_uInt16 nId);
SvxLongULSpaceItem(const SvxLongULSpaceItem &);
SvxLongULSpaceItem();
@@ -113,7 +113,7 @@ protected:
private:
SVX_DLLPRIVATE const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &); // n.i.
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxPagePosSizeItem(const Point &rPos, long lWidth, long lHeight);
SvxPagePosSizeItem(const SvxPagePosSizeItem &);
SvxPagePosSizeItem();
@@ -174,7 +174,7 @@ protected:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
// right edge of the surrounding frame
// nLeft, nRight each the distance to the surrounding frame
SvxColumnItem(sal_uInt16 nAct = 0);
@@ -233,7 +233,7 @@ private:
SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i.
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxObjectItem(long nStartX, long nEndX,
long nStartY, long nEndY,
bool bLimits = false);
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index c81839f93172..23856f27cba7 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -88,7 +88,7 @@ protected:
void ImpCleanup3DDepthMapper();
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dScene();
E3dScene(E3dDefaultAttributes& rDefault);
virtual ~E3dScene();
diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx
index f6c354da6786..c3eb49a0baa4 100644
--- a/include/svx/sdangitm.hxx
+++ b/include/svx/sdangitm.hxx
@@ -28,7 +28,7 @@
class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrAngleItem(): SfxInt32Item() {}
SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle=0): SfxInt32Item(nId,nAngle) {}
SdrAngleItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx
index 88f606b59ce4..778fb09f0fa0 100644
--- a/include/svx/sdasaitm.hxx
+++ b/include/svx/sdasaitm.hxx
@@ -43,7 +43,7 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem
public :
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem();
SdrCustomShapeAdjustmentItem( SvStream& rIn, sal_uInt16 nVersion );
SVX_DLLPUBLIC ~SdrCustomShapeAdjustmentItem();
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index b30470980191..6fddcc05364c 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -71,7 +71,7 @@ private:
public :
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrCustomShapeGeometryItem();
SdrCustomShapeGeometryItem( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& );
diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx
index 7d313ff91d51..aba6846b789d 100644
--- a/include/svx/sdgcoitm.hxx
+++ b/include/svx/sdgcoitm.hxx
@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrGrafRedItem : public SdrSignedPercentItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrGrafRedItem( short nRedPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFRED, nRedPercent ) {}
SdrGrafRedItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFRED, rIn ) {}
@@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SdrGrafGreenItem : public SdrSignedPercentItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrGrafGreenItem( short nGreenPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, nGreenPercent ) {}
SdrGrafGreenItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, rIn ) {}
@@ -66,7 +66,7 @@ class SVX_DLLPUBLIC SdrGrafBlueItem : public SdrSignedPercentItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrGrafBlueItem( short nBluePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, nBluePercent ) {}
SdrGrafBlueItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, rIn ) {}
diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx
index 9fad5fd89a01..bc0364ecc12b 100644
--- a/include/svx/sdgcpitm.hxx
+++ b/include/svx/sdgcpitm.hxx
@@ -31,7 +31,7 @@ class SVX_DLLPUBLIC SdrGrafCropItem : public SvxGrfCrop
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrGrafCropItem( sal_Int32 nLeftCrop = 0, sal_Int32 nTopCrop = 0,
sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0,
diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx
index 4930937c96cc..3e0d24644794 100644
--- a/include/svx/sdggaitm.hxx
+++ b/include/svx/sdggaitm.hxx
@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrGrafGamma100Item : public SfxUInt32Item
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrGrafGamma100Item( sal_uIntPtr nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {}
SdrGrafGamma100Item( SvStream& rIn ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, rIn ) {}
diff --git a/include/svx/sdginitm.hxx b/include/svx/sdginitm.hxx
index 8a087530708e..a22b78126a77 100644
--- a/include/svx/sdginitm.hxx
+++ b/include/svx/sdginitm.hxx
@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrGrafInvertItem : public SdrOnOffItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrGrafInvertItem( bool bInvert = false ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {}
SdrGrafInvertItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_GRAFINVERT, rIn ) {}
diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx
index 32d0064595ed..aa073498129f 100644
--- a/include/svx/sdgluitm.hxx
+++ b/include/svx/sdgluitm.hxx
@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrGrafLuminanceItem : public SdrSignedPercentItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrGrafLuminanceItem( short nLuminancePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, nLuminancePercent ) {}
SdrGrafLuminanceItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, rIn ) {}
@@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SdrGrafContrastItem : public SdrSignedPercentItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrGrafContrastItem( short nContrastPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, nContrastPercent ) {}
SdrGrafContrastItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, rIn ) {}
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index 8936ee629e62..1bdb3d505a1b 100644
--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -33,7 +33,7 @@ class SVX_DLLPUBLIC SdrGrafModeItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (sal_uInt16)eMode ) {}
SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, rIn ) {}
diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx
index 076bb2af8c36..88372f8544ff 100644
--- a/include/svx/sdgtritm.hxx
+++ b/include/svx/sdgtritm.hxx
@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {}
SdrGrafTransparenceItem( SvStream& rIn ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, rIn ) {}
diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx
index 3e85dc790a35..0a956f56980d 100644
--- a/include/svx/sdmetitm.hxx
+++ b/include/svx/sdmetitm.hxx
@@ -30,7 +30,7 @@
class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrMetricItem(): SfxInt32Item() {}
SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal=0): SfxInt32Item(nId,nVal) {}
SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx
index d9999f46d17a..6245237df99e 100644
--- a/include/svx/sdooitm.hxx
+++ b/include/svx/sdooitm.hxx
@@ -30,7 +30,7 @@
class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrOnOffItem(): SfxBoolItem() {}
SdrOnOffItem(sal_uInt16 nId, bool bOn=false): SfxBoolItem(nId,bOn) {}
SdrOnOffItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {}
diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx
index 65890a53a42c..3e0dd6564493 100644
--- a/include/svx/sdprcitm.hxx
+++ b/include/svx/sdprcitm.hxx
@@ -31,7 +31,7 @@
class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrPercentItem(): SfxUInt16Item() {}
SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal=0): SfxUInt16Item(nId,nVal) {}
SdrPercentItem(sal_uInt16 nId, SvStream& rIn): SfxUInt16Item(nId,rIn) {}
@@ -49,7 +49,7 @@ public:
class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrSignedPercentItem(): SfxInt16Item() {}
SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {}
SdrSignedPercentItem( sal_uInt16 nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {}
diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx
index edd93e7c3ff4..68808c3421a1 100644
--- a/include/svx/sdtaaitm.hxx
+++ b/include/svx/sdtaaitm.hxx
@@ -25,7 +25,7 @@
class SVX_DLLPUBLIC SdrTextAniAmountItem: public SfxInt16Item {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {}
SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx
index 54ded50680f9..95ab7c39c498 100644
--- a/include/svx/sdtaditm.hxx
+++ b/include/svx/sdtaditm.hxx
@@ -34,7 +34,7 @@ enum SdrTextAniDirection {SDRTEXTANI_LEFT,
class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(sal_uInt16)eDir) {}
SdrTextAniDirectionItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index b6fd1c680672..7ce752357e11 100644
--- a/include/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
@@ -35,7 +35,7 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally
class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(sal_uInt16)eAdj) {}
SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich,(sal_uInt16)eAdj) {}
SdrTextVertAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_VERTADJUST,rIn) {}
@@ -63,7 +63,7 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted
class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(sal_uInt16)eAdj) {}
SdrTextHorzAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx
index 3d1e6c11ccd9..c93eed5bf6d5 100644
--- a/include/svx/sdtakitm.hxx
+++ b/include/svx/sdtakitm.hxx
@@ -77,7 +77,7 @@ enum SdrTextAniKind {SDRTEXTANI_NONE,
class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(sal_uInt16)eKind) {}
SdrTextAniKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIKIND,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx
index 27979aab4ae7..6a45325a5872 100644
--- a/include/svx/sdtayitm.hxx
+++ b/include/svx/sdtayitm.hxx
@@ -25,7 +25,7 @@
class SVX_DLLPUBLIC SdrTextAniDelayItem: public SfxUInt16Item {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {}
SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx
index 2fa0a8163dd6..7ef6c13fc962 100644
--- a/include/svx/sdtfchim.hxx
+++ b/include/svx/sdtfchim.hxx
@@ -25,7 +25,7 @@ class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrTextFixedCellHeightItem( bool bUseFixedCellHeight = false );
SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion );
diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx
index 5defc601c6c0..6d763b8513d9 100644
--- a/include/svx/sdtfsitm.hxx
+++ b/include/svx/sdtfsitm.hxx
@@ -44,7 +44,7 @@ enum SdrFitToSizeType {
class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(sal_uInt16)eFit) {}
SdrTextFitToSizeTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx
index cb1142ee10fd..d8620d365559 100644
--- a/include/svx/sdynitm.hxx
+++ b/include/svx/sdynitm.hxx
@@ -30,7 +30,7 @@
//-------------------------------------------------- ----------
class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrYesNoItem(): SfxBoolItem() {}
SdrYesNoItem(sal_uInt16 nId, bool bOn=false): SfxBoolItem(nId,bOn) {}
SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {}
diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index 06c6147de76d..e3ae1724d57a 100644
--- a/include/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
@@ -39,7 +39,7 @@ protected:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dSphereObj(E3dDefaultAttributes& rDefault, const basegfx::B3DPoint& rCenter, const basegfx::B3DVector& r3DSize);
// FG: This constructor is only called from MakeObject from the 3d-Objectfactory
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index fc45d3f1a6ca..c97a53644f82 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -236,7 +236,7 @@ protected:
virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify);
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrDragMove(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const;
@@ -259,7 +259,7 @@ protected:
Fraction aYFact;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrDragResize(SdrDragView& rNewView);
virtual void TakeSdrDragComment(OUString& rStr) const;
@@ -288,7 +288,7 @@ protected:
virtual void createSdrDragEntries();
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrDragObjOwn(SdrDragView& rNewView);
virtual ~SdrDragObjOwn();
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 524c86c37b9c..049e2f099f3f 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -124,7 +124,7 @@ public:
SdrHintKind meHint;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
explicit SdrHint(SdrHintKind eNewHint);
explicit SdrHint(const SdrObject& rNewObj);
@@ -279,7 +279,7 @@ private:
public:
bool IsPasteResize() const { return bPasteResize; }
void SetPasteResize(bool bOn) { bPasteResize=bOn; }
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
// Steckt man hier seinen eigenen Pool rein, so wird die Klasse auch
// Aktionen an ihm vornehmen (Put(),Remove()). Bei Zerstoerung von
// SdrModel wird dieser Pool ver delete geloescht!
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index 00b4afebf714..ffd44d7476c8 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -150,7 +150,7 @@ public:
double GetObjectRotation() const;
double GetExtraTextRotation( const bool bPreRotation = false ) const;
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrObjCustomShape();
virtual ~SdrObjCustomShape();
diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx
index d01f57d73d47..d3a39cdca14e 100644
--- a/include/svx/svdoattr.hxx
+++ b/include/svx/svdoattr.hxx
@@ -63,7 +63,7 @@ protected:
virtual ~SdrAttrObj();
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
// Detects if bFilledObj && Fill != FillNone
bool HasFill() const;
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index ddd6dcca28c5..ccdf58abb683 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -448,7 +448,7 @@ protected:
virtual ~SdrObject();
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrObject();
// frees the SdrObject pointed to by the argument
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index 9db626919cf1..30bd9a085aeb 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -75,7 +75,7 @@ private:
SVX_DLLPRIVATE void ImpRecalcTail();
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrCaptionObj();
SdrCaptionObj(const Rectangle& rRect, const Point& rTail);
virtual ~SdrCaptionObj();
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index 3286d55037dd..99879ca71dd9 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -69,7 +69,7 @@ protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrCircObj(SdrObjKind eNewKind); // Circ, CArc, Sect or CCut
SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect);
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 3c9bead8aba1..49b29410d07e 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -213,7 +213,7 @@ protected:
void ImpSetEdgeInfoToAttr(); // Werte vom aEdgeInfo in den Pool kopieren
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrEdgeObj();
virtual ~SdrEdgeObj();
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 5fe8dfdc3ee6..4ca3a238e166 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -104,7 +104,7 @@ private:
void onGraphicChanged();
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrGrafObj();
SdrGrafObj(const Graphic& rGrf);
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index 6717a79dd18c..5851b6280688 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -47,7 +47,7 @@ protected:
bool bRefPoint; // Ist ein RefPoint gesetzt?
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrObjGroup();
virtual ~SdrObjGroup();
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index d177663fae0f..27d083789724 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -85,7 +85,7 @@ protected:
virtual void RestGeoData(const SdrObjGeoData& rGeo);
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrMeasureObj();
SdrMeasureObj(const Point& rPt1, const Point& rPt2);
virtual ~SdrMeasureObj();
diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index 2e1d55103c10..2fef2413a16f 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -38,7 +38,7 @@ class SVX_DLLPUBLIC SdrMediaObj : public SdrRectObj
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrMediaObj();
SdrMediaObj( const Rectangle& rRect );
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index c6fbf3210be4..6a12228c551c 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -81,7 +81,7 @@ protected:
public:
OUString GetStyleString();
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrOle2Obj(bool bFrame_ = false);
SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect, bool bFrame_ = false);
diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx
index 59f959c28cf2..5712feccc6f7 100644
--- a/include/svx/svdopage.hxx
+++ b/include/svx/svdopage.hxx
@@ -42,7 +42,7 @@ protected:
virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties();
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrPageObj(SdrPage* pNewPage = 0L);
SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage = 0L);
~SdrPageObj();
diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index 3ff166553e10..dc57bc8121b1 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -72,7 +72,7 @@ public:
double GetBrightness() { return mdBrightness; }
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrPathObj(SdrObjKind eNewKind);
SdrPathObj(SdrObjKind eNewKind, const basegfx::B2DPolyPolygon& rPathPoly, double dBrightness = 1.0);
virtual ~SdrPathObj();
diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx
index f2510afbb9e3..fc6bbb5265bd 100644
--- a/include/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
@@ -64,7 +64,7 @@ protected:
virtual void RestGeoData(const SdrObjGeoData& rGeo);
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
// Der Eckenradius-Parameter fliegt irgendwann raus. Der Eckenradius
// ist dann (spaeter) ueber SfxItems einzustellen (SetAttributes()).
// Konstruktion eines Rechteck-Zeichenobjekts
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 8a1f46ad710a..aaa9573ae735 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -109,7 +109,7 @@ public:
SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows);
virtual ~SdrTableObj();
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
// table stuff
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 8e184c3aec8d..84393da7da29 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -104,7 +104,7 @@ class ImpSdrObjTextLinkUserData : public SdrObjUserData
rtl_TextEncoding eCharSet;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
ImpSdrObjTextLinkUserData(SdrTextObj* pObj1);
virtual ~ImpSdrObjTextLinkUserData();
@@ -312,7 +312,7 @@ protected:
virtual ~SdrTextObj();
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
// #101684#
bool IsInEditMode() const { return mbInEditMode; }
diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx
index 4d366cf64f41..3037fe0f02f2 100644
--- a/include/svx/svdouno.hxx
+++ b/include/svx/svdouno.hxx
@@ -64,7 +64,7 @@ private:
const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac );
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
explicit SdrUnoObj(const OUString& rModelName, bool bOwnsModel = true);
SdrUnoObj(const OUString& rModelName,
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index 1fe569246f92..7b299e4132e9 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -52,7 +52,7 @@ protected:
virtual void RestGeoData(const SdrObjGeoData& rGeo);
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrVirtObj(SdrObject& rNewObj);
virtual ~SdrVirtObj();
virtual SdrObject& ReferencedObj();
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index a573365b071d..8214f40eb92b 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -483,7 +483,7 @@ protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrPage(SdrModel& rNewModel, bool bMasterPage=false);
// Copy-Ctor und Zuweisungeoperator sind nicht getestet!
SdrPage(const SdrPage& rSrcPage);
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 751120655708..49b34766ef02 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -101,7 +101,7 @@ class SVX_DLLPUBLIC SvxViewHint : public SfxHint
{
public:
enum HintType { SVX_HINT_VIEWCHANGED };
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
explicit SvxViewHint (HintType eType);
HintType GetHintType (void) const;
@@ -284,7 +284,7 @@ protected:
virtual ~SdrPaintView();
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
virtual void ClearPageView();
SdrModel* GetModel() const { return pMod; }
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 55aaebe17d8c..7f65f337a882 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -56,7 +56,7 @@ protected:
{}
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
virtual ~SdrUndoAction();
virtual bool CanRepeat(SfxRepeatTarget& rView) const;
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index bfe5bc8bfc0c..f8d563e83850 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -165,7 +165,7 @@ protected:
SvtAccessibilityOptions maAccessibilityOptions;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
explicit SdrView(SdrModel* pModel1, OutputDevice* pOut = 0L);
virtual ~SdrView();
diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx
index 1c0690ff5059..015c339e813c 100644
--- a/include/svx/svxgrahicitem.hxx
+++ b/include/svx/svxgrahicitem.hxx
@@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem
Graphic aGraphic;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxGraphicItem();
SvxGraphicItem( sal_uInt16 nWhich ,const Graphic& rGraphic);
SvxGraphicItem( const SvxGraphicItem& );
diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index 3dc637ff8537..888743b05537 100644
--- a/include/svx/sxcecitm.hxx
+++ b/include/svx/sxcecitm.hxx
@@ -32,7 +32,7 @@ enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBEST
class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< sal_uInt16 >(eDir)) {}
SdrCaptionEscDirItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONESCDIR,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sxcikitm.hxx b/include/svx/sxcikitm.hxx
index 0643e298acbc..8c6761fbf11f 100644
--- a/include/svx/sxcikitm.hxx
+++ b/include/svx/sxcikitm.hxx
@@ -29,7 +29,7 @@ enum SdrCircKind {SDRCIRC_FULL,
class SdrCircKindItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {}
SdrCircKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CIRCKIND,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx
index c7ead86ea3db..28195cc7fed0 100644
--- a/include/svx/sxctitm.hxx
+++ b/include/svx/sxctitm.hxx
@@ -30,7 +30,7 @@ enum SdrCaptionType {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4};
class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< sal_uInt16 >(eStyle)) {}
SdrCaptionTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONTYPE,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx
index 30ce02a68666..d0f3ac901b68 100644
--- a/include/svx/sxekitm.hxx
+++ b/include/svx/sxekitm.hxx
@@ -34,7 +34,7 @@ enum SdrEdgeKind {SDREDGE_ORTHOLINES,
class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< sal_uInt16 >(eStyle)) {}
SdrEdgeKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_EDGEKIND,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sxmkitm.hxx b/include/svx/sxmkitm.hxx
index afc0f24abcd2..f00757859998 100644
--- a/include/svx/sxmkitm.hxx
+++ b/include/svx/sxmkitm.hxx
@@ -29,7 +29,7 @@ enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i.
class SdrMeasureKindItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {}
SdrMeasureKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREKIND,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx
index 824278ae70eb..cf3fe879422d 100644
--- a/include/svx/sxmtpitm.hxx
+++ b/include/svx/sxmtpitm.hxx
@@ -31,7 +31,7 @@ enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BR
class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
SdrMeasureTextHPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
@@ -51,7 +51,7 @@ public:
class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
SdrMeasureTextVPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx
index 313ce96b1192..4b55f207b72a 100644
--- a/include/svx/sxmuitm.hxx
+++ b/include/svx/sxmuitm.hxx
@@ -28,7 +28,7 @@
// (ausgehend von der MapUnit des Models). Diese Einheit wird dann ggf. auch angezeigt.
class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< sal_uInt16 >(eUnit)) {}
SdrMeasureUnitItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREUNIT,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx
index 2906c8d46a7b..30c2070617f5 100644
--- a/include/svx/sxsiitm.hxx
+++ b/include/svx/sxsiitm.hxx
@@ -23,7 +23,7 @@
class SdrScaleItem: public SdrFractionItem {
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {}
SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {}
SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {}
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index 8c444b804c4d..74f793269335 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -77,7 +77,7 @@ protected:
void BreakSingle3DObj(E3dObject* pObj);
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
E3dView(SdrModel* pModel, OutputDevice* pOut = 0L);
virtual ~E3dView();
diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx
index cd6b5bfffd16..7688f14fff20 100644
--- a/include/svx/viewlayoutitem.hxx
+++ b/include/svx/viewlayoutitem.hxx
@@ -30,7 +30,7 @@ class SVX_DLLPUBLIC SvxViewLayoutItem: public SfxUInt16Item
bool mbBookMode;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, sal_uInt16 nWhich = SID_ATTR_VIEWLAYOUT );
SvxViewLayoutItem( const SvxViewLayoutItem& );
diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx
index 4c612cda1ca2..060a15e313dd 100644
--- a/include/svx/xbtmpit.hxx
+++ b/include/svx/xbtmpit.hxx
@@ -42,7 +42,7 @@ private:
GraphicObject maGraphicObject;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillBitmapItem() : NameOrIndex(XATTR_FILLBITMAP, -1 ) {}
XFillBitmapItem(const OUString& rName, const GraphicObject& rGraphicObject);
XFillBitmapItem(SfxItemPool* pPool, const GraphicObject& rGraphicObject);
diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx
index 0ba0ea7a0410..3eb317105089 100644
--- a/include/svx/xcolit.hxx
+++ b/include/svx/xcolit.hxx
@@ -35,7 +35,7 @@ class SVX_DLLPUBLIC XColorItem : public NameOrIndex
Color aColor;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XColorItem() {}
XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor);
diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index a4d3336f56f7..731aab194033 100644
--- a/include/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
@@ -33,7 +33,7 @@
class SVX_DLLPUBLIC XFillStyleItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillStyleItem(XFillStyle = XFILL_SOLID);
XFillStyleItem(XFillStyle, sal_uInt16 nWhich);
XFillStyleItem(SvStream& rIn);
diff --git a/include/svx/xflasit.hxx b/include/svx/xflasit.hxx
index 77e024cd9dd6..6f1cc1eb52c8 100644
--- a/include/svx/xflasit.hxx
+++ b/include/svx/xflasit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFillAttrSetItem : public SfxSetItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillAttrSetItem(SfxItemSet* pItemSet );
XFillAttrSetItem(SfxItemPool* pItemPool);
XFillAttrSetItem(const XFillAttrSetItem& rAttr);
diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx
index 0ed1bfb6a0bf..b5119d9aee71 100644
--- a/include/svx/xflbckit.hxx
+++ b/include/svx/xflbckit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillBackgroundItem( bool bFill = false );
SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn );
diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx
index c3ff9c51a08d..6938a5bdae06 100644
--- a/include/svx/xflbmpit.hxx
+++ b/include/svx/xflbmpit.hxx
@@ -27,7 +27,7 @@
class SVX_DLLPUBLIC XFillBmpPosItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillBmpPosItem( RECT_POINT eRP = RP_MM );
SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn );
diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx
index 11b4a15048b1..ec1008f9e6b8 100644
--- a/include/svx/xflbmsli.hxx
+++ b/include/svx/xflbmsli.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillBmpSizeLogItem( bool bLog = true );
SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn );
diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx
index 2729a26ad9e9..a8103fbf8a58 100644
--- a/include/svx/xflbmsxy.hxx
+++ b/include/svx/xflbmsxy.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC XFillBmpSizeXItem : public SfxMetricItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillBmpSizeXItem( long nSizeX = 0 );
SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn );
@@ -47,7 +47,7 @@ public:
class SVX_DLLPUBLIC XFillBmpSizeYItem : public SfxMetricItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillBmpSizeYItem( long nSizeY = 0 );
SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn );
diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx
index a60458e73cb4..038b72fcdc0b 100644
--- a/include/svx/xflbmtit.hxx
+++ b/include/svx/xflbmtit.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC XFillBmpTileItem : public SfxBoolItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillBmpTileItem( bool bTile = true );
XFillBmpTileItem( SvStream& rIn );
diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx
index 3818ec220951..aac255d363cb 100644
--- a/include/svx/xflboxy.hxx
+++ b/include/svx/xflboxy.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC XFillBmpPosOffsetXItem : public SfxUInt16Item
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 );
SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn );
@@ -42,7 +42,7 @@ public:
class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 );
SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn );
diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx
index e2cea6a3b4a4..b59f6748d787 100644
--- a/include/svx/xflbstit.hxx
+++ b/include/svx/xflbstit.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC XFillBmpStretchItem : public SfxBoolItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillBmpStretchItem( bool bStretch = true );
XFillBmpStretchItem( SvStream& rIn );
diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx
index cb5d69b3b9f3..66914214c36e 100644
--- a/include/svx/xflbtoxy.hxx
+++ b/include/svx/xflbtoxy.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC XFillBmpTileOffsetXItem : public SfxUInt16Item
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 );
SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn );
@@ -42,7 +42,7 @@ public:
class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 );
SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn );
diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx
index 34784616108b..113b0e7a0cdf 100644
--- a/include/svx/xflclit.hxx
+++ b/include/svx/xflclit.hxx
@@ -33,7 +33,7 @@
class SVX_DLLPUBLIC XFillColorItem : public XColorItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillColorItem() {}
XFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
XFillColorItem(const OUString& rName, const Color& rTheColor);
diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx
index a5d74affe0ab..eff4ff50faaa 100644
--- a/include/svx/xflftrit.hxx
+++ b/include/svx/xflftrit.hxx
@@ -34,7 +34,7 @@ private:
bool bEnabled;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillFloatTransparenceItem();
XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, bool bEnable = true );
diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx
index 110ce064f5a6..65615be9fd56 100644
--- a/include/svx/xflgrit.hxx
+++ b/include/svx/xflgrit.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFillGradientItem : public NameOrIndex
XGradient aGradient;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {}
XFillGradientItem(sal_uInt16 nWhich_) : NameOrIndex(nWhich_, -1) {}
XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient);
diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx
index bcf6d659b9bb..388948f33443 100644
--- a/include/svx/xflhtit.hxx
+++ b/include/svx/xflhtit.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex
XHatch aHatch;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {}
XFillHatchItem(const OUString& rName, const XHatch& rTheHatch);
XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch);
diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx
index 04fbfd32925a..4a20fee332ed 100644
--- a/include/svx/xfltrit.hxx
+++ b/include/svx/xfltrit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFillTransparenceItem: public SfxUInt16Item
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFillTransparenceItem(sal_uInt16 nFillTransparence = 0);
XFillTransparenceItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx
index 6241a42d3ed8..e2eba0b49322 100644
--- a/include/svx/xftadit.hxx
+++ b/include/svx/xftadit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFormTextAdjustItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFormTextAdjustItem(XFormTextAdjust = XFT_CENTER);
XFormTextAdjustItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xftdiit.hxx b/include/svx/xftdiit.hxx
index 2457c07c4db4..f9abcba7ba1b 100644
--- a/include/svx/xftdiit.hxx
+++ b/include/svx/xftdiit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFormTextDistanceItem : public SfxMetricItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFormTextDistanceItem(long nDist = 0);
XFormTextDistanceItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xftmrit.hxx b/include/svx/xftmrit.hxx
index 9f0f6d330eeb..9be4439c2d66 100644
--- a/include/svx/xftmrit.hxx
+++ b/include/svx/xftmrit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFormTextMirrorItem : public SfxBoolItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFormTextMirrorItem(bool bMirror = false);
XFormTextMirrorItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx
index 18c94d649874..f284aed27dcc 100644
--- a/include/svx/xftouit.hxx
+++ b/include/svx/xftouit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFormTextOutlineItem : public SfxBoolItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFormTextOutlineItem(bool bOutline = false);
XFormTextOutlineItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xftshcit.hxx b/include/svx/xftshcit.hxx
index 9ee5062d1268..e858a4a1ea97 100644
--- a/include/svx/xftshcit.hxx
+++ b/include/svx/xftshcit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFormTextShadowColorItem : public XColorItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFormTextShadowColorItem() {}
XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor);
XFormTextShadowColorItem(SvStream& rIn);
diff --git a/include/svx/xftshit.hxx b/include/svx/xftshit.hxx
index cf77ae203386..0676d7ce1be0 100644
--- a/include/svx/xftshit.hxx
+++ b/include/svx/xftshit.hxx
@@ -33,7 +33,7 @@
class SVX_DLLPUBLIC XFormTextShadowItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFormTextShadowItem(XFormTextShadow = XFTSHADOW_NONE);
XFormTextShadowItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xftshtit.hxx b/include/svx/xftshtit.hxx
index ce29ab294aa7..0f6f08705d21 100644
--- a/include/svx/xftshtit.hxx
+++ b/include/svx/xftshtit.hxx
@@ -31,7 +31,7 @@
class XFormTextShadowTranspItem: public SfxUInt16Item
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0);
XFormTextShadowTranspItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
diff --git a/include/svx/xftshxy.hxx b/include/svx/xftshxy.hxx
index c934a77e961a..809ba3da0c60 100644
--- a/include/svx/xftshxy.hxx
+++ b/include/svx/xftshxy.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFormTextShadowXValItem : public SfxMetricItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFormTextShadowXValItem(long nVal = 0);
XFormTextShadowXValItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
@@ -48,7 +48,7 @@ public:
class SVX_DLLPUBLIC XFormTextShadowYValItem : public SfxMetricItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFormTextShadowYValItem(long nVal = 0);
XFormTextShadowYValItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xftstit.hxx b/include/svx/xftstit.hxx
index 28b03bb6afcc..ba695f26402f 100644
--- a/include/svx/xftstit.hxx
+++ b/include/svx/xftstit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XFormTextStartItem : public SfxMetricItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFormTextStartItem(long nStart = 0);
XFormTextStartItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx
index d38741a1669d..065e1f7d8478 100644
--- a/include/svx/xgrscit.hxx
+++ b/include/svx/xgrscit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XGradientStepCountItem: public SfxUInt16Item
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XGradientStepCountItem( sal_uInt16 nStepCount = 0 );
XGradientStepCountItem( SvStream& rIn );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index 2a83d5d90f56..1d5dae5fa5da 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -43,7 +43,7 @@ protected:
void Detach() { nPalIndex = -1; }
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
NameOrIndex() { nPalIndex = -1; }
NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex);
NameOrIndex(sal_uInt16 nWhich,
diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx
index d202d7f1a10d..d8a5182f4fc9 100644
--- a/include/svx/xlineit0.hxx
+++ b/include/svx/xlineit0.hxx
@@ -30,7 +30,7 @@
class SVX_DLLPUBLIC XLineStyleItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineStyleItem(XLineStyle = XLINE_SOLID);
XLineStyleItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx
index 5feb31837809..722487c411eb 100644
--- a/include/svx/xlinjoit.hxx
+++ b/include/svx/xlinjoit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XLineJointItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineJointItem( com::sun::star::drawing::LineJoint eLineJoint = com::sun::star::drawing::LineJoint_ROUND );
XLineJointItem( SvStream& rIn );
diff --git a/include/svx/xlnasit.hxx b/include/svx/xlnasit.hxx
index 58a88e84b367..6a32cf5df32d 100644
--- a/include/svx/xlnasit.hxx
+++ b/include/svx/xlnasit.hxx
@@ -33,7 +33,7 @@
class SVX_DLLPUBLIC XLineAttrSetItem : public SfxSetItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineAttrSetItem(SfxItemSet* pItemSet );
XLineAttrSetItem(SfxItemPool* pItemPool);
XLineAttrSetItem(const XLineAttrSetItem& rAttr);
diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx
index 335cd5d8307b..9308b3020e2e 100644
--- a/include/svx/xlncapit.hxx
+++ b/include/svx/xlncapit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XLineCapItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineCapItem(com::sun::star::drawing::LineCap eLineCap = com::sun::star::drawing::LineCap_BUTT);
XLineCapItem(SvStream& rIn);
diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx
index d6bafc4c9b2f..e7b9780dc466 100644
--- a/include/svx/xlnclit.hxx
+++ b/include/svx/xlnclit.hxx
@@ -29,7 +29,7 @@
class SVX_DLLPUBLIC XLineColorItem : public XColorItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineColorItem() {}
XLineColorItem(sal_Int32 nIndex, const Color& rTheColor);
XLineColorItem(const OUString& rName, const Color& rTheColor);
diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx
index f8b7a01a0547..237f822e71b0 100644
--- a/include/svx/xlndsit.hxx
+++ b/include/svx/xlndsit.hxx
@@ -35,7 +35,7 @@ class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex
XDash aDash;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineDashItem() : NameOrIndex(XATTR_LINEDASH, -1) {}
XLineDashItem(const OUString& rName, const XDash& rTheDash);
XLineDashItem(SfxItemPool* pPool, const XDash& rTheDash);
diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx
index 8212865078bc..818cbc571bb5 100644
--- a/include/svx/xlnedcit.hxx
+++ b/include/svx/xlnedcit.hxx
@@ -29,7 +29,7 @@
class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineEndCenterItem(bool bEndCenter = false);
XLineEndCenterItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx
index 5c53f801c5d9..f1071080c1a5 100644
--- a/include/svx/xlnedit.hxx
+++ b/include/svx/xlnedit.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XLineEndItem : public NameOrIndex
basegfx::B2DPolyPolygon maPolyPolygon;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineEndItem(sal_Int32 nIndex = -1);
XLineEndItem(const OUString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineEndItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx
index fd272c14ff4d..e5da6e361bfd 100644
--- a/include/svx/xlnedwit.hxx
+++ b/include/svx/xlnedwit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XLineEndWidthItem : public SfxMetricItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT);
XLineEndWidthItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx
index ea9ea4b09a8d..5b04e2deecfb 100644
--- a/include/svx/xlnstcit.hxx
+++ b/include/svx/xlnstcit.hxx
@@ -29,7 +29,7 @@
class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineStartCenterItem(bool bStartCenter = false);
XLineStartCenterItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx
index 66275c61faf7..e20d818f17dc 100644
--- a/include/svx/xlnstit.hxx
+++ b/include/svx/xlnstit.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC XLineStartItem : public NameOrIndex
basegfx::B2DPolyPolygon maPolyPolygon;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineStartItem(sal_Int32 nIndex = -1);
XLineStartItem(const OUString& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineStartItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx
index 0db83c5c4559..2dbefda771cc 100644
--- a/include/svx/xlnstwit.hxx
+++ b/include/svx/xlnstwit.hxx
@@ -31,7 +31,7 @@
class SVX_DLLPUBLIC XLineStartWidthItem : public SfxMetricItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT);
XLineStartWidthItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx
index ac6a1efc0bcf..f924e8d18b0c 100644
--- a/include/svx/xlntrit.hxx
+++ b/include/svx/xlntrit.hxx
@@ -32,7 +32,7 @@
class SVX_DLLPUBLIC XLineTransparenceItem: public SfxUInt16Item
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineTransparenceItem(sal_uInt16 nLineTransparence = 0);
XLineTransparenceItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx
index d819adaee8a0..fd9045a2e232 100644
--- a/include/svx/xlnwtit.hxx
+++ b/include/svx/xlnwtit.hxx
@@ -29,7 +29,7 @@
class SVX_DLLPUBLIC XLineWidthItem : public SfxMetricItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XLineWidthItem(long nWidth = 0);
XLineWidthItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx
index 7cd55a33fac2..eb9a91be64b5 100644
--- a/include/svx/xsflclit.hxx
+++ b/include/svx/xsflclit.hxx
@@ -28,7 +28,7 @@
class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SVX_DLLPRIVATE XSecondaryFillColorItem() {}
XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor);
SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn);
diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx
index 80b75e52cf30..fec64739b4a0 100644
--- a/include/svx/xtextit0.hxx
+++ b/include/svx/xtextit0.hxx
@@ -33,7 +33,7 @@
class SVX_DLLPUBLIC XFormTextStyleItem : public SfxEnumItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFormTextStyleItem(XFormTextStyle = XFT_NONE);
XFormTextStyleItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
@@ -54,7 +54,7 @@ public:
class SVX_DLLPUBLIC XFormTextHideFormItem : public SfxBoolItem
{
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
XFormTextHideFormItem(bool bHide = false);
XFormTextHideFormItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx
index 6aa2ca8afb17..edae1bfe9100 100644
--- a/include/svx/zoomslideritem.hxx
+++ b/include/svx/zoomslideritem.hxx
@@ -33,7 +33,7 @@ class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item
sal_uInt16 mnMaxZoom;
public:
- TYPEINFO();
+ TYPEINFO_OVERRIDE();
SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER );
SvxZoomSliderItem( const SvxZoomSliderItem& );