diff options
Diffstat (limited to 'include/svx')
138 files changed, 128 insertions, 255 deletions
diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx index 3381acd18ac2..ff8617c0a1dc 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/include/svx/AffineMatrixItem.hxx @@ -29,7 +29,6 @@ private: css::geometry::AffineMatrix2D maMatrix; public: - TYPEINFO_OVERRIDE(); AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix = nullptr); AffineMatrixItem(SvStream& rIn); AffineMatrixItem(const AffineMatrixItem&); diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx index 6b0c78564a92..63292ff50972 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxSmartTagItem( const sal_uInt16 nId, const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence, diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index a550f6a852d7..00431635dd89 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -30,7 +30,7 @@ class SvStream; class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxOrientationItem: public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxOrientationItem( const SvxCellOrientation eOrientation /*= SVX_ORIENTATION_STANDARD*/, @@ -74,7 +74,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxMarginItem: public SfxPoolItem sal_Int16 nRightMargin; sal_Int16 nBottomMargin; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 28734b791f93..3ffbc4be9a01 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -165,7 +165,6 @@ enum SvxChartRegress class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartStyleItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); SvxChartStyleItem(SvxChartStyle eStyle /*= CHSTYLE_2D_LINE*/, sal_uInt16 nId ); SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId ); @@ -180,7 +179,6 @@ public: class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartRegressItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); SvxChartRegressItem(SvxChartRegress eRegress /*= CHREGRESS_LINEAR*/, sal_uInt16 nId ); SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId ); @@ -197,7 +195,6 @@ public: class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartDataDescrItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId ); @@ -210,7 +207,6 @@ public: class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartTextOrderItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= CHTXTORDER_SIDEBYSIDE*/, sal_uInt16 nId ); SvxChartTextOrderItem(SvStream& rIn, @@ -230,7 +226,6 @@ public: class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartTextOrientItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId ); @@ -243,7 +238,6 @@ public: class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartKindErrorItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); SvxChartKindErrorItem(SvxChartKindError /*eOrient = CHERROR_NONE*/, sal_uInt16 nId ); SvxChartKindErrorItem(SvStream& rIn, @@ -262,7 +256,6 @@ public: class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxChartIndicateItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); SvxChartIndicateItem(SvxChartIndicate eOrient /*= CHINDICATE_NONE*/, sal_uInt16 nId ); SvxChartIndicateItem(SvStream& rIn, @@ -283,7 +276,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxDoubleItem : public SfxPoolItem double fVal; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 91a353adefa0..b37a9785cbb8 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -35,7 +35,7 @@ protected: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxClipboardFormatItem( sal_uInt16 nId = 0 ); SvxClipboardFormatItem( const SvxClipboardFormatItem& ); virtual ~SvxClipboardFormatItem(); diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx index c40cfd436232..62d0354dcd5d 100644 --- a/include/svx/cube3d.hxx +++ b/include/svx/cube3d.hxx @@ -57,7 +57,6 @@ protected: virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() override; public: - 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 db33d5bbdf5e..c8fa8c87d6c4 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -30,7 +30,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxColorListItem: public SfxPoolItem XColorListRef pColorList; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); + SvxColorListItem(); SvxColorListItem( XColorListRef pTable, sal_uInt16 nWhich ); @@ -54,7 +55,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxGradientListItem : public SfxPoolItem XGradientListRef pGradientList; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); + SvxGradientListItem(); SvxGradientListItem( XGradientListRef pList, sal_uInt16 nWhich ); @@ -78,7 +80,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxHatchListItem : public SfxPoolItem XHatchListRef pHatchList; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxHatchListItem(); SvxHatchListItem( XHatchListRef pList, sal_uInt16 nWhich ); @@ -102,7 +104,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxBitmapListItem : public SfxPoolItem XBitmapListRef pBitmapList; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); + SvxBitmapListItem(); SvxBitmapListItem( XBitmapListRef pBL, sal_uInt16 nWhich ); @@ -126,7 +129,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxDashListItem : public SfxPoolItem XDashListRef pDashList; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); + SvxDashListItem(); SvxDashListItem( XDashListRef pList, sal_uInt16 nWhich ); @@ -150,7 +154,8 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxLineEndListItem : public SfxPoolItem XLineEndListRef pLineEndList; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); + SvxLineEndListItem(); SvxLineEndListItem( XLineEndListRef pList, sal_uInt16 nWhich ); diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index 643438edd1f7..9dc5ed3cd339 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -31,7 +31,6 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxB3DVectorItem : public SfxPoolItem basegfx::B3DVector aVal; public: - 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 4bf65c9bc6cb..52ab60e86caa 100644 --- a/include/svx/e3dundo.hxx +++ b/include/svx/e3dundo.hxx @@ -36,7 +36,6 @@ class SAL_WARN_UNUSED E3dUndoAction : public SdrUndoAction E3dObject *pMy3DObj; public: - TYPEINFO_OVERRIDE(); E3dUndoAction (SdrModel *pModel, E3dObject *p3DObj) : SdrUndoAction (*pModel), @@ -60,7 +59,6 @@ class SAL_WARN_UNUSED E3dRotateUndoAction : public E3dUndoAction basegfx::B3DHomMatrix aMyNewRotation; public: - TYPEINFO_OVERRIDE(); E3dRotateUndoAction (SdrModel *pModel, E3dObject *p3DObj, const basegfx::B3DHomMatrix &aOldRotation, @@ -93,7 +91,6 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED E3dAttributesUndoAction : public SdrUndoActi const SfxItemSet aOldSet; public: - TYPEINFO_OVERRIDE(); E3dAttributesUndoAction( SdrModel &rModel, E3dObject* pInObject, const SfxItemSet& rNewSet, diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx index 2a01b16114aa..06b5b6eafc42 100644 --- a/include/svx/extrud3d.hxx +++ b/include/svx/extrud3d.hxx @@ -44,7 +44,6 @@ protected: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); public: - 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 9a42d6c631f6..afd8de097e31 100644 --- a/include/svx/extrusionbar.hxx +++ b/include/svx/extrusionbar.hxx @@ -38,7 +38,6 @@ SVX_DLLPUBLIC bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyEx class SVX_DLLPUBLIC SAL_WARN_UNUSED ExtrusionBar : public SfxShell { public: - TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SVX_INTERFACE_EXTRUSION_BAR) private: diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx index 06a21fb35a5e..cdc0e7f57b95 100644 --- a/include/svx/fmmodel.hxx +++ b/include/svx/fmmodel.hxx @@ -46,7 +46,6 @@ private: void operator=(const FmFormModel& rSrcModel) = delete; public: - TYPEINFO_OVERRIDE(); FmFormModel(SfxItemPool* pPool=nullptr, SfxObjectShell* pPers=nullptr ); FmFormModel(const OUString& rPath, SfxItemPool* pPool=nullptr, diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index 03139b02e1db..044665d3b44c 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -47,7 +47,6 @@ class SVX_DLLPUBLIC FmFormPage : public SdrPage OUString m_sPageName; public: - TYPEINFO_OVERRIDE(); explicit FmFormPage(FmFormModel& rModel, bool bMasterPage=false); virtual ~FmFormPage(); diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 7250ea1bf3aa..0549cbd31d2d 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -99,7 +99,6 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell public: SFX_DECL_INTERFACE(SVX_INTERFACE_FORM_SH) - TYPEINFO_OVERRIDE(); private: /// SfxInterface initializer. diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 1549cecda66e..536eedd89e20 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -61,7 +61,6 @@ class SVX_DLLPUBLIC FmFormView : public E3dView void Init(); public: - TYPEINFO_OVERRIDE(); FmFormView(FmFormModel* pModel, OutputDevice* pOut = nullptr); virtual ~FmFormView(); diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx index 2b2ee1952438..67ed03c7c52d 100644 --- a/include/svx/fontworkbar.hxx +++ b/include/svx/fontworkbar.hxx @@ -38,7 +38,6 @@ bool SVX_DLLPUBLIC checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nChe class SVX_DLLPUBLIC SAL_WARN_UNUSED FontworkBar : public SfxShell { public: - TYPEINFO_OVERRIDE(); SFX_DECL_INTERFACE(SVX_INTERFACE_FONTWORK_BAR) private: diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index 59fe41463285..ecfe03f57a0c 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -45,7 +45,7 @@ class SVX_DLLPUBLIC SvxGalleryItem : public SfxPoolItem css::uno::Reference< css::graphic::XGraphic > m_xGraphic; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxGalleryItem(); SvxGalleryItem( const SvxGalleryItem& ); diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index e5d590bea879..df22c2060061 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -32,7 +32,6 @@ class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item { public: - TYPEINFO_OVERRIDE(); TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index b65f553a61fb..24d79c9df7eb 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxHyperlinkItem( sal_uInt16 _nWhich = SID_HYPERLINK_GETLINK ): SfxPoolItem(_nWhich), pMacroTable(nullptr) { eType = HLINK_DEFAULT; nMacroEvents=0; }; diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx index ec999b516582..1899949cb4a6 100644 --- a/include/svx/lathe3d.hxx +++ b/include/svx/lathe3d.hxx @@ -46,7 +46,6 @@ private: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); public: - TYPEINFO_OVERRIDE(); E3dLatheObj(E3dDefaultAttributes& rDefault, const basegfx::B2DPolyPolygon& rPoly2D); E3dLatheObj(); diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index 7e5b49d76891..cbc76bc3eee8 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -34,7 +34,6 @@ This item is used as a transport medium for a number formatter class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem { public: - TYPEINFO_OVERRIDE(); SvxNumberInfoItem( const sal_uInt16 nId ); SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index cce441b9af8b..036663222b9e 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -81,7 +81,6 @@ class E3dObjList : public SdrObjList E3dObjList &operator=(const E3dObjList& rSrcList) = delete; public: - TYPEINFO_OVERRIDE(); E3dObjList(SdrModel* pNewModel = nullptr, SdrPage* pNewPage = nullptr, E3dObjList* pNewUpList = nullptr); SVX_DLLPUBLIC virtual ~E3dObjList(); @@ -142,7 +141,6 @@ protected: E3dObject(bool bIsFromChart); public: - TYPEINFO_OVERRIDE(); virtual void RecalcSnapRect() override; virtual void SetRectsDirty(bool bNotMyself = false) override; @@ -244,7 +242,6 @@ protected: basegfx::B2DPolyPolygon TransformToScreenCoor(const basegfx::B3DPolyPolygon& rCandidate); public: - TYPEINFO_OVERRIDE(); E3dCompoundObject(); E3dCompoundObject(E3dDefaultAttributes& rDefault); diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index 5c5be296c234..0a2b0c3f4257 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -68,7 +68,7 @@ private: public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxPageItem( const sal_uInt16 nId ); SvxPageItem( const SvxPageItem& rItem ); diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx index 5196cb3eeade..e94931389711 100644 --- a/include/svx/polygn3d.hxx +++ b/include/svx/polygn3d.hxx @@ -43,7 +43,6 @@ public: void SetPolyNormals3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D); void SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyPoly2D); - TYPEINFO_OVERRIDE(); E3dPolygonObj( E3dDefaultAttributes& rDefault, diff --git a/include/svx/polysc3d.hxx b/include/svx/polysc3d.hxx index d50c5a49ab0b..4526bca338e1 100644 --- a/include/svx/polysc3d.hxx +++ b/include/svx/polysc3d.hxx @@ -32,7 +32,6 @@ class SVX_DLLPUBLIC E3dPolyScene : public E3dScene { public: - TYPEINFO_OVERRIDE(); E3dPolyScene(); E3dPolyScene(E3dDefaultAttributes& rDefault); diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index 7d4f8bef0137..edcf0c0d0f7c 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxPostItAuthorItem( sal_uInt16 nWhich ); @@ -64,7 +64,7 @@ The date of a note class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxPostItDateItem( sal_uInt16 nWhich ); @@ -95,7 +95,7 @@ The text of a note class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxPostItTextItem( sal_uInt16 nWhich ); diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 174291bbad18..9604b4a54e8a 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 4e5f4cdc3bbb..70dade511030 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -46,7 +46,7 @@ private: const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) = delete; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxLongLRSpaceItem(long lLeft, long lRight, sal_uInt16 nId); SvxLongLRSpaceItem(const SvxLongLRSpaceItem &); SvxLongLRSpaceItem(); @@ -79,7 +79,7 @@ private: const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) = delete; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxLongULSpaceItem(long lUpper, long lLower, sal_uInt16 nId); SvxLongULSpaceItem(const SvxLongULSpaceItem &); SvxLongULSpaceItem(); @@ -110,7 +110,7 @@ protected: private: const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) = delete; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxPagePosSizeItem(const Point &rPos, long lWidth, long lHeight); SvxPagePosSizeItem(const SvxPagePosSizeItem &); SvxPagePosSizeItem(); @@ -179,7 +179,7 @@ protected: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); // right edge of the surrounding frame // nLeft, nRight each the distance to the surrounding frame SvxColumnItem(sal_uInt16 nAct = 0); @@ -237,7 +237,7 @@ private: const SvxObjectItem &operator=(const SvxObjectItem &) = delete; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 7c61e7e89cc4..f8642e02b540 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -88,7 +88,6 @@ protected: void ImpCleanup3DDepthMapper(); public: - TYPEINFO_OVERRIDE(); E3dScene(); E3dScene(E3dDefaultAttributes& rDefault); virtual ~E3dScene(); diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index 709e71d1ed01..d0920f85bfe9 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -28,7 +28,6 @@ class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item { public: - 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 40126247bee1..2dea1c4e2030 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -31,16 +31,15 @@ class SdrCustomShapeAdjustmentValue friend class SdrCustomShapeAdjustmentItem; }; -class SdrCustomShapeAdjustmentItem : public SfxPoolItem +class SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem : public SfxPoolItem { std::vector<SdrCustomShapeAdjustmentValue> aAdjustmentValueList; public: - TYPEINFO_OVERRIDE(); - SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem(); + SdrCustomShapeAdjustmentItem(); SdrCustomShapeAdjustmentItem( SvStream& rIn, sal_uInt16 nVersion ); - SVX_DLLPUBLIC virtual ~SdrCustomShapeAdjustmentItem(); + virtual ~SdrCustomShapeAdjustmentItem(); virtual bool operator==( const SfxPoolItem& ) const override; virtual bool GetPresentation(SfxItemPresentation ePresentation, @@ -55,8 +54,8 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; sal_uInt32 GetCount() const { return aAdjustmentValueList.size(); }; - SVX_DLLPUBLIC const SdrCustomShapeAdjustmentValue& GetValue( sal_uInt32 nIndex ) const; - SVX_DLLPUBLIC void SetValue( sal_uInt32 nIndex, + const SdrCustomShapeAdjustmentValue& GetValue( sal_uInt32 nIndex ) const; + void SetValue( sal_uInt32 nIndex, const SdrCustomShapeAdjustmentValue& rVal ); }; diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 1fb2a997ac96..6712a3aeb690 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -51,7 +51,6 @@ private: public: - TYPEINFO_OVERRIDE(); SdrCustomShapeGeometryItem(); SdrCustomShapeGeometryItem( const css::uno::Sequence< css::beans::PropertyValue >& ); @@ -85,10 +84,12 @@ private: void ClearPropertyValue( const OUString& rPropertyName ); }; -class SdrCustomShapeReplacementURLItem : public SfxStringItem +class SVX_DLLPUBLIC SdrCustomShapeReplacementURLItem : public SfxStringItem { public: SdrCustomShapeReplacementURLItem(); + virtual ~SdrCustomShapeReplacementURLItem(); + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const override; }; inline SdrOnOffItem makeSdrTextWordWrapItem( bool bAuto ) { diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx index bf4d64bcd856..39de80213726 100644 --- a/include/svx/sdgcoitm.hxx +++ b/include/svx/sdgcoitm.hxx @@ -32,7 +32,6 @@ class SVX_DLLPUBLIC SdrGrafRedItem : public SdrSignedPercentItem { public: - TYPEINFO_OVERRIDE(); SdrGrafRedItem( short nRedPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFRED, nRedPercent ) {} SdrGrafRedItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFRED, rIn ) {} @@ -49,7 +48,6 @@ class SVX_DLLPUBLIC SdrGrafGreenItem : public SdrSignedPercentItem { public: - TYPEINFO_OVERRIDE(); SdrGrafGreenItem( short nGreenPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, nGreenPercent ) {} SdrGrafGreenItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, rIn ) {} @@ -66,7 +64,6 @@ class SVX_DLLPUBLIC SdrGrafBlueItem : public SdrSignedPercentItem { public: - 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 ad7e6623b5c6..ccdaa9388242 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -31,7 +31,6 @@ class SVX_DLLPUBLIC SdrGrafCropItem : public SvxGrfCrop { public: - 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 637ddc8c14ab..6dcb04186848 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -32,7 +32,6 @@ class SVX_DLLPUBLIC SdrGrafGamma100Item : public SfxUInt32Item { public: - TYPEINFO_OVERRIDE(); SdrGrafGamma100Item( sal_uInt32 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 4c56571f0ae1..ace78b684115 100644 --- a/include/svx/sdginitm.hxx +++ b/include/svx/sdginitm.hxx @@ -32,7 +32,6 @@ class SVX_DLLPUBLIC SdrGrafInvertItem : public SdrOnOffItem { public: - 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 d5e1dda99185..f935edf5b5c4 100644 --- a/include/svx/sdgluitm.hxx +++ b/include/svx/sdgluitm.hxx @@ -32,7 +32,6 @@ class SVX_DLLPUBLIC SdrGrafLuminanceItem : public SdrSignedPercentItem { public: - TYPEINFO_OVERRIDE(); SdrGrafLuminanceItem( short nLuminancePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, nLuminancePercent ) {} SdrGrafLuminanceItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, rIn ) {} @@ -49,7 +48,6 @@ class SVX_DLLPUBLIC SdrGrafContrastItem : public SdrSignedPercentItem { public: - 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 50ec71cbfaf9..3722511c17bc 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -33,7 +33,6 @@ class SVX_DLLPUBLIC SdrGrafModeItem : public SfxEnumItem { public: - 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 8d10226e3520..9b24c0329faf 100644 --- a/include/svx/sdgtritm.hxx +++ b/include/svx/sdgtritm.hxx @@ -32,7 +32,6 @@ class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem { public: - 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 26221899b632..2ec9ba0c33aa 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -30,7 +30,6 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item { public: - TYPEINFO_OVERRIDE(); SdrMetricItem(): SfxInt32Item() {} SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal): 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 da42ef403359..426bb5245a2b 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -30,7 +30,6 @@ class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { public: - 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 c25179edab07..1a66630e4ddc 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -31,7 +31,6 @@ class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item { public: - 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 +48,6 @@ public: class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item { public: - 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 18c4a88b3238..ed4a40ad6136 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -25,7 +25,6 @@ class SVX_DLLPUBLIC SdrTextAniAmountItem: public SfxInt16Item { public: - 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=nullptr) const override; diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index eb2daff1fbe3..57bba8f13333 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -34,7 +34,6 @@ enum SdrTextAniDirection {SDRTEXTANI_LEFT, class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem { public: - 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=nullptr) const override; diff --git a/include/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx index 31b84ee7a070..03db38dc214f 100644 --- a/include/svx/sdtaiitm.hxx +++ b/include/svx/sdtaiitm.hxx @@ -22,16 +22,20 @@ #include <svx/sdynitm.hxx> #include <svx/svddef.hxx> -class SdrTextAniStartInsideItem: public SdrYesNoItem { +class SVX_DLLPUBLIC SdrTextAniStartInsideItem: public SdrYesNoItem { public: SdrTextAniStartInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {} SdrTextAniStartInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,rIn) {} + virtual ~SdrTextAniStartInsideItem(); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; }; -class SdrTextAniStopInsideItem: public SdrYesNoItem { +class SVX_DLLPUBLIC SdrTextAniStopInsideItem: public SdrYesNoItem { public: SdrTextAniStopInsideItem(bool bOn=false): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {} SdrTextAniStopInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,rIn) {} + virtual ~SdrTextAniStopInsideItem(); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; }; #endif diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index 65079f9a9d8d..590df23ce2ce 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -35,7 +35,6 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem { public: - 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 +62,6 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem { public: - 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=nullptr) const override; diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index 0ffb06114462..b181dea967b7 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -78,7 +78,6 @@ enum SdrTextAniKind { class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem { public: - 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=nullptr) const override; diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index 3bf6f6705a06..ee583952fef1 100644 --- a/include/svx/sdtayitm.hxx +++ b/include/svx/sdtayitm.hxx @@ -25,7 +25,6 @@ class SVX_DLLPUBLIC SdrTextAniDelayItem: public SfxUInt16Item { public: - 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=nullptr) const override; diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 47faebebde22..e4cb5e2594fe 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -25,7 +25,6 @@ class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem { public: - 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 ec6230f5202c..0b64a01049bc 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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=nullptr) const override; diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index a7f1b56a5d00..ff3bb995bfa8 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -30,7 +30,6 @@ //-------------------------------------------------- ---------- class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem { public: - 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 b1c7a07d4ab7..c0ba4bbf8ceb 100644 --- a/include/svx/sphere3d.hxx +++ b/include/svx/sphere3d.hxx @@ -39,7 +39,6 @@ protected: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); public: - 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 2d4a5864813a..2820436a33f4 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -180,7 +180,6 @@ protected: drawinglayer::primitive2d::Primitive2DSequence AddConnectorOverlays(); public: - TYPEINFO(); void resetSdrDragEntries(); basegfx::B2DRange getCurrentRange() const; @@ -238,7 +237,6 @@ protected: virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) override; public: - TYPEINFO_OVERRIDE(); SdrDragMove(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const override; @@ -261,7 +259,6 @@ protected: Fraction aYFact; public: - TYPEINFO_OVERRIDE(); SdrDragResize(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const override; @@ -290,7 +287,6 @@ protected: virtual void createSdrDragEntries() override; public: - TYPEINFO_OVERRIDE(); SdrDragObjOwn(SdrDragView& rNewView); virtual ~SdrDragObjOwn(); diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index ab42395a664e..8f80c02fa697 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -279,7 +279,6 @@ private: public: bool IsPasteResize() const { return bPasteResize; } void SetPasteResize(bool bOn) { bPasteResize=bOn; } - TYPEINFO_OVERRIDE(); // If a custom Pool is put here, the class will call methods // on it (Put(), Remove()). On disposal of SdrModel the pool // will be deleted with delete. diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 96c133c02d17..c7628fb06c2c 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -161,7 +161,6 @@ public: double GetObjectRotation() const { return fObjectRotation;} double GetExtraTextRotation( const bool bPreRotation = false ) const; - TYPEINFO_OVERRIDE(); SdrObjCustomShape(); virtual ~SdrObjCustomShape(); diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index 857069cb2f66..c2b86d842da3 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -63,7 +63,6 @@ protected: virtual ~SdrAttrObj(); public: - TYPEINFO_OVERRIDE(); // Detects if bFilledObj && Fill != FillNone bool HasFill() const; diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 401ce8782866..e14d1d306c2f 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -159,7 +159,6 @@ enum SdrUserCallType {SDRUSERCALL_MOVEONLY, // only moved, size unchange class SVX_DLLPUBLIC SdrObjUserCall { public: - TYPEINFO(); virtual ~SdrObjUserCall(); virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect); }; @@ -408,7 +407,6 @@ protected: virtual ~SdrObject(); public: - TYPEINFO_OVERRIDE(); SdrObject(); // frees the SdrObject pointed to by the argument diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 4374c2b047b0..2cbe7445271a 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -74,7 +74,6 @@ private: SVX_DLLPRIVATE void ImpRecalcTail(); public: - 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 3823dcfd25f9..0245fdca7cfc 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -68,7 +68,6 @@ protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; public: - 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 c27ca02f3dfe..c4d901f84642 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -208,7 +208,6 @@ protected: void ImpSetEdgeInfoToAttr(); // Werte vom aEdgeInfo in den Pool kopieren public: - TYPEINFO_OVERRIDE(); SdrEdgeObj(); virtual ~SdrEdgeObj(); diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index d4bf3df574d7..d596d22a256e 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -115,7 +115,6 @@ private: void onGraphicChanged(); public: - TYPEINFO_OVERRIDE(); SdrGrafObj(); SdrGrafObj(const Graphic& rGrf); diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index 76b5c5b998ca..d8e16d5612af 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -47,7 +47,6 @@ protected: bool bRefPoint; // Ist ein RefPoint gesetzt? public: - TYPEINFO_OVERRIDE(); SdrObjGroup(); virtual ~SdrObjGroup(); diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index ad8edf9a18c3..2a079e49ed6f 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -85,7 +85,6 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo) override; public: - 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 59bfe442a49d..307c4d0b3fdf 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -38,7 +38,6 @@ class SVX_DLLPUBLIC SdrMediaObj : public SdrRectObj public: - TYPEINFO_OVERRIDE(); SdrMediaObj(); SdrMediaObj( const Rectangle& rRect ); diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 56ebce724092..2d0b49d6da46 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -65,7 +65,6 @@ protected: public: OUString GetStyleString(); - 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 c7cbe19daa87..fa3ba75e4110 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -41,7 +41,6 @@ protected: virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() override; public: - TYPEINFO_OVERRIDE(); SdrPageObj(SdrPage* pNewPage = nullptr); SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage = nullptr); virtual ~SdrPageObj(); diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index 56ee423c44ed..b1af6fb3f013 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -69,7 +69,6 @@ public: virtual void SetRectsDirty(bool bNotMyself = false) override; double GetBrightness() { return mdBrightness; } - 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 0b99911e3bee..1fc0a5a32663 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -64,7 +64,6 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo) override; public: - 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 6befde2a9125..78a7e53c4133 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -109,7 +109,6 @@ public: SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows); virtual ~SdrTableObj(); - TYPEINFO_OVERRIDE(); // table stuff diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index e40435c6213e..149963c4cdef 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -332,7 +332,6 @@ protected: virtual ~SdrTextObj(); public: - TYPEINFO_OVERRIDE(); bool IsInEditMode() const { return mbInEditMode; } diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 46e14b45be18..3ffe9698d431 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -64,7 +64,6 @@ private: const css::uno::Reference< css::lang::XMultiServiceFactory >& rxSFac ); public: - 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 e94b055eab95..3a23e73e381a 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -53,7 +53,6 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo) override; public: - TYPEINFO_OVERRIDE(); SdrVirtObj(SdrObject& rNewObj); virtual ~SdrVirtObj(); SdrObject& ReferencedObj(); diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 373eb6e37ee1..b459773b87b9 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -104,7 +104,6 @@ private: /// simple ActionChildInserted forwarder to have it on a central place static void impChildInserted(SdrObject& rChild); public: - TYPEINFO(); SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewUpList=nullptr); virtual ~SdrObjList(); @@ -457,7 +456,6 @@ protected: void lateInit(const SdrPage& rSrcPage, SdrModel* pNewModel = nullptr); public: - TYPEINFO_OVERRIDE(); explicit SdrPage(SdrModel& rNewModel, bool bMasterPage=false); virtual ~SdrPage(); virtual SdrPage* Clone() const override; diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 8dfcc6572e60..9f94e60abc52 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -269,7 +269,6 @@ protected: virtual ~SdrPaintView(); public: - TYPEINFO_OVERRIDE(); virtual void ClearPageView(); SdrModel* GetModel() const { return mpModel; } diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 4e4ebf0e0138..d90345c35561 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -60,7 +60,6 @@ protected: {} public: - TYPEINFO_OVERRIDE(); virtual ~SdrUndoAction(); virtual bool CanRepeat(SfxRepeatTarget& rView) const override; diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 198a7c577b5b..5414581e48af 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -166,7 +166,6 @@ protected: SvtAccessibilityOptions maAccessibilityOptions; public: - TYPEINFO_OVERRIDE(); explicit SdrView(SdrModel* pModel1, OutputDevice* pOut = nullptr); virtual ~SdrView(); diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index fc70dc2a3aad..79e174aa52ce 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -273,7 +273,6 @@ class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory, public: static SvxAbstractDialogFactory* Create(); - // define dtor as this will create typeinfo and in svx library and export vtable virtual ~SvxAbstractDialogFactory(); virtual SfxAbstractTabDialog* CreateTextTabDialog( vcl::Window* pParent, diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx index beebb7bf4194..00e2f0d1c089 100644 --- a/include/svx/svxgrahicitem.hxx +++ b/include/svx/svxgrahicitem.hxx @@ -30,7 +30,6 @@ class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem Graphic aGraphic; public: - 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 f018c3e1cec9..e2a5e9a5ebdd 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -32,7 +32,6 @@ enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBEST class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem { public: - 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=nullptr) const override; @@ -50,10 +49,12 @@ public: // sal_True=Linienaustrittsposition relativ // sal_False=Linienaustrittsposition absolut -class SdrCaptionEscIsRelItem: public SdrYesNoItem { +class SVX_DLLPUBLIC SdrCaptionEscIsRelItem: public SdrYesNoItem { public: SdrCaptionEscIsRelItem(bool bRel=true): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} SdrCaptionEscIsRelItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONESCISREL,rIn) {} + virtual ~SdrCaptionEscIsRelItem(); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; }; @@ -63,10 +64,12 @@ public: // 10000 = 100.00% = rechts bzw. unten // nur wenn SdrCaptionEscIsRelItem=TRUE -class SdrCaptionEscRelItem: public SfxInt32Item { +class SVX_DLLPUBLIC SdrCaptionEscRelItem: public SfxInt32Item { public: SdrCaptionEscRelItem(long nEscRel=5000): SfxInt32Item(SDRATTR_CAPTIONESCREL,nEscRel) {} SdrCaptionEscRelItem(SvStream& rIn) : SfxInt32Item(SDRATTR_CAPTIONESCREL,rIn) {} + virtual ~SdrCaptionEscRelItem(); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; }; diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx index 159758e72e66..b343a10771f6 100644 --- a/include/svx/sxcllitm.hxx +++ b/include/svx/sxcllitm.hxx @@ -29,10 +29,12 @@ // Nur bei Type3 und Type4 // Nur relevant, wenn SdrCaptionFitLineLenItem=FALSE -class SdrCaptionLineLenItem: public SdrMetricItem { +class SVX_DLLPUBLIC SdrCaptionLineLenItem: public SdrMetricItem { public: SdrCaptionLineLenItem(long nLineLen=0): SdrMetricItem(SDRATTR_CAPTIONLINELEN,nLineLen) {} SdrCaptionLineLenItem(SvStream& rIn) : SdrMetricItem(SDRATTR_CAPTIONLINELEN,rIn) {} + virtual ~SdrCaptionLineLenItem(); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; }; @@ -41,10 +43,12 @@ public: // Vorgabe (SdrCaptionLineLenItem) verwenden. // Nur bei Type3 und Type4 -class SdrCaptionFitLineLenItem: public SdrYesNoItem { +class SVX_DLLPUBLIC SdrCaptionFitLineLenItem: public SdrYesNoItem { public: SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} SdrCaptionFitLineLenItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,rIn) {} + virtual ~SdrCaptionFitLineLenItem(); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; }; #endif diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index 82ea0c593daa..223ac93cbc2d 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -30,7 +30,6 @@ enum SdrCaptionType {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4}; class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem { public: - 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=nullptr) const override; diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index eef809ff9e8f..a87ee4d8672e 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -34,7 +34,6 @@ enum SdrEdgeKind {SDREDGE_ORTHOLINES, class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem { public: - 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=nullptr) const override; diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx index d352c5860ff9..7e6e742ce4e7 100644 --- a/include/svx/sxfiitm.hxx +++ b/include/svx/sxfiitm.hxx @@ -29,7 +29,6 @@ class SdrFractionItem: public SfxPoolItem { Fraction nValue; public: - TYPEINFO_VISIBILITY_OVERRIDE( SVX_DLLPUBLIC ); SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {} SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} SdrFractionItem(sal_uInt16 nId, SvStream& rIn); diff --git a/include/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx index 5566d9215ccf..aff84cd8da1a 100644 --- a/include/svx/sxmbritm.hxx +++ b/include/svx/sxmbritm.hxx @@ -29,10 +29,12 @@ // TextUpsideDown, but easily operated) // laesst sich auch draggen, indem man den Masslinienabstand // (SdrMeasureLineDistItem) ueber die Bezugskante hinwegdraggt -class SdrMeasureBelowRefEdgeItem: public SdrYesNoItem { +class SVX_DLLPUBLIC SdrMeasureBelowRefEdgeItem: public SdrYesNoItem { public: SdrMeasureBelowRefEdgeItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,bOn) {} SdrMeasureBelowRefEdgeItem(SvStream& rIn): SdrYesNoItem(SDRATTR_MEASUREBELOWREFEDGE,rIn) {} + virtual ~SdrMeasureBelowRefEdgeItem(); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; }; #endif diff --git a/include/svx/sxmspitm.hxx b/include/svx/sxmspitm.hxx deleted file mode 100644 index 9859ebf48de2..000000000000 --- a/include/svx/sxmspitm.hxx +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SVX_SXMSPITM_HXX -#define INCLUDED_SVX_SXMSPITM_HXX - -#include <svx/svddef.hxx> -#include <svx/sdynitm.hxx> - -inline SdrYesNoItem makeSdrObjMoveProtectItem(bool bOn) { - return SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, bOn); -} - -inline SdrYesNoItem makeSdrObjSizeProtectItem(bool bOn) { - return SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, bOn); -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sxmsuitm.hxx b/include/svx/sxmsuitm.hxx deleted file mode 100644 index 9238913b8874..000000000000 --- a/include/svx/sxmsuitm.hxx +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_SVX_SXMSUITM_HXX -#define INCLUDED_SVX_SXMSUITM_HXX - -#include <svx/svddef.hxx> -#include <svx/sdynitm.hxx> - -inline SdrYesNoItem makeSdrMeasureShowUnitItem(bool bOn) { - return SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, bOn); -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx index b8c788ecce0b..2d156a5bdbf6 100644 --- a/include/svx/sxmtfitm.hxx +++ b/include/svx/sxmtfitm.hxx @@ -27,24 +27,30 @@ // Nail text down to a fix angle. // The text angle is independet of the dimension line. // Abrogate TextUpsideDown, TextRota90 and TextAutoAngle. (n.i.) -class SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem { +class SVX_DLLPUBLIC SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem { public: SdrMeasureTextIsFixedAngleItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn) {} SdrMeasureTextIsFixedAngleItem(SvStream& rIn): SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,rIn) {} + virtual ~SdrMeasureTextIsFixedAngleItem(); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; }; //Angle of the text in 1/100deg. 0=horizontal; read from left to right. (n.i.) -class SdrMeasureTextFixedAngleItem: public SdrAngleItem { +class SVX_DLLPUBLIC SdrMeasureTextFixedAngleItem: public SdrAngleItem { public: SdrMeasureTextFixedAngleItem(long nVal=0): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal) {} SdrMeasureTextFixedAngleItem(SvStream& rIn): SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,rIn) {} + virtual ~SdrMeasureTextFixedAngleItem(); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; }; // The decimal places used for the measure value -class SdrMeasureDecimalPlacesItem: public SfxInt16Item { +class SVX_DLLPUBLIC SdrMeasureDecimalPlacesItem: public SfxInt16Item { public: SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {} SdrMeasureDecimalPlacesItem(SvStream& rIn): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,rIn) {} + virtual ~SdrMeasureDecimalPlacesItem(); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; }; #endif diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index f1e9a8e9d24e..1df4cbc274de 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -31,7 +31,6 @@ enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BR class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem { public: - 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=nullptr) const override; @@ -51,7 +50,6 @@ public: class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem { public: - 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=nullptr) const override; diff --git a/include/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx index b03234452e42..226dbb747c3f 100644 --- a/include/svx/sxmtritm.hxx +++ b/include/svx/sxmtritm.hxx @@ -23,18 +23,22 @@ #include <svx/sdynitm.hxx> // text across the dimension line (90deg counter-clockwise rotation) -class SdrMeasureTextRota90Item: public SdrYesNoItem { +class SVX_DLLPUBLIC SdrMeasureTextRota90Item: public SdrYesNoItem { public: SdrMeasureTextRota90Item(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,bOn) {} SdrMeasureTextRota90Item(SvStream& rIn): SdrYesNoItem(SDRATTR_MEASURETEXTROTA90,rIn) {} + virtual ~SdrMeasureTextRota90Item(); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; }; // Turn the calculated TextRect through 180 deg // Text is also switched to the other side of the dimension line, if not Rota90 -class SdrMeasureTextUpsideDownItem: public SdrYesNoItem { +class SVX_DLLPUBLIC SdrMeasureTextUpsideDownItem: public SdrYesNoItem { public: SdrMeasureTextUpsideDownItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,bOn) {} SdrMeasureTextUpsideDownItem(SvStream& rIn): SdrYesNoItem(SDRATTR_MEASURETEXTUPSIDEDOWN,rIn) {} + virtual ~SdrMeasureTextUpsideDownItem(); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const override; }; #endif diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index a736124d66bd..bd333ffb55dd 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -28,7 +28,6 @@ // (based on the facts of the MapUnit of the model). This unity is displayed if necessary. class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem { public: - 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=nullptr) const override; diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx index 4b78bd0f23f6..0627c4eebb77 100644 --- a/include/svx/sxsiitm.hxx +++ b/include/svx/sxsiitm.hxx @@ -23,7 +23,6 @@ class SdrScaleItem: public SdrFractionItem { public: - 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 f0daf24904b6..63da66059f72 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -77,7 +77,6 @@ protected: void BreakSingle3DObj(E3dObject* pObj); public: - TYPEINFO_OVERRIDE(); E3dView(SdrModel* pModel, OutputDevice* pOut = nullptr); virtual ~E3dView(); diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index 02b91b2b243d..7324bdd129a9 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 5d7930da0310..5dd2d2c0b327 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -42,7 +42,7 @@ private: GraphicObject maGraphicObject; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 9ff93511668c..bb229b0806f8 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XColorItem() {} XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor); diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 12f632bd09c7..9604f97057a8 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -34,7 +34,8 @@ class SVX_DLLPUBLIC XFillStyleItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); + XFillStyleItem(css::drawing::FillStyle = css::drawing::FillStyle_SOLID); XFillStyleItem(SvStream& rIn); diff --git a/include/svx/xflasit.hxx b/include/svx/xflasit.hxx index ae84f2e2761f..0f308fb3d635 100644 --- a/include/svx/xflasit.hxx +++ b/include/svx/xflasit.hxx @@ -27,7 +27,6 @@ class SVX_DLLPUBLIC XFillAttrSetItem : public SfxSetItem { public: - 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 a3d7872f73df..2cc31a82b8fc 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -32,8 +32,7 @@ class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem { public: - TYPEINFO_OVERRIDE(); - + static SfxPoolItem* CreateDefault(); XFillBackgroundItem( bool bFill = false ); SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn ); diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index ef5c2ffb9089..b59053569a75 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -27,7 +27,7 @@ class SVX_DLLPUBLIC XFillBmpPosItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFillBmpPosItem( RECT_POINT eRP = RP_MM ); SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn ); diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index a8e9182f5228..687f084d5841 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFillBmpSizeLogItem( bool bLog = true ); SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn ); diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index 4286b205eda0..ce5a91d36795 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC XFillBmpSizeXItem : public SfxMetricItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFillBmpSizeXItem( long nSizeX = 0 ); SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn ); @@ -45,7 +45,7 @@ public: class SVX_DLLPUBLIC XFillBmpSizeYItem : public SfxMetricItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFillBmpSizeYItem( long nSizeY = 0 ); SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn ); diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index df3bd498de04..c218578e8cfe 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC XFillBmpTileItem : public SfxBoolItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFillBmpTileItem( bool bTile = true ); XFillBmpTileItem( SvStream& rIn ); diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index 61c01eb24b45..c8a01426bdd7 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetXItem : public SfxUInt16Item { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 ); SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn ); @@ -42,7 +42,7 @@ public: class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 ); SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn ); diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index 3fd4bd34653a..3b33a7231aac 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC XFillBmpStretchItem : public SfxBoolItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFillBmpStretchItem( bool bStretch = true ); XFillBmpStretchItem( SvStream& rIn ); diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index b83fd8614686..8eb851fe5d89 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetXItem : public SfxUInt16Item { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn ); @@ -42,7 +42,7 @@ public: class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn ); diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index 7e8b948833a5..3087d528b159 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XFillColorItem : public XColorItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 c7428ee87ad9..27ef1c068383 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -34,8 +34,8 @@ private: bool bEnabled; public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFillFloatTransparenceItem(); XFillFloatTransparenceItem(const OUString& rName, const XGradient& rGradient, bool bEnable = true ); XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, bool bEnable = true ); diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index f7cfaccfb1f3..b1fc72461745 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 e594a56aa4be..20cb18b399fd 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 26abe70db3d8..696127cb4466 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFillTransparenceItem: public SfxUInt16Item { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFillTransparenceItem(sal_uInt16 nFillTransparence = 0); XFillTransparenceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx index 19bd92c9cc15..6d2e5fbcdb9f 100644 --- a/include/svx/xftadit.hxx +++ b/include/svx/xftadit.hxx @@ -32,7 +32,8 @@ class SVX_DLLPUBLIC XFormTextAdjustItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); + XFormTextAdjustItem(XFormTextAdjust = XFT_CENTER); XFormTextAdjustItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xftdiit.hxx b/include/svx/xftdiit.hxx index 62c95a829698..7c6816622e35 100644 --- a/include/svx/xftdiit.hxx +++ b/include/svx/xftdiit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFormTextDistanceItem : public SfxMetricItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFormTextDistanceItem(long nDist = 0); XFormTextDistanceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xftmrit.hxx b/include/svx/xftmrit.hxx index b63ec7092a4f..15edc6bba6a8 100644 --- a/include/svx/xftmrit.hxx +++ b/include/svx/xftmrit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFormTextMirrorItem : public SfxBoolItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFormTextMirrorItem(bool bMirror = false); XFormTextMirrorItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx index cce332ecbe17..d214a3deb58d 100644 --- a/include/svx/xftouit.hxx +++ b/include/svx/xftouit.hxx @@ -32,7 +32,8 @@ class SVX_DLLPUBLIC XFormTextOutlineItem : public SfxBoolItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); + XFormTextOutlineItem(bool bOutline = false); XFormTextOutlineItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xftshcit.hxx b/include/svx/xftshcit.hxx index 2b07b54fa964..3077a9aa2899 100644 --- a/include/svx/xftshcit.hxx +++ b/include/svx/xftshcit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XFormTextShadowColorItem : public XColorItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFormTextShadowColorItem() {} XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor); XFormTextShadowColorItem(SvStream& rIn); diff --git a/include/svx/xftshit.hxx b/include/svx/xftshit.hxx index 2ee8e0eac04f..ddd255607943 100644 --- a/include/svx/xftshit.hxx +++ b/include/svx/xftshit.hxx @@ -33,7 +33,8 @@ class SVX_DLLPUBLIC XFormTextShadowItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); + XFormTextShadowItem(XFormTextShadow = XFTSHADOW_NONE); XFormTextShadowItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xftshtit.hxx b/include/svx/xftshtit.hxx index f68c153659a7..1922e026ea29 100644 --- a/include/svx/xftshtit.hxx +++ b/include/svx/xftshtit.hxx @@ -31,7 +31,8 @@ class XFormTextShadowTranspItem: public SfxUInt16Item { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); + XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0); XFormTextShadowTranspItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xftshxy.hxx b/include/svx/xftshxy.hxx index 88e277071d01..12a1e68e0146 100644 --- a/include/svx/xftshxy.hxx +++ b/include/svx/xftshxy.hxx @@ -32,7 +32,8 @@ class SVX_DLLPUBLIC XFormTextShadowXValItem : public SfxMetricItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); + XFormTextShadowXValItem(long nVal = 0); XFormTextShadowXValItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; @@ -48,7 +49,7 @@ public: class SVX_DLLPUBLIC XFormTextShadowYValItem : public SfxMetricItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFormTextShadowYValItem(long nVal = 0); XFormTextShadowYValItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xftstit.hxx b/include/svx/xftstit.hxx index d44cfe07d3f7..fdabc457640c 100644 --- a/include/svx/xftstit.hxx +++ b/include/svx/xftstit.hxx @@ -32,7 +32,8 @@ class SVX_DLLPUBLIC XFormTextStartItem : public SfxMetricItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); + XFormTextStartItem(long nStart = 0); XFormTextStartItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx index 5b8c276ad830..d880e1591afb 100644 --- a/include/svx/xgrscit.hxx +++ b/include/svx/xgrscit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XGradientStepCountItem: public SfxUInt16Item { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XGradientStepCountItem( sal_uInt16 nStepCount = 0 ); XGradientStepCountItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override; diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index 174067107071..170368f6ebb1 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -43,7 +43,6 @@ protected: void Detach() { nPalIndex = -1; } public: - 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 21048c5eb495..2986dcfdb9e5 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC XLineStyleItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XLineStyleItem(css::drawing::LineStyle = css::drawing::LineStyle_SOLID); XLineStyleItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index 2065fb20c6f0..cd0b4918a3aa 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XLineJointItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XLineJointItem( css::drawing::LineJoint eLineJoint = css::drawing::LineJoint_ROUND ); XLineJointItem( SvStream& rIn ); diff --git a/include/svx/xlnasit.hxx b/include/svx/xlnasit.hxx index e490c7afa8c4..1254d9b91686 100644 --- a/include/svx/xlnasit.hxx +++ b/include/svx/xlnasit.hxx @@ -28,7 +28,6 @@ class SVX_DLLPUBLIC XLineAttrSetItem : public SfxSetItem { public: - 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 2b3536440476..12e5750bc6f9 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XLineCapItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XLineCapItem(css::drawing::LineCap eLineCap = css::drawing::LineCap_BUTT); XLineCapItem(SvStream& rIn); diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index 22e2663da0a8..85591c429d9f 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XLineColorItem : public XColorItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 98e7e93f8d4c..8868558b4835 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 3fee06bf1a51..c912b37a732c 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XLineEndCenterItem(bool bEndCenter = false); XLineEndCenterItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index 760e4e3ddac3..930408b5b45c 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 e86074614327..5a3286d1d022 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XLineEndWidthItem : public SfxMetricItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT); XLineEndWidthItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index dba0b29baf6b..bef563ee00a4 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XLineStartCenterItem(bool bStartCenter = false); XLineStartCenterItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index 1a142bd04b8a..58b9200a59f2 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 02038de75c47..ecd29aed3afc 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -31,7 +31,7 @@ class SVX_DLLPUBLIC XLineStartWidthItem : public SfxMetricItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT); XLineStartWidthItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx index 3fa23537879e..aac2a2934410 100644 --- a/include/svx/xlntrit.hxx +++ b/include/svx/xlntrit.hxx @@ -32,7 +32,7 @@ class SVX_DLLPUBLIC XLineTransparenceItem: public SfxUInt16Item { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XLineTransparenceItem(sal_uInt16 nLineTransparence = 0); XLineTransparenceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index 0a46ddc8cc08..fa46c5ece9ee 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC XLineWidthItem : public SfxMetricItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XLineWidthItem(long nWidth = 0); XLineWidthItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index 86622f93ace5..7d064643c39d 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -28,7 +28,7 @@ class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); 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 8cd42a476517..dc9885ccba9d 100644 --- a/include/svx/xtextit0.hxx +++ b/include/svx/xtextit0.hxx @@ -33,7 +33,7 @@ class SVX_DLLPUBLIC XFormTextStyleItem : public SfxEnumItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFormTextStyleItem(XFormTextStyle = XFT_NONE); XFormTextStyleItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; @@ -54,7 +54,7 @@ public: class SVX_DLLPUBLIC XFormTextHideFormItem : public SfxBoolItem { public: - TYPEINFO_OVERRIDE(); + static SfxPoolItem* CreateDefault(); XFormTextHideFormItem(bool bHide = false); XFormTextHideFormItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override; diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index 48619f242bc0..24a7d72270b7 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_OVERRIDE(); + static SfxPoolItem* CreateDefault(); SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER ); SvxZoomSliderItem( const SvxZoomSliderItem& ); |