diff options
Diffstat (limited to 'svx/source')
84 files changed, 245 insertions, 302 deletions
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx index ba3859fe6bdd..76bc4625b598 100644 --- a/svx/source/accessibility/AccessibleTextEventQueue.hxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx @@ -23,7 +23,6 @@ #include <memory> #include <list> #include <algorithm> -#include <tools/rtti.hxx> class SfxHint; class SdrHint; diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index a7b381ad2a12..502eeb98d95c 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -25,11 +25,11 @@ #include <com/sun/star/frame/status/LeftRightMargin.hpp> #include <com/sun/star/frame/status/UpperLowerMargin.hpp> -TYPEINIT1_AUTOFACTORY(SvxPagePosSizeItem, SfxPoolItem); -TYPEINIT1_AUTOFACTORY(SvxLongLRSpaceItem, SfxPoolItem); -TYPEINIT1_AUTOFACTORY(SvxLongULSpaceItem, SfxPoolItem); -TYPEINIT1(SvxColumnItem, SfxPoolItem); -TYPEINIT1(SvxObjectItem, SfxPoolItem); +SfxPoolItem* SvxPagePosSizeItem::CreateDefault() { return new SvxPagePosSizeItem; } +SfxPoolItem* SvxLongLRSpaceItem::CreateDefault() { return new SvxLongLRSpaceItem; } +SfxPoolItem* SvxLongULSpaceItem::CreateDefault() { return new SvxLongULSpaceItem; } +SfxPoolItem* SvxColumnItem::CreateDefault() { return new SvxColumnItem; } +SfxPoolItem* SvxObjectItem::CreateDefault() { DBG_ASSERT(false, "No SvxObjectItem factory available"); return 0; } /* SvxLongLRSpaceItem */ diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx index ff040edd7095..331b835a1d38 100644 --- a/svx/source/dialog/svxgrahicitem.cxx +++ b/svx/source/dialog/svxgrahicitem.cxx @@ -18,7 +18,6 @@ */ #include "svx/svxgrahicitem.hxx" -TYPEINIT1(SvxGraphicItem,SfxPoolItem); SvxGraphicItem::SvxGraphicItem( sal_uInt16 _nWhich, const Graphic& rGraphic ) : SfxPoolItem( _nWhich ), aGraphic( rGraphic ) { diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index 35beab7b13be..5f493084007e 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -34,7 +34,6 @@ sdr::contact::ViewContact* E3dCubeObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfE3dCube(*this); } -TYPEINIT1(E3dCubeObj, E3dCompoundObject); E3dCubeObj::E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize) : E3dCompoundObject(rDefault) diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index add71f23cf5f..1f6150ada67d 100644 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -35,7 +35,6 @@ #include <drawinglayer/geometry/viewinformation3d.hxx> #include <svx/e3dsceneupdater.hxx> -TYPEINIT1(E3dDragMethod, SdrDragMethod); E3dDragMethod::E3dDragMethod ( SdrDragView &_rView, @@ -251,7 +250,6 @@ void E3dDragMethod::CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlay } } -TYPEINIT1(E3dDragRotate, E3dDragMethod); E3dDragRotate::E3dDragRotate(SdrDragView &_rView, const SdrMarkList& rMark, @@ -432,7 +430,6 @@ Pointer E3dDragRotate::GetSdrDragPointer() const // 3D scenes. If a 3D-scene itself moved, then this drag method will drag // not be used. -TYPEINIT1(E3dDragMove, E3dDragMethod); E3dDragMove::E3dDragMove(SdrDragView &_rView, const SdrMarkList& rMark, diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx index 9d6dcfcff40d..e194dd661ef1 100644 --- a/svx/source/engine3d/e3dundo.cxx +++ b/svx/source/engine3d/e3dundo.cxx @@ -24,7 +24,6 @@ #include <svx/scene3d.hxx> #include <svx/e3dsceneupdater.hxx> -TYPEINIT1(E3dUndoAction, SfxUndoAction); E3dUndoAction::~E3dUndoAction () { @@ -37,7 +36,6 @@ bool E3dUndoAction::CanRepeat(SfxRepeatTarget&) const return false; } -TYPEINIT1(E3dRotateUndoAction, E3dUndoAction); // Undo destructor for 3D-Rotation @@ -61,7 +59,6 @@ void E3dRotateUndoAction::Redo () pMy3DObj->SetTransform(aMyNewRotation); } -TYPEINIT1(E3dAttributesUndoAction, SdrUndoAction); E3dAttributesUndoAction::E3dAttributesUndoAction( SdrModel &rModel, E3dObject* pInObject, diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index 29136bbcbcf0..84f71a4d4105 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -54,7 +54,6 @@ sdr::properties::BaseProperties* E3dExtrudeObj::CreateObjectSpecificProperties() -TYPEINIT1(E3dExtrudeObj, E3dCompoundObject); // Constructor creates a two cover surface tools::PolyPolygon and (point-count 1) side // surfaces rectangles from the passed PolyPolygon diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index 1159bdd7dae9..bc4e87f0970a 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -52,7 +52,6 @@ sdr::properties::BaseProperties* E3dLatheObj::CreateObjectSpecificProperties() -TYPEINIT1(E3dLatheObj, E3dCompoundObject); // Constructor from 3D polygon, scale is the conversion factor for the coordinates diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 203455dcb7e3..9d67c722261b 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -84,7 +84,6 @@ using namespace com::sun::star; // List for 3D-Objects -TYPEINIT1(E3dObjList, SdrObjList); E3dObjList::E3dObjList(SdrModel* pNewModel, SdrPage* pNewPage, E3dObjList* pNewUpList) : SdrObjList(pNewModel, pNewPage, pNewUpList) @@ -181,7 +180,6 @@ sdr::properties::BaseProperties* E3dObject::CreateObjectSpecificProperties() -TYPEINIT1(E3dObject, SdrAttrObj); E3dObject::E3dObject() : maSubList(), @@ -776,7 +774,6 @@ sdr::properties::BaseProperties* E3dCompoundObject::CreateObjectSpecificProperti -TYPEINIT1(E3dCompoundObject, E3dObject); E3dCompoundObject::E3dCompoundObject() : E3dObject(), diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index e2ab870a8add..df5d6a45bea1 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -25,7 +25,6 @@ #include <basegfx/polygon/b3dpolygon.hxx> #include <basegfx/polygon/b3dpolygontools.hxx> -TYPEINIT1(E3dPolygonObj, E3dCompoundObject); // DrawContact section diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx index 379abcdfb5fc..d6aac7a216bb 100644 --- a/svx/source/engine3d/polysc3d.cxx +++ b/svx/source/engine3d/polysc3d.cxx @@ -34,7 +34,6 @@ #include <svx/xtable.hxx> #include <svx/xlnwtit.hxx> -TYPEINIT1(E3dPolyScene, E3dScene); E3dPolyScene::E3dPolyScene() : E3dScene() diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 880d5cd6acc2..911aca6e1820 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -182,7 +182,6 @@ sdr::contact::ViewContact* E3dScene::CreateObjectSpecificViewContact() -TYPEINIT1(E3dScene, E3dObject); E3dScene::E3dScene() : E3dObject(), diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index a83054a6beff..b7d6cc935245 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -50,7 +50,6 @@ sdr::properties::BaseProperties* E3dSphereObj::CreateObjectSpecificProperties() -TYPEINIT1(E3dSphereObj, E3dCompoundObject); // Build Sphere from polygon facets in latitude and longitude diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 1d934264f95c..1044492d5ceb 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -70,7 +70,6 @@ using namespace com::sun::star; #define ITEMVALUE(ItemSet,Id,Cast) (static_cast<const Cast&>((ItemSet).Get(Id))).GetValue() -TYPEINIT1(E3dView, SdrView); // Migrate Marking diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 20b8aca7eb10..ac2b744ad6e1 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -527,20 +527,6 @@ void DbGridColumn::ImplInitWindow( vcl::Window& rParent, const InitWindowFacet _ //= cell controls -TYPEINIT0( DbCellControl ) -TYPEINIT1( DbLimitedLengthField, DbCellControl ) -TYPEINIT1( DbTextField, DbLimitedLengthField ) -TYPEINIT1( DbFormattedField, DbLimitedLengthField ) -TYPEINIT1( DbCheckBox, DbCellControl ) -TYPEINIT1( DbComboBox, DbCellControl ) -TYPEINIT1( DbListBox, DbCellControl ) -TYPEINIT1( DbPatternField, DbCellControl ) -TYPEINIT1( DbSpinField, DbCellControl ) -TYPEINIT1( DbDateField, DbSpinField ) -TYPEINIT1( DbTimeField, DbSpinField ) -TYPEINIT1( DbCurrencyField, DbSpinField ) -TYPEINIT1( DbNumericField, DbSpinField ) -TYPEINIT1( DbFilterField, DbCellControl ) DbCellControl::DbCellControl( DbGridColumn& _rColumn, bool /*_bText*/ ) @@ -3140,7 +3126,6 @@ IMPL_LINK_NOARG_TYPED(DbFilterField, OnClick, VclPtr<CheckBox>, void) } } -TYPEINIT0(FmXGridCell); @@ -3516,7 +3501,6 @@ void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& } } -TYPEINIT1(FmXDataCell, FmXGridCell); void FmXDataCell::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect, const Reference< css::sdb::XColumn >& _rxField, @@ -3533,7 +3517,6 @@ void FmXDataCell::UpdateFromColumn() m_pCellControl->UpdateFromField(xField, m_pColumn->GetParent().getNumberFormatter()); } -TYPEINIT1(FmXTextCell, FmXDataCell); FmXTextCell::FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl ) :FmXDataCell( pColumn, _rControl ) @@ -4541,7 +4524,6 @@ void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Win } } -TYPEINIT1(FmXFilterCell, FmXGridCell); FmXFilterCell::FmXFilterCell(DbGridColumn* pColumn, DbCellControl* pControl ) :FmXGridCell( pColumn, pControl ) diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 4626178567ea..2f413e65c552 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -135,14 +135,12 @@ OLocalExchange* OFilterExchangeHelper::createExchange() const } -TYPEINIT0(FmFilterData); Image FmFilterData::GetImage() const { return Image(); } -TYPEINIT1(FmParentData, FmFilterData); FmParentData::~FmParentData() { @@ -152,7 +150,6 @@ FmParentData::~FmParentData() } -TYPEINIT1(FmFormItem, FmParentData); Image FmFormItem::GetImage() const { @@ -161,7 +158,6 @@ Image FmFormItem::GetImage() const } -TYPEINIT1(FmFilterItems, FmParentData); FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) const { @@ -186,7 +182,6 @@ Image FmFilterItems::GetImage() const } -TYPEINIT1(FmFilterItem, FmFilterData); FmFilterItem::FmFilterItem( FmFilterItems* pParent, const OUString& aFieldName, @@ -500,7 +495,6 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) m_pModel->Insert( insertPos, pFilterItems ); } -TYPEINIT1(FmFilterModel, FmParentData); FmFilterModel::FmFilterModel() :FmParentData(nullptr, OUString()) diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 67b033b54a5a..53bb185cbe8c 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -173,7 +173,6 @@ void FmEntryDataList::clear() maEntryDataList.clear(); } -TYPEINIT0( FmEntryData ); FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface >& _rxIFace ) :pParent( pParentData ) @@ -254,7 +253,6 @@ bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData ) return true; } -TYPEINIT1( FmFormData, FmEntryData ); FmFormData::FmFormData( const Reference< XForm >& _rxForm, @@ -316,7 +314,6 @@ bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData ) return FmEntryData::IsEqualWithoutChildren( pFormData ); } -TYPEINIT1( FmControlData, FmEntryData ); FmControlData::FmControlData( const Reference< XFormComponent >& _rxComponent, diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx index 440ec5c40593..e8f319c5380e 100644 --- a/svx/source/form/fmitems.cxx +++ b/svx/source/form/fmitems.cxx @@ -25,7 +25,6 @@ // class FmInterfaceItem -TYPEINIT1(FmInterfaceItem, SfxPoolItem); bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index 03ae492e69b3..149e757c0bdb 100644 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -34,7 +34,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::container::XNameContainer; using namespace svxform; -TYPEINIT1(FmFormModel, SdrModel); struct FmFormModelImplData { diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 5d93ce213f27..3ce8975084d4 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -55,7 +55,6 @@ using namespace ::com::sun::star::script; using namespace ::com::sun::star::container; using namespace ::svxform; -TYPEINIT1(FmFormObj, SdrUnoObj); FmFormObj::FmFormObj(const OUString& rModelName) :SdrUnoObj ( rModelName ) diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 34ed152f8500..41a1aef3b029 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -52,7 +52,6 @@ using com::sun::star::uno::UNO_QUERY; using com::sun::star::container::XChild; using com::sun::star::container::XNameContainer; -TYPEINIT1(FmFormPage, SdrPage); FmFormPage::FmFormPage(FmFormModel& rModel, bool bMasterPage) diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index a0b4115d11d2..e9e39a0cf100 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -201,7 +201,6 @@ void FmFormShell::InitInterface_Impl() FM_UI_FEATURE_TB_FORMDESIGN); } -TYPEINIT1(FmFormShell,SfxShell) FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView ) :SfxShell(_pParent) diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 788d7d62dbd5..d3ff3b1ef636 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -80,7 +80,6 @@ using namespace ::svx; -TYPEINIT1(FmFormView, E3dView); FmFormView::FmFormView( FmFormModel* pModel, OutputDevice* pOut ) diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 891d904928a0..42ba89a242ad 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -62,7 +62,6 @@ class FmFilterData OUString m_aText; public: - TYPEINFO(); FmFilterData(FmParentData* pParent = nullptr, const OUString& rText = OUString()) :m_pParent( pParent ) ,m_aText( rText ) @@ -83,7 +82,6 @@ protected: ::std::vector< FmFilterData* > m_aChildren; public: - TYPEINFO_OVERRIDE(); FmParentData(FmParentData* pParent, const OUString& rText) : FmFilterData(pParent, rText) {} @@ -100,7 +98,6 @@ class FmFormItem : public FmParentData css::uno::Reference< css::form::runtime::XFilterController > m_xFilterController; public: - TYPEINFO_OVERRIDE(); FmFormItem( FmParentData* _pParent, const css::uno::Reference< css::form::runtime::XFormController > & _xController, @@ -124,7 +121,6 @@ public: class FmFilterItems : public FmParentData { public: - TYPEINFO_OVERRIDE(); FmFilterItems() : FmParentData(nullptr, OUString()) {} FmFilterItems(FmFormItem* pParent, const OUString& rText ) : FmParentData(pParent, rText) {} @@ -139,7 +135,6 @@ class FmFilterItem : public FmFilterData const sal_Int32 m_nComponentIndex; public: - TYPEINFO_OVERRIDE(); FmFilterItem( FmFilterItems* pParent, const OUString& aFieldName, @@ -166,7 +161,6 @@ class FmFilterModel : public FmParentData FmFilterItems* m_pCurrentItems; public: - TYPEINFO_OVERRIDE(); FmFilterModel(); virtual ~FmFilterModel(); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index f7a7d1abc922..c3d225123c28 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -152,7 +152,6 @@ protected: void newObject( const css::uno::Reference< css::uno::XInterface >& _rxIFace ); public: - TYPEINFO(); FmEntryData( FmEntryData* pParentData, const css::uno::Reference< css::uno::XInterface >& _rIFace ); FmEntryData( const FmEntryData& rEntryData ); @@ -240,7 +239,6 @@ class FmFormData : public FmEntryData css::uno::Reference< css::container::XContainer > m_xContainer; public: - TYPEINFO_OVERRIDE(); FmFormData( const css::uno::Reference< css::form::XForm >& _rxForm, @@ -267,7 +265,6 @@ class FmControlData : public FmEntryData Image GetImage(const ImageList& ilNavigatorImages) const; public: - TYPEINFO_OVERRIDE(); FmControlData( const css::uno::Reference< css::form::XFormComponent >& _rxComponent, diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index a9f0d3e40527..9167569f4c06 100644 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.hxx @@ -29,7 +29,6 @@ class FmInterfaceItem : public SfxPoolItem css::uno::Reference< css::uno::XInterface > xInterface; public: - TYPEINFO_OVERRIDE(); FmInterfaceItem( const sal_uInt16 nId, const css::uno::Reference< css::uno::XInterface >& rxInterface ) :SfxPoolItem( nId ) diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 577d027e6211..a4fe85c01a21 100644 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -50,7 +50,6 @@ public: FmFormObj(const OUString& rModelName); FmFormObj(); - TYPEINFO_VISIBILITY_OVERRIDE(SAL_DLLPRIVATE); SAL_DLLPRIVATE const css::uno::Reference< css::container::XIndexContainer>& GetOriginalParent() const { return m_xParent; } diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 44ca4d57e391..04082d3ca5e6 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -44,7 +44,6 @@ #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> #include <tools/diagnose_ex.h> -#include <tools/rtti.hxx> class DbCellControl; class Edit; @@ -261,7 +260,6 @@ protected: public: - TYPEINFO(); DbCellControl(DbGridColumn& _rColumn, bool _bText = true); virtual ~DbCellControl(); @@ -364,7 +362,6 @@ inline void DbCellControl::unlockValueProperty() class DbLimitedLengthField : public DbCellControl { public: - TYPEINFO_OVERRIDE(); protected: DbLimitedLengthField( DbGridColumn& _rColumn ); @@ -392,7 +389,6 @@ protected: virtual ~DbTextField( ); public: - TYPEINFO_OVERRIDE(); DbTextField(DbGridColumn& _rColumn); ::svt::IEditImplementation* GetEditImplementation() { return m_pEdit; } @@ -423,7 +419,6 @@ protected: public: - TYPEINFO_OVERRIDE(); DbFormattedField(DbGridColumn& _rColumn); virtual ~DbFormattedField(); @@ -446,7 +441,6 @@ protected: class DbCheckBox : public DbCellControl { public: - TYPEINFO_OVERRIDE(); DbCheckBox(DbGridColumn& _rColumn); virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; @@ -468,7 +462,6 @@ class DbComboBox : public DbCellControl { public: - TYPEINFO_OVERRIDE(); DbComboBox(DbGridColumn& _rColumn); virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; @@ -496,7 +489,6 @@ class DbListBox :public DbCellControl css::uno::Sequence< OUString > m_aValueList; public: - TYPEINFO_OVERRIDE(); DbListBox(DbGridColumn& _rColumn); virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; @@ -521,7 +513,6 @@ protected: class DbPatternField : public DbCellControl { public: - TYPEINFO_OVERRIDE(); DbPatternField( DbGridColumn& _rColumn, const css::uno::Reference<css::uno::XComponentContext>& _rContext ); virtual void Init( vcl::Window& rParent, const css::uno::Reference< css::sdbc::XRowSet >& xCursor ) override; virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; @@ -551,7 +542,6 @@ private: sal_Int16 m_nStandardAlign; public: - TYPEINFO_OVERRIDE(); protected: DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign = css::awt::TextAlign::RIGHT ); @@ -572,7 +562,6 @@ protected: class DbDateField : public DbSpinField { public: - TYPEINFO_OVERRIDE(); DbDateField(DbGridColumn& _rColumn); virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; @@ -597,7 +586,6 @@ protected: class DbTimeField : public DbSpinField { public: - TYPEINFO_OVERRIDE(); DbTimeField(DbGridColumn& _rColumn); virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; @@ -624,7 +612,6 @@ class DbCurrencyField : public DbSpinField sal_Int16 m_nScale; public: - TYPEINFO_OVERRIDE(); DbCurrencyField(DbGridColumn& _rColumn); virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; @@ -651,7 +638,6 @@ protected: class DbNumericField : public DbSpinField { public: - TYPEINFO_OVERRIDE(); DbNumericField(DbGridColumn& _rColumn); virtual OUString GetFormatText(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter, Color** ppColor = nullptr) override; virtual void UpdateFromField(const css::uno::Reference< css::sdb::XColumn >& _rxField, const css::uno::Reference< css::util::XNumberFormatter >& xFormatter) override; @@ -686,7 +672,6 @@ class DbFilterField bool m_bBound : 1; public: - TYPEINFO_OVERRIDE(); DbFilterField(const css::uno::Reference< css::uno::XComponentContext >& rxContext, DbGridColumn& _rColumn); virtual ~DbFilterField(); @@ -742,7 +727,6 @@ protected: virtual ~FmXGridCell(); public: - TYPEINFO(); FmXGridCell( DbGridColumn* pColumn, DbCellControl* pControl ); void init(); @@ -824,7 +808,6 @@ private: class FmXDataCell : public FmXGridCell { public: - TYPEINFO_OVERRIDE(); FmXDataCell( DbGridColumn* pColumn, DbCellControl& _rControl ) :FmXGridCell( pColumn, &_rControl ) { @@ -863,7 +846,6 @@ protected: bool m_bFastPaint; public: - TYPEINFO_OVERRIDE(); FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl ); virtual void PaintFieldToCell(OutputDevice& rDev, @@ -1089,7 +1071,6 @@ class FmXFilterCell :public FmXGridCell protected: virtual ~FmXFilterCell(); public: - TYPEINFO_OVERRIDE(); FmXFilterCell(DbGridColumn* pColumn = nullptr, DbCellControl* pControl = nullptr); diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index 5ba83719d0cb..fd64d96c6aa9 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -25,7 +25,8 @@ using namespace ::com::sun::star; -TYPEINIT1(SvxSmartTagItem, SfxPoolItem); + +SfxPoolItem* SvxSmartTagItem::CreateDefault() { DBG_ASSERT(false, "No SvxSmartTagItem factory available"); return 0; } SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId, const css::uno::Sequence < css::uno::Sequence< css::uno::Reference< css::smarttags::XSmartTagAction > > >& rActionComponentsSequence, diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index 0a1577d1fbe7..54720b99e83e 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -40,8 +40,9 @@ using namespace ::com::sun::star; -TYPEINIT1_FACTORY( SvxOrientationItem, SfxEnumItem, new SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0) ); -TYPEINIT1_FACTORY( SvxMarginItem, SfxPoolItem, new SvxMarginItem(0) ); + +SfxPoolItem* SvxOrientationItem::CreateDefault() { return new SvxOrientationItem(SVX_ORIENTATION_STANDARD, 0) ;} +SfxPoolItem* SvxMarginItem::CreateDefault() { return new SvxMarginItem(0) ;} SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation, const sal_uInt16 nId): diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 39f1a5563635..0815388e96a4 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -31,14 +31,8 @@ using namespace ::com::sun::star; -TYPEINIT1_FACTORY(SvxChartStyleItem, SfxEnumItem, new SvxChartStyleItem(CHSTYLE_2D_LINE, 0)); -TYPEINIT1(SvxChartDataDescrItem, SfxEnumItem); -TYPEINIT1(SvxChartTextOrderItem, SfxEnumItem); -TYPEINIT1(SvxChartTextOrientItem, SfxEnumItem); -TYPEINIT1(SvxChartIndicateItem, SfxEnumItem); -TYPEINIT1(SvxChartKindErrorItem, SfxEnumItem); -TYPEINIT1(SvxChartRegressItem, SfxEnumItem); -TYPEINIT1_FACTORY(SvxDoubleItem, SfxPoolItem, new SvxDoubleItem(0.0, 0)); + +SfxPoolItem* SvxDoubleItem::CreateDefault() { return new SvxDoubleItem(0.0, 0);} SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) : SfxEnumItem(nId, (sal_uInt16)eStyle) diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index 9835dfae0215..63a2a1b94090 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -33,7 +33,7 @@ struct SvxClipboardFormatItem_Impl SvxClipboardFormatItem_Impl( const SvxClipboardFormatItem_Impl& ); }; -TYPEINIT1_FACTORY( SvxClipboardFormatItem, SfxPoolItem , new SvxClipboardFormatItem(0)); +SfxPoolItem* SvxClipboardFormatItem::CreateDefault() { return new SvxClipboardFormatItem(0); }; SvxClipboardFormatItem_Impl::SvxClipboardFormatItem_Impl( const SvxClipboardFormatItem_Impl& rCpy ) diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 952438888a3b..ae492779761b 100644 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -23,7 +23,6 @@ using namespace ::std; using namespace com::sun::star; -TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new SdrCustomShapeGeometryItem); SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem() : SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 423cab1e6fb8..213189d8028a 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -23,12 +23,13 @@ using namespace ::com::sun::star; -TYPEINIT1_FACTORY( SvxColorListItem, SfxPoolItem , new SvxColorListItem ); -TYPEINIT1_FACTORY( SvxGradientListItem, SfxPoolItem , new SvxGradientListItem ); -TYPEINIT1_FACTORY( SvxHatchListItem, SfxPoolItem , new SvxHatchListItem ); -TYPEINIT1_FACTORY( SvxBitmapListItem, SfxPoolItem , new SvxBitmapListItem ); -TYPEINIT1_FACTORY( SvxDashListItem, SfxPoolItem , new SvxDashListItem ); -TYPEINIT1_FACTORY( SvxLineEndListItem, SfxPoolItem , new SvxLineEndListItem ); + +SfxPoolItem* SvxColorListItem::CreateDefault() { return new SvxColorListItem ;} +SfxPoolItem* SvxGradientListItem::CreateDefault() { return new SvxGradientListItem ;} +SfxPoolItem* SvxHatchListItem::CreateDefault() { return new SvxHatchListItem ;} +SfxPoolItem* SvxBitmapListItem::CreateDefault() { return new SvxBitmapListItem ;} +SfxPoolItem* SvxDashListItem::CreateDefault() { return new SvxDashListItem ;} +SfxPoolItem* SvxLineEndListItem::CreateDefault() { return new SvxLineEndListItem ;} SvxColorListItem::SvxColorListItem() { diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index 80ecad61aab2..d41b77818a31 100644 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -24,8 +24,6 @@ using namespace ::com::sun::star; -TYPEINIT1_FACTORY(SvxB3DVectorItem, SfxPoolItem, new SvxB3DVectorItem); - SvxB3DVectorItem::SvxB3DVectorItem() diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx index 095a4c80663e..51d0cf7f1ba8 100644 --- a/svx/source/items/galleryitem.cxx +++ b/svx/source/items/galleryitem.cxx @@ -23,7 +23,8 @@ #include <com/sun/star/uno/Sequence.hxx> -TYPEINIT1_AUTOFACTORY( SvxGalleryItem, SfxPoolItem ); + +SfxPoolItem* SvxGalleryItem::CreateDefault() { return new SvxGalleryItem; } SvxGalleryItem::SvxGalleryItem() : m_nType( css::gallery::GalleryItemType::EMPTY ) diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index f14d683b0224..8b8f1852f35f 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -26,7 +26,8 @@ -TYPEINIT1_FACTORY(SvxHyperlinkItem, SfxPoolItem, new SvxHyperlinkItem(0)); + +SfxPoolItem* SvxHyperlinkItem::CreateDefault() { return new SvxHyperlinkItem(0);} #define HYPERLINKFF_MARKER 0x599401FE diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index a6348bc99234..630218127468 100644 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx @@ -21,7 +21,6 @@ -TYPEINIT1(SvxNumberInfoItem, SfxPoolItem); #define INIT(pNum,eVal,nDouble,rStr) \ SfxPoolItem ( nId ), \ diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index 6468acac3189..6153f0e75776 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -31,7 +31,8 @@ using namespace ::com::sun::star; -TYPEINIT1_FACTORY( SvxPageItem, SfxPoolItem , new SvxPageItem(0)); + +SfxPoolItem* SvxPageItem::CreateDefault() { return new SvxPageItem(0);} SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 8139f0fce2ae..97cc424b3f70 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -24,9 +24,10 @@ -TYPEINIT1_FACTORY(SvxPostItAuthorItem, SfxStringItem, new SvxPostItAuthorItem(0)); -TYPEINIT1_FACTORY(SvxPostItDateItem, SfxStringItem, new SvxPostItDateItem(0)); -TYPEINIT1_FACTORY(SvxPostItTextItem, SfxStringItem, new SvxPostItTextItem(0)); + +SfxPoolItem* SvxPostItAuthorItem::CreateDefault() { return new SvxPostItAuthorItem(0); } +SfxPoolItem* SvxPostItDateItem::CreateDefault() { return new SvxPostItDateItem(0); } +SfxPoolItem* SvxPostItTextItem::CreateDefault() { return new SvxPostItTextItem(0); } SvxPostItAuthorItem::SvxPostItAuthorItem( sal_uInt16 _nWhich ) { diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index f35601038b0f..b5d622eb1aa7 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -36,8 +36,8 @@ using namespace ::com::sun::star; -TYPEINIT1_FACTORY(SvxRotateModeItem, SfxEnumItem, new SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD, 0)); +SfxPoolItem* SvxRotateModeItem::CreateDefault() { return new SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD, 0);} // SvxRotateModeItem - orientation with turned text diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index 7c6cde664c92..ea349097cd44 100644 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -26,7 +26,8 @@ #include <osl/diagnose.h> -TYPEINIT1_FACTORY(SvxViewLayoutItem,SfxUInt16Item, new SvxViewLayoutItem); + +SfxPoolItem* SvxViewLayoutItem::CreateDefault() { return new SvxViewLayoutItem; } #define VIEWLAYOUT_PARAM_COLUMNS "Columns" #define VIEWLAYOUT_PARAM_BOOKMODE "BookMode" diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index 5d776322fdf9..6b8cb85617a7 100644 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -26,7 +26,8 @@ -TYPEINIT1_FACTORY(SvxZoomSliderItem,SfxUInt16Item, new SvxZoomSliderItem); + +SfxPoolItem* SvxZoomSliderItem::CreateDefault() { return new SvxZoomSliderItem; } #define ZOOMSLIDER_PARAM_CURRENTZOOM "Columns" #define ZOOMSLIDER_PARAM_SNAPPINGPOINTS "SnappingPoints" diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 674b3ef4a5f4..ea0ffce344cd 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -91,7 +91,7 @@ namespace sdr void AttributeProperties::ImpRemoveStyleSheet() { // Check type since it is destroyed when the type is deleted - if(GetStyleSheet() && HAS_BASE(SfxStyleSheet, mpStyleSheet)) + if(GetStyleSheet() && dynamic_cast<const SfxStyleSheet *>(mpStyleSheet) != nullptr) { EndListening(*mpStyleSheet); EndListening(mpStyleSheet->GetPool()); @@ -475,7 +475,7 @@ namespace sdr void AttributeProperties::ForceStyleToHardAttributes() { - if(GetStyleSheet() && HAS_BASE(SfxStyleSheet, mpStyleSheet)) + if(GetStyleSheet() && dynamic_cast<const SfxStyleSheet *>(mpStyleSheet) != nullptr) { // prepare copied, new itemset, but WITHOUT parent GetObjectItemSet(); @@ -553,7 +553,7 @@ namespace sdr // to register as listener to that new StyleSheet. if(pModel && !rObj.IsInDestruction()) { - if(HAS_BASE(SfxStyleSheet, GetStyleSheet())) + if(dynamic_cast<const SfxStyleSheet *>(GetStyleSheet()) != nullptr) { pNewStSh = static_cast<SfxStyleSheet*>(pModel->GetStyleSheetPool()->Find( GetStyleSheet()->GetParent(), GetStyleSheet()->GetFamily())); diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index 2ae586339f6b..8781e6a413ff 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -23,7 +23,6 @@ #include <svx/svddef.hxx> #include <editeng/eeitem.hxx> #include <svx/svdomeas.hxx> -#include <svx/sxmsuitm.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnedit.hxx> @@ -108,7 +107,7 @@ namespace sdr //#71958# by default, the show units Bool-Item is set as hard // attribute to sal_True to avoid confusion when copying SdrMeasureObj's // from one application to another - mpItemSet->Put(makeSdrMeasureShowUnitItem(true)); + mpItemSet->Put(SdrYesNoItem(SDRATTR_MEASURESHOWUNIT, true)); basegfx::B2DPolygon aNewPolygon; aNewPolygon.append(basegfx::B2DPoint(100.0, 0.0)); diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 9b4a045bb62a..794c2ec6f284 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -554,7 +554,7 @@ namespace sdr if(rObj.HasText()) { const svx::ITextProvider& rTextProvider(getTextProvider()); - if(HAS_BASE(SfxStyleSheet, &rBC)) + if(dynamic_cast<const SfxStyleSheet *>(&rBC) != nullptr) { const SfxSimpleHint* pSimple = dynamic_cast<const SfxSimpleHint*>(&rHint); sal_uInt32 nId(pSimple ? pSimple->GetId() : 0L); @@ -595,7 +595,7 @@ namespace sdr } } } - else if(HAS_BASE(SfxStyleSheetBasePool, &rBC)) + else if(dynamic_cast<const SfxStyleSheetBasePool *>(&rBC) != nullptr) { const SfxStyleSheetHintExtended* pExtendedHint = dynamic_cast<const SfxStyleSheetHintExtended*>(&rHint); diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 49a50b550a8e..6fff9744b280 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -78,8 +78,6 @@ #include <sxmoitm.hxx> #include <sxmovitm.hxx> #include <sxmsitm.hxx> -#include <svx/sxmspitm.hxx> -#include <svx/sxmsuitm.hxx> #include <sxmtaitm.hxx> #include <svx/sxmtfitm.hxx> #include <svx/sxmtpitm.hxx> @@ -627,7 +625,6 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, OUString& rItemName) // FractionItem -TYPEINIT1_AUTOFACTORY(SdrFractionItem,SfxPoolItem); SdrFractionItem::SdrFractionItem(sal_uInt16 nId, SvStream& rIn): SfxPoolItem(nId) @@ -698,7 +695,6 @@ SfxPoolItem* SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const // ScaleItem -TYPEINIT1_AUTOFACTORY(SdrScaleItem,SdrFractionItem); bool SdrScaleItem::GetPresentation( SfxItemPresentation ePresentation, SfxMapUnit /*eCoreMetric*/, @@ -740,7 +736,6 @@ SfxPoolItem* SdrScaleItem::Clone(SfxItemPool * /*pPool*/) const // OnOffItem -TYPEINIT1_AUTOFACTORY(SdrOnOffItem,SfxBoolItem); SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const { @@ -772,7 +767,6 @@ bool SdrOnOffItem::GetPresentation(SfxItemPresentation ePres, return true; } -TYPEINIT1_AUTOFACTORY(SdrYesNoItem,SfxBoolItem); SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const { @@ -808,7 +802,6 @@ bool SdrYesNoItem::GetPresentation(SfxItemPresentation ePres, // class SdrPercentItem -TYPEINIT1_AUTOFACTORY(SdrPercentItem,SfxUInt16Item); SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const { @@ -842,7 +835,6 @@ bool SdrPercentItem::GetPresentation( // class SdrAngleItem -TYPEINIT1_AUTOFACTORY(SdrAngleItem,SfxInt32Item); SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const { @@ -931,7 +923,6 @@ bool SdrAngleItem::GetPresentation( // class SdrMetricItem -TYPEINIT1_AUTOFACTORY(SdrMetricItem,SfxInt32Item); SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const { @@ -982,7 +973,6 @@ bool SdrMetricItem::GetPresentation(SfxItemPresentation ePres, // items of the legend object -TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem); SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); } @@ -1008,7 +998,6 @@ bool SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres, return true; } -TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem); SfxPoolItem* SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionEscDirItem(*this); } @@ -1039,7 +1028,8 @@ bool SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres, // FitToSize -TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem); + +SfxPoolItem* SdrTextFitToSizeTypeItem::CreateDefault() { return new SdrTextFitToSizeTypeItem; } SfxPoolItem* SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextFitToSizeTypeItem(*this); } @@ -1099,7 +1089,6 @@ bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb return true; } -TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem); SfxPoolItem* SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextVertAdjustItem(*this); } @@ -1148,7 +1137,6 @@ bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberI return true; } -TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem); SfxPoolItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextHorzAdjustItem(*this); } @@ -1197,7 +1185,6 @@ bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberI return true; } -TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem); SfxPoolItem* SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniKindItem(*this); } @@ -1245,7 +1232,6 @@ bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ return true; } -TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem); SfxPoolItem* SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDirectionItem(*this); } @@ -1294,7 +1280,6 @@ bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMembe return true; } -TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item); SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDelayItem(*this); } @@ -1317,7 +1302,6 @@ bool SdrTextAniDelayItem::GetPresentation( return true; } -TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item); SfxPoolItem* SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniAmountItem(*this); } @@ -1374,7 +1358,7 @@ bool SdrTextAniAmountItem::GetPresentation( return true; } -TYPEINIT1_AUTOFACTORY( SdrTextFixedCellHeightItem, SfxBoolItem ); + SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( bool bUseFixedCellHeight ) : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, bUseFixedCellHeight ) { @@ -1438,7 +1422,6 @@ bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMe return true; } -TYPEINIT1_AUTOFACTORY( SdrCustomShapeAdjustmentItem, SfxPoolItem ); SdrCustomShapeAdjustmentItem::SdrCustomShapeAdjustmentItem() : SfxPoolItem( SDRATTR_CUSTOMSHAPE_ADJUSTMENT ) { @@ -1584,7 +1567,6 @@ bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*n } // EdgeKind -TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem); SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeKindItem(*this); } @@ -1721,7 +1703,6 @@ bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemb return true; } -TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem); SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureKindItem(*this); } @@ -1769,7 +1750,6 @@ bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ return true; } -TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem); SfxPoolItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextHPosItem(*this); } @@ -1817,7 +1797,6 @@ bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMember return true; } -TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem); SfxPoolItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextVPosItem(*this); } @@ -1865,7 +1844,6 @@ bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMember return true; } -TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem); SfxPoolItem* SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureUnitItem(*this); } @@ -1914,7 +1892,6 @@ bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ return true; } -TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem); SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCircKindItem(*this); } @@ -1966,8 +1943,6 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) // class SdrSignedPercentItem -TYPEINIT1_AUTOFACTORY( SdrSignedPercentItem, SfxInt16Item ); - SfxPoolItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const { @@ -1997,7 +1972,6 @@ bool SdrSignedPercentItem::GetPresentation( return true; } -TYPEINIT1( SdrGrafRedItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const { @@ -2009,7 +1983,6 @@ SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrGrafRedItem( rIn ); } -TYPEINIT1( SdrGrafGreenItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const { @@ -2021,7 +1994,6 @@ SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrGrafGreenItem( rIn ); } -TYPEINIT1( SdrGrafBlueItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const { @@ -2033,7 +2005,6 @@ SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const return new SdrGrafBlueItem( rIn ); } -TYPEINIT1( SdrGrafLuminanceItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const { @@ -2045,7 +2016,6 @@ SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) c return new SdrGrafLuminanceItem( rIn ); } -TYPEINIT1( SdrGrafContrastItem, SdrSignedPercentItem ); SfxPoolItem* SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const { @@ -2057,7 +2027,6 @@ SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) co return new SdrGrafContrastItem( rIn ); } -TYPEINIT1( SdrGrafGamma100Item, SfxUInt32Item ); SfxPoolItem* SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const { @@ -2085,7 +2054,6 @@ bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId* return true; } -TYPEINIT1( SdrGrafInvertItem, SdrOnOffItem ); SfxPoolItem* SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const { @@ -2097,7 +2065,6 @@ SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) cons return new SdrGrafInvertItem( rIn ); } -TYPEINIT1( SdrGrafTransparenceItem, SdrPercentItem ); SfxPoolItem* SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const { @@ -2109,7 +2076,6 @@ SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/ return new SdrGrafTransparenceItem( rIn ); } -TYPEINIT1( SdrGrafModeItem, SfxEnumItem ); SfxPoolItem* SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const { @@ -2174,7 +2140,6 @@ bool SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, return true; } -TYPEINIT1( SdrGrafCropItem, SvxGrfCrop ); SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const { @@ -2191,5 +2156,97 @@ sal_uInt16 SdrGrafCropItem::GetVersion( sal_uInt16 /*nFileVersion*/) const // GRFCROP_VERSION_MOVETOSVX is 1 return GRFCROP_VERSION_MOVETOSVX; } +SdrTextAniStartInsideItem::~SdrTextAniStartInsideItem() +{ +} +SfxPoolItem* SdrTextAniStartInsideItem::Clone(SfxItemPool* ) const +{ + return new SdrTextAniStartInsideItem(*this); +} +SdrTextAniStopInsideItem::~SdrTextAniStopInsideItem() +{ +} +SfxPoolItem* SdrTextAniStopInsideItem::Clone(SfxItemPool* ) const +{ + return new SdrTextAniStopInsideItem(*this); +} +SdrCaptionEscIsRelItem::~SdrCaptionEscIsRelItem() +{ +} +SfxPoolItem* SdrCaptionEscIsRelItem::Clone(SfxItemPool* ) const +{ + return new SdrCaptionEscIsRelItem(*this); +} +SdrCaptionEscRelItem::~SdrCaptionEscRelItem() +{ +} +SfxPoolItem* SdrCaptionEscRelItem::Clone(SfxItemPool*) const +{ + return new SdrCaptionEscRelItem(*this); +} +SdrCaptionFitLineLenItem::~SdrCaptionFitLineLenItem() +{ +} +SfxPoolItem* SdrCaptionFitLineLenItem::Clone(SfxItemPool* ) const +{ + return new SdrCaptionFitLineLenItem(*this); +} +SdrCaptionLineLenItem::~SdrCaptionLineLenItem() +{ +} +SfxPoolItem* SdrCaptionLineLenItem::Clone(SfxItemPool*) const +{ + return new SdrCaptionLineLenItem(*this); +} +SdrMeasureBelowRefEdgeItem::~SdrMeasureBelowRefEdgeItem() +{ +} +SfxPoolItem* SdrMeasureBelowRefEdgeItem::Clone(SfxItemPool* ) const +{ + return new SdrMeasureBelowRefEdgeItem(*this); +} +SdrMeasureTextIsFixedAngleItem::~SdrMeasureTextIsFixedAngleItem() +{ +} +SfxPoolItem* SdrMeasureTextIsFixedAngleItem::Clone(SfxItemPool* ) const +{ + return new SdrMeasureTextIsFixedAngleItem(*this); +} +SdrMeasureTextFixedAngleItem::~SdrMeasureTextFixedAngleItem() +{ +} +SfxPoolItem* SdrMeasureTextFixedAngleItem::Clone(SfxItemPool* ) const +{ + return new SdrMeasureTextFixedAngleItem(*this); +} +SdrMeasureDecimalPlacesItem::~SdrMeasureDecimalPlacesItem() +{ +} +SfxPoolItem* SdrMeasureDecimalPlacesItem::Clone(SfxItemPool* ) const +{ + return new SdrMeasureDecimalPlacesItem(*this); +} +SdrMeasureTextRota90Item::~SdrMeasureTextRota90Item() +{ +} +SfxPoolItem* SdrMeasureTextRota90Item::Clone(SfxItemPool* ) const +{ + return new SdrMeasureTextRota90Item(*this); +} +SdrMeasureTextUpsideDownItem::~SdrMeasureTextUpsideDownItem() +{ +} +SfxPoolItem* SdrMeasureTextUpsideDownItem::Clone(SfxItemPool* ) const +{ + return new SdrMeasureTextUpsideDownItem(*this); +} +SdrCustomShapeReplacementURLItem::~SdrCustomShapeReplacementURLItem() +{ +} +SfxPoolItem* SdrCustomShapeReplacementURLItem::Clone( SfxItemPool*) const +{ + return new SdrCustomShapeReplacementURLItem(*this); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 709ba718ea4d..89f7c3fb3772 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -454,7 +454,7 @@ bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const pAktCreate->SetMergedItemSet(maDefaultAttr); } - if (mpModel && HAS_BASE(SdrCaptionObj,pAktCreate)) + if (mpModel && dynamic_cast<const SdrCaptionObj *>(pAktCreate) != nullptr) { SfxItemSet aSet(mpModel->GetItemPool()); aSet.Put(XFillColorItem(OUString(),Color(COL_WHITE))); // in case someone turns on Solid diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx index b643c4fb7e47..5192ad7ee023 100644 --- a/svx/source/svdraw/svddrgm1.hxx +++ b/svx/source/svdraw/svddrgm1.hxx @@ -34,7 +34,6 @@ protected: virtual void createSdrDragEntries() override; public: - TYPEINFO_OVERRIDE(); explicit SdrDragMovHdl(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const override; @@ -55,7 +54,6 @@ private: bool bRight; public: - TYPEINFO_OVERRIDE(); explicit SdrDragRotate(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const override; @@ -81,7 +79,6 @@ private: bool bSlant; public: - TYPEINFO_OVERRIDE(); SdrDragShear(SdrDragView& rNewView,bool bSlant1); virtual void TakeSdrDragComment(OUString& rStr) const override; @@ -105,7 +102,6 @@ private: bool ImpCheckSide(const Point& rPnt) const; public: - TYPEINFO_OVERRIDE(); explicit SdrDragMirror(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const override; @@ -128,7 +124,6 @@ private: bool bIsGradient : 1; public: - TYPEINFO_OVERRIDE(); SdrDragGradient(SdrDragView& rNewView, bool bGrad = true); bool IsGradient() const { return bIsGradient; } @@ -177,7 +172,6 @@ protected: virtual void createSdrDragEntries() override; public: - TYPEINFO_OVERRIDE(); explicit SdrDragCrook(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const override; @@ -208,7 +202,6 @@ protected: virtual void createSdrDragEntries() override; public: - TYPEINFO_OVERRIDE(); explicit SdrDragDistort(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const override; @@ -226,7 +219,6 @@ public: class SdrDragCrop : public SdrDragObjOwn { public: - TYPEINFO_OVERRIDE(); explicit SdrDragCrop(SdrDragView& rNewView); virtual void TakeSdrDragComment(OUString& rStr) const override; diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index d97ef1b85278..bff9a6c0aead 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -302,7 +302,6 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPointGlueDrag::create -TYPEINIT0(SdrDragMethod); void SdrDragMethod::resetSdrDragEntries() { @@ -965,7 +964,6 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragMethod::AddConnectorOverla -TYPEINIT1(SdrDragMovHdl,SdrDragMethod); SdrDragMovHdl::SdrDragMovHdl(SdrDragView& rNewView) : SdrDragMethod(rNewView) @@ -1181,7 +1179,6 @@ Pointer SdrDragMovHdl::GetSdrDragPointer() const -TYPEINIT1(SdrDragObjOwn,SdrDragMethod); SdrDragObjOwn::SdrDragObjOwn(SdrDragView& rNewView) : SdrDragMethod(rNewView), @@ -1488,7 +1485,6 @@ Pointer SdrDragObjOwn::GetSdrDragPointer() const -TYPEINIT1(SdrDragMove,SdrDragMethod); void SdrDragMove::createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool /*bModify*/) { @@ -1767,7 +1763,6 @@ Pointer SdrDragMove::GetSdrDragPointer() const -TYPEINIT1(SdrDragResize,SdrDragMethod); SdrDragResize::SdrDragResize(SdrDragView& rNewView) : SdrDragMethod(rNewView), @@ -2104,7 +2099,6 @@ Pointer SdrDragResize::GetSdrDragPointer() const -TYPEINIT1(SdrDragRotate,SdrDragMethod); void SdrDragRotate::applyCurrentTransformationToSdrObject(SdrObject& rTarget) { @@ -2241,7 +2235,6 @@ Pointer SdrDragRotate::GetSdrDragPointer() const -TYPEINIT1(SdrDragShear,SdrDragMethod); SdrDragShear::SdrDragShear(SdrDragView& rNewView, bool bSlant1) : SdrDragMethod(rNewView), @@ -2523,7 +2516,6 @@ Pointer SdrDragShear::GetSdrDragPointer() const -TYPEINIT1(SdrDragMirror,SdrDragMethod); void SdrDragMirror::applyCurrentTransformationToSdrObject(SdrObject& rTarget) { @@ -2654,7 +2646,6 @@ Pointer SdrDragMirror::GetSdrDragPointer() const -TYPEINIT1(SdrDragGradient, SdrDragMethod); SdrDragGradient::SdrDragGradient(SdrDragView& rNewView, bool bGrad) : SdrDragMethod(rNewView), @@ -2815,7 +2806,6 @@ Pointer SdrDragGradient::GetSdrDragPointer() const -TYPEINIT1(SdrDragCrook,SdrDragMethod); SdrDragCrook::SdrDragCrook(SdrDragView& rNewView) : SdrDragMethod(rNewView), @@ -3452,7 +3442,6 @@ Pointer SdrDragCrook::GetSdrDragPointer() const -TYPEINIT1(SdrDragDistort,SdrDragMethod); SdrDragDistort::SdrDragDistort(SdrDragView& rNewView) : SdrDragMethod(rNewView), @@ -3606,7 +3595,6 @@ void SdrDragDistort::applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPol -TYPEINIT1(SdrDragCrop,SdrDragObjOwn); SdrDragCrop::SdrDragCrop(SdrDragView& rNewView) : SdrDragObjOwn(rNewView) diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index 62b2b81bc059..88dc38a92243 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -725,7 +725,7 @@ bool SdrDragView::IsInsGluePointPossible() const { // return sal_False, if only 1 object which is a connector. const SdrObject* pObj=GetMarkedObjectByIndex(0); - if (!HAS_BASE(SdrEdgeObj,pObj)) + if (dynamic_cast<const SdrEdgeObj *>(pObj) == nullptr) { bRet=true; } diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index ecd92f45b54b..646d2c064f32 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -85,7 +85,7 @@ public: SfxItemState eState; sal_uInt16 nWhichId; - TypeId pType; + const std::type_info* pType; ItemType eItemType; sal_Int32 nVal; @@ -925,7 +925,8 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem if (eState!=SfxItemState::DISABLED) { const SfxPoolItem& rItem=pSet->Get(nWhich); sal_uInt16 nIndent=0; - if (!HAS_BASE(SfxVoidItem,&rItem) && !HAS_BASE(SfxSetItem,&rItem) && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) { + if (dynamic_cast<const SfxVoidItem *>(&rItem) == nullptr && dynamic_cast<const SfxSetItem *>(&rItem) == nullptr + && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) { OUString aCommentStr; INSERTCOMMENT(XATTR_LINE_FIRST,XATTR_LINE_LAST,"L I N E"); @@ -967,29 +968,29 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem aEntry.eState=eState; aEntry.nWhichId=nWhich; if (!IsInvalidItem(&rItem)) { - aEntry.pType=rItem.Type(); + aEntry.pType=&typeid(&typeid(rItem)); aEntry.nMax=0x7FFFFFFF; aEntry.nMin=-aEntry.nMax; aEntry.nVal=-4711; - if (HAS_BASE(SfxByteItem ,&rItem)) aEntry.eItemType=ITEM_BYTE; - else if (HAS_BASE(SfxInt16Item ,&rItem)) aEntry.eItemType=ITEM_INT16; - else if (HAS_BASE(SfxUInt16Item ,&rItem)) aEntry.eItemType=ITEM_UINT16; - else if (HAS_BASE(SfxInt32Item ,&rItem)) aEntry.eItemType=ITEM_INT32; - else if (HAS_BASE(SfxUInt32Item ,&rItem)) aEntry.eItemType=ITEM_UINT32; - else if (HAS_BASE(SfxEnumItemInterface,&rItem)) aEntry.eItemType=ITEM_ENUM; - else if (HAS_BASE(SfxBoolItem ,&rItem)) aEntry.eItemType=ITEM_BOOL; - else if (HAS_BASE(SfxFlagItem ,&rItem)) aEntry.eItemType=ITEM_FLAG; - else if (HAS_BASE(XColorItem ,&rItem)) aEntry.eItemType=ITEM_XCOLOR; - else if (HAS_BASE(SfxStringItem ,&rItem)) aEntry.eItemType=ITEM_STRING; - else if (HAS_BASE(SfxPointItem ,&rItem)) aEntry.eItemType=ITEM_POINT; - else if (HAS_BASE(SfxRectangleItem,&rItem)) aEntry.eItemType=ITEM_RECT; - else if (HAS_BASE(SfxRangeItem ,&rItem)) aEntry.eItemType=ITEM_RANGE; - else if (HAS_BASE(SdrFractionItem ,&rItem)) aEntry.eItemType=ITEM_FRACTION; - else if (HAS_BASE(SvxColorItem ,&rItem)) aEntry.eItemType=ITEM_COLOR; - else if (HAS_BASE(SvxFontItem ,&rItem)) aEntry.eItemType=ITEM_FONT; - else if (HAS_BASE(SvxFontHeightItem,&rItem))aEntry.eItemType=ITEM_FONTHEIGHT; - else if (HAS_BASE(SvxCharScaleWidthItem,&rItem)) aEntry.eItemType=ITEM_FONTWIDTH; - else if (HAS_BASE(SvxFieldItem ,&rItem)) aEntry.eItemType=ITEM_FIELD; + if (dynamic_cast<const SfxByteItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_BYTE; + else if (dynamic_cast<const SfxInt16Item *>(&rItem) != nullptr) aEntry.eItemType=ITEM_INT16; + else if (dynamic_cast<const SfxUInt16Item *>(&rItem) != nullptr) aEntry.eItemType=ITEM_UINT16; + else if (dynamic_cast<const SfxInt32Item *>(&rItem) != nullptr) aEntry.eItemType=ITEM_INT32; + else if (dynamic_cast<const SfxUInt32Item *>(&rItem) != nullptr) aEntry.eItemType=ITEM_UINT32; + else if (dynamic_cast<const SfxEnumItemInterface *>(&rItem) != nullptr) aEntry.eItemType=ITEM_ENUM; + else if (dynamic_cast<const SfxBoolItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_BOOL; + else if (dynamic_cast<const SfxFlagItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_FLAG; + else if (dynamic_cast<const XColorItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_XCOLOR; + else if (dynamic_cast<const SfxStringItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_STRING; + else if (dynamic_cast<const SfxPointItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_POINT; + else if (dynamic_cast<const SfxRectangleItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_RECT; + else if (dynamic_cast<const SfxRangeItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_RANGE; + else if (dynamic_cast<const SdrFractionItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_FRACTION; + else if (dynamic_cast<const SvxColorItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_COLOR; + else if (dynamic_cast<const SvxFontItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_FONT; + else if (dynamic_cast<const SvxFontHeightItem *>(&rItem) != nullptr)aEntry.eItemType=ITEM_FONTHEIGHT; + else if (dynamic_cast<const SvxCharScaleWidthItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_FONTWIDTH; + else if (dynamic_cast<const SvxFieldItem *>(&rItem) != nullptr) aEntry.eItemType=ITEM_FIELD; switch (aEntry.eItemType) { case ITEM_BYTE : aEntry.bIsNum = true; aEntry.nVal=static_cast<const SfxByteItem &>(rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=255; break; case ITEM_INT16 : aEntry.bIsNum = true; aEntry.nVal=static_cast<const SfxInt16Item &>(rItem).GetValue(); aEntry.nMin=-32767; aEntry.nMax=32767; break; @@ -1187,7 +1188,7 @@ IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, _SdrItemBrowserControl&, rBrowse, vo case ITEM_INT16 : static_cast<SfxInt16Item *>(pNewItem)->SetValue((sal_Int16 )nLongVal); break; case ITEM_UINT16: static_cast<SfxUInt16Item*>(pNewItem)->SetValue((sal_uInt16)nLongVal); break; case ITEM_INT32: { - if(HAS_BASE(SdrAngleItem, pNewItem)) + if(dynamic_cast<const SdrAngleItem *>(pNewItem) != nullptr) { aNewText = aNewText.replace(',', '.'); double nVal = aNewText.toFloat(); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 7df403858ee3..de7e1c62fc33 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -105,7 +105,6 @@ struct SdrModelImpl -TYPEINIT1(SdrModel,SfxBroadcaster); void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbeddedHelper, bool bUseExtColorTable, bool bLoadRefCounts) { diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 04acaef39c32..1e51ae6935fb 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -833,7 +833,6 @@ sdr::properties::BaseProperties* SdrObjCustomShape::CreateObjectSpecificProperti return new sdr::properties::CustomShapeProperties(*this); } -TYPEINIT1(SdrObjCustomShape,SdrTextObj); SdrObjCustomShape::SdrObjCustomShape() : SdrTextObj(), fObjectRotation( 0.0 ), diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index d96f92d1e218..e6102e9e21b4 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -81,7 +81,6 @@ sdr::properties::BaseProperties* SdrAttrObj::CreateObjectSpecificProperties() -TYPEINIT1(SdrAttrObj,SdrObject); SdrAttrObj::SdrAttrObj() { diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index d02a1b53a20f..5cbef0802e3e 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -98,7 +98,6 @@ #include <sxlayitm.hxx> #include <sxlogitm.hxx> #include <sxmovitm.hxx> -#include <svx/sxmspitm.hxx> #include <sxoneitm.hxx> #include <sxonitm.hxx> #include <sxopitm.hxx> @@ -143,7 +142,6 @@ using namespace ::com::sun::star; -TYPEINIT0(SdrObjUserCall); SdrObjUserCall::~SdrObjUserCall() { @@ -298,7 +296,6 @@ void SdrObject::SetBoundRectDirty() -TYPEINIT1(SdrObject,SfxListener); SdrObject::SdrObject() : mpImpl(new Impl), @@ -2195,8 +2192,8 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, bool bMerge) const { const Rectangle& rSnap=GetSnapRect(); const Rectangle& rLogic=GetLogicRect(); - lcl_SetItem(rAttr,bMerge,makeSdrObjMoveProtectItem(IsMoveProtect())); - lcl_SetItem(rAttr,bMerge,makeSdrObjSizeProtectItem(IsResizeProtect())); + lcl_SetItem(rAttr,bMerge,SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, IsMoveProtect())); + lcl_SetItem(rAttr,bMerge,SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, IsResizeProtect())); lcl_SetItem(rAttr,bMerge,SdrObjPrintableItem(IsPrintable())); lcl_SetItem(rAttr,bMerge,SdrObjVisibleItem(IsVisible())); lcl_SetItem(rAttr,bMerge,makeSdrRotateAngleItem(GetRotateAngle())); diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index aac0488f37b5..fc3b0f03ebd1 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -193,7 +193,6 @@ sdr::contact::ViewContact* SdrCaptionObj::CreateObjectSpecificViewContact() -TYPEINIT1(SdrCaptionObj,SdrRectObj); SdrCaptionObj::SdrCaptionObj(): SdrRectObj(OBJ_TEXT), diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 7f99164f541e..b0a8c62341df 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -106,7 +106,6 @@ sdr::contact::ViewContact* SdrCircObj::CreateObjectSpecificViewContact() -TYPEINIT1(SdrCircObj,SdrRectObj); SdrCircObj::SdrCircObj(SdrObjKind eNewKind) { diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index e7556d4ca866..553ec70bef34 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -164,7 +164,6 @@ sdr::contact::ViewContact* SdrEdgeObj::CreateObjectSpecificViewContact() } -TYPEINIT1(SdrEdgeObj,SdrTextObj); SdrEdgeObj::SdrEdgeObj() : SdrTextObj(), @@ -2128,7 +2127,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO Rectangle aObjBound(pObj->GetCurrentBoundRect()); if (aObjBound.IsOver(aMouseRect)) { aTestCon.ResetVars(); - bool bEdge=HAS_BASE(SdrEdgeObj,pObj); // no BestCon for Edge + bool bEdge=dynamic_cast<const SdrEdgeObj *>(pObj) != nullptr; // no BestCon for Edge // User-defined connectors have absolute priority. // After those come Vertex, Corner and center (Best), all prioritized equally. // Finally, a HitTest for the object. diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index cea2d2d8fea1..9c37084504fa 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -330,7 +330,6 @@ void SdrGrafObj::onGraphicChanged() } } -TYPEINIT1(SdrGrafObj,SdrRectObj); SdrGrafObj::SdrGrafObj() : SdrRectObj(), diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 679b42842d5a..7cbaf43f1dce 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -68,7 +68,6 @@ sdr::contact::ViewContact* SdrObjGroup::CreateObjectSpecificViewContact() -TYPEINIT1(SdrObjGroup,SdrObject); SdrObjGroup::SdrObjGroup() { diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 130710e740a9..5f65f17e8d33 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -56,7 +56,6 @@ #include <svx/sxmlhitm.hxx> #include <sxmoitm.hxx> #include <sxmsitm.hxx> -#include <svx/sxmsuitm.hxx> #include <sxmtaitm.hxx> #include <svx/sxmtfitm.hxx> #include <svx/sxmtpitm.hxx> @@ -212,7 +211,6 @@ sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact() -TYPEINIT1(SdrMeasureObj,SdrTextObj); SdrMeasureObj::SdrMeasureObj(): bTextDirty(false) diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 64a07c6a1f09..939ac77b4abe 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -77,7 +77,6 @@ struct SdrMediaObj::Impl OUString m_LastFailedPkgURL; }; -TYPEINIT1( SdrMediaObj, SdrRectObj ); diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index bec870ba25b7..e786dbfb56e3 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -782,7 +782,6 @@ sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact() -TYPEINIT1(SdrOle2Obj,SdrRectObj); SdrOle2Obj::SdrOle2Obj( bool bFrame_ ) : mpImpl(new SdrOle2ObjImpl(bFrame_)) diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 33ea8b5839cd..1b3f0edc36e0 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -66,7 +66,6 @@ void SdrPageObj::PageInDestruction(const SdrPage& rPage) -TYPEINIT1(SdrPageObj,SdrObject); SdrPageObj::SdrPageObj(SdrPage* pNewPage) : mpShownPage(pNewPage) diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 0b41030f8f50..73a57eee16c2 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -1664,7 +1664,6 @@ sdr::contact::ViewContact* SdrPathObj::CreateObjectSpecificViewContact() return new sdr::contact::ViewContactOfSdrPathObj(*this); } -TYPEINIT1(SdrPathObj,SdrTextObj); SdrPathObj::SdrPathObj(SdrObjKind eNewKind) : meKind(eNewKind), diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index 1750e0c647cc..009164499f4e 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -63,7 +63,6 @@ sdr::contact::ViewContact* SdrRectObj::CreateObjectSpecificViewContact() -TYPEINIT1(SdrRectObj,SdrTextObj); SdrRectObj::SdrRectObj() : mpXPoly(nullptr) diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 5a5796d7e63c..6de973428c77 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -82,7 +82,6 @@ sdr::contact::ViewContact* SdrTextObj::CreateObjectSpecificViewContact() -TYPEINIT1(SdrTextObj,SdrAttrObj); SdrTextObj::SdrTextObj() : SdrAttrObj(), diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 04c39c959932..87eca7696a01 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -264,10 +264,10 @@ bool SdrTextObj::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) if (bRet) { SetRectsDirty(); - if (HAS_BASE(SdrRectObj,this)) { // this is a hack + if (dynamic_cast<const SdrRectObj *>(this) != nullptr) { // this is a hack static_cast<SdrRectObj*>(this)->SetXPolyDirty(); } - if (HAS_BASE(SdrCaptionObj,this)) { // this is a hack + if (dynamic_cast<const SdrCaptionObj *>(this) != nullptr) { // this is a hack static_cast<SdrCaptionObj*>(this)->ImpRecalcTail(); } } @@ -282,10 +282,10 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) Rectangle aBoundRect0; if (pUserCall!=nullptr) aBoundRect0=GetLastBoundRect(); maRect = aNeuRect; SetRectsDirty(); - if (HAS_BASE(SdrRectObj,this)) { // this is a hack + if (dynamic_cast<const SdrRectObj *>(this) != nullptr) { // this is a hack static_cast<SdrRectObj*>(this)->SetXPolyDirty(); } - if (HAS_BASE(SdrCaptionObj,this)) { // this is a hack + if (dynamic_cast<const SdrCaptionObj *>(this) != nullptr) { // this is a hack static_cast<SdrCaptionObj*>(this)->ImpRecalcTail(); } SetChanged(); diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 95a419b36362..004453006a86 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -200,7 +200,7 @@ bool SdrTextObj::MovCreate(SdrDragStat& rStat) maRect = aRect1; // for ObjName SetBoundRectDirty(); bSnapRectDirty=true; - if (HAS_BASE(SdrRectObj,this)) { + if (dynamic_cast<const SdrRectObj *>(this) != nullptr) { static_cast<SdrRectObj*>(this)->SetXPolyDirty(); } return true; @@ -214,7 +214,7 @@ bool SdrTextObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) AdaptTextMinSize(); SetRectsDirty(); - if (HAS_BASE(SdrRectObj,this)) { + if (dynamic_cast<const SdrRectObj *>(this) != nullptr) { static_cast<SdrRectObj*>(this)->SetXPolyDirty(); } return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=2); diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index b68a5574eb6b..d51809ad0372 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -147,7 +147,6 @@ namespace } } -TYPEINIT1(SdrUnoObj, SdrRectObj); SdrUnoObj::SdrUnoObj(const OUString& rModelName, bool _bOwnUnoControlModel) : m_pImpl( new SdrUnoObjDataHolder ), diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index 0ab775b068ea..9c16a472a3f8 100644 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -45,7 +45,6 @@ sdr::contact::ViewContact* SdrVirtObj::CreateObjectSpecificViewContact() -TYPEINIT1(SdrVirtObj,SdrObject); SdrVirtObj::SdrVirtObj(SdrObject& rNewObj): rRefObj(rNewObj) diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 91e6ad534024..432648dc6a59 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -71,7 +71,6 @@ public: static const sal_Int32 InitialObjectContainerCapacity (64); -TYPEINIT0(SdrObjList); SdrObjList::SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewUpList): maList(), @@ -1195,7 +1194,6 @@ void SdrPageProperties::SetStyleSheet(SfxStyleSheet* pStyleSheet) -TYPEINIT1(SdrPage,SdrObjList); SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage) : SdrObjList(&rNewModel, this), mpViewContact(nullptr), diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 8580edeca204..35f12113ad9f 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -155,7 +155,6 @@ BitmapEx convertMetafileToBitmapEx( -TYPEINIT2(SdrPaintView,SfxListener,SfxRepeatTarget); void SdrPaintView::ImpClearVars() diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 34dc6f961738..f9132dc38ec6 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -57,7 +57,6 @@ static void ImplUnmarkObject( SdrObject* pObj ) -TYPEINIT1(SdrUndoAction,SfxUndoAction); SdrUndoAction::~SdrUndoAction() {} diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 1bac9f79fa7a..526a7b281c13 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -154,7 +154,6 @@ SdrDropMarkerOverlay::~SdrDropMarkerOverlay() } -TYPEINIT1(SdrView,SdrCreateView); SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut) : SdrCreateView(pModel1,pOut), diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 0a24b8feb793..71b0b5a0b9b7 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -750,7 +750,6 @@ sdr::contact::ViewContact* SdrTableObj::CreateObjectSpecificViewContact() -TYPEINIT1(SdrTableObj,SdrTextObj); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index ab438026d05b..b5ac4d8917f6 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -64,7 +64,6 @@ using namespace ::com::sun::star::lang; #define ITEMVALUE(ItemSet,Id,Cast) static_cast<const Cast&>((ItemSet).Get(Id)).GetValue() #define TOOLBOX_NAME OUString( "colorbar" ) -TYPEINIT1_AUTOFACTORY( TbxImageItem, SfxUInt16Item ); TbxImageItem::TbxImageItem( sal_uInt16 _nWhich, sal_uInt16 nImage ) : SfxUInt16Item( _nWhich, nImage ) diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index aa313c5f2129..0c7de3d39641 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2799,13 +2799,13 @@ SfxToolBoxControl* SvxColorToolBoxControl::CreateImpl( sal_uInt16 nSlotId, sal_u void SvxColorToolBoxControl::RegisterControl(sal_uInt16 nSlotId, SfxModule *pMod) { if ( nSlotId == SID_ATTR_LINE_COLOR ) - SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, TYPE(XLineColorItem), nSlotId ) ); + SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, typeid(XLineColorItem), nSlotId ) ); else if ( nSlotId == SID_ATTR_FILL_COLOR ) - SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, TYPE(XFillColorItem), nSlotId ) ); + SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, typeid(XFillColorItem), nSlotId ) ); else if ( nSlotId == SID_ATTR_CHAR_BACK_COLOR ) - SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, TYPE(SvxBackgroundColorItem), nSlotId ) ); + SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, typeid(SvxBackgroundColorItem), nSlotId ) ); else - SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, TYPE(SvxColorItem), nSlotId ) ); + SfxToolBoxControl::RegisterToolBoxControl( pMod, new SfxTbxCtrlFactory( SvxColorToolBoxControl::CreateImpl, typeid(SvxColorItem), nSlotId ) ); } // class SvxFrameToolBoxControl -------------------------------------------- diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index aeac1938cc26..38b4eeb575d9 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -61,7 +61,6 @@ void ExtrusionBar::InitInterface_Impl() GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_SVX_EXTRUSION_BAR); } -TYPEINIT1( ExtrusionBar, SfxShell ); ExtrusionBar::ExtrusionBar(SfxViewShell* pViewShell ) : SfxShell(pViewShell) diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 9409515b6bbb..ee0132b7b578 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -178,7 +178,6 @@ void FontworkBar::InitInterface_Impl() GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_SVX_FONTWORK_BAR); } -TYPEINIT1( FontworkBar, SfxShell ); FontworkBar::FontworkBar(SfxViewShell* pViewShell ) : SfxShell(pViewShell) diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 4b5f51baec61..f2adb3164765 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -60,7 +60,6 @@ using namespace ::com::sun::star; #define VCLTOSVCOL( rCol ) (sal_uInt16)((((sal_uInt16)(rCol))<<8)|(rCol)) -TYPEINIT1_AUTOFACTORY(NameOrIndex, SfxStringItem); long ScaleMetricValue( long nVal, long nMul, long nDiv ) { @@ -268,7 +267,7 @@ void NameOrIndex::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterEndElement(pWriter); } -TYPEINIT1_AUTOFACTORY(XColorItem, NameOrIndex); +SfxPoolItem* XColorItem::CreateDefault() { return new XColorItem; } XColorItem::XColorItem(sal_uInt16 _nWhich, sal_Int32 nIndex, const Color& rTheColor) : NameOrIndex(_nWhich, nIndex), @@ -357,7 +356,8 @@ bool XColorItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) // --- line attributes --- -TYPEINIT1_AUTOFACTORY(XLineStyleItem, SfxEnumItem); + +SfxPoolItem* XLineStyleItem::CreateDefault() { return new XLineStyleItem; } XLineStyleItem::XLineStyleItem(css::drawing::LineStyle eTheLineStyle) : SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< sal_uInt16 >(eTheLineStyle)) @@ -648,7 +648,7 @@ double XDash::CreateDotDashArray(::std::vector< double >& rDotDashArray, double return fFullDotDashLen; } -TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex); +SfxPoolItem* XLineDashItem::CreateDefault() {return new XLineDashItem;} XLineDashItem::XLineDashItem(const OUString& rName, const XDash& rTheDash) : NameOrIndex(XATTR_LINEDASH, rName), @@ -1014,7 +1014,7 @@ XLineDashItem* XLineDashItem::checkForUniqueItem( SdrModel* pModel ) const return nullptr; } -TYPEINIT1_AUTOFACTORY(XLineWidthItem, SfxMetricItem); +SfxPoolItem* XLineWidthItem::CreateDefault() {return new XLineWidthItem;} XLineWidthItem::XLineWidthItem(long nWidth) : SfxMetricItem(XATTR_LINEWIDTH, nWidth) @@ -1071,7 +1071,7 @@ bool XLineWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem); +SfxPoolItem* XLineColorItem::CreateDefault() { return new XLineColorItem; } XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) : XColorItem(XATTR_LINECOLOR, nIndex, rTheColor) @@ -1222,7 +1222,7 @@ namespace } } -TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex); +SfxPoolItem* XLineStartItem::CreateDefault() {return new XLineStartItem;} XLineStartItem::XLineStartItem(sal_Int32 nIndex) : NameOrIndex(XATTR_LINESTART, nIndex) @@ -1564,7 +1564,7 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const return nullptr; } -TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex); +SfxPoolItem* XLineEndItem::CreateDefault() {return new XLineEndItem;} XLineEndItem::XLineEndItem(sal_Int32 nIndex) : NameOrIndex(XATTR_LINEEND, nIndex) @@ -1905,7 +1905,7 @@ bool XLineEndItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) return true; } -TYPEINIT1_AUTOFACTORY(XLineStartWidthItem, SfxMetricItem); +SfxPoolItem* XLineStartWidthItem::CreateDefault() {return new XLineStartWidthItem;} XLineStartWidthItem::XLineStartWidthItem(long nWidth) : SfxMetricItem(XATTR_LINESTARTWIDTH, nWidth) @@ -1955,7 +1955,7 @@ bool XLineStartWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemb return true; } -TYPEINIT1_AUTOFACTORY(XLineEndWidthItem, SfxMetricItem); +SfxPoolItem* XLineEndWidthItem::CreateDefault() {return new XLineEndWidthItem;} XLineEndWidthItem::XLineEndWidthItem(long nWidth) : SfxMetricItem(XATTR_LINEENDWIDTH, nWidth) @@ -2005,7 +2005,7 @@ bool XLineEndWidthItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMember return true; } -TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem); +SfxPoolItem* XLineStartCenterItem::CreateDefault() {return new XLineStartCenterItem;} XLineStartCenterItem::XLineStartCenterItem(bool bStartCenter) : SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter) @@ -2056,7 +2056,7 @@ bool XLineStartCenterItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMem return true; } -TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem); +SfxPoolItem* XLineEndCenterItem::CreateDefault() {return new XLineEndCenterItem;} XLineEndCenterItem::XLineEndCenterItem(bool bEndCenter) : SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter) @@ -2109,7 +2109,8 @@ bool XLineEndCenterItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMembe // --- fill attributes --- -TYPEINIT1_AUTOFACTORY(XFillStyleItem, SfxEnumItem); + +SfxPoolItem* XFillStyleItem::CreateDefault() { return new XFillStyleItem; } XFillStyleItem::XFillStyleItem(drawing::FillStyle eFillStyle) : SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< sal_uInt16 >(eFillStyle)) @@ -2211,7 +2212,8 @@ void XFillStyleItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterEndElement(pWriter); } -TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem); + +SfxPoolItem* XFillColorItem::CreateDefault() { return new XFillColorItem; } XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) : XColorItem(XATTR_FILLCOLOR, nIndex, rTheColor) @@ -2274,8 +2276,7 @@ void XFillColorItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterWriteAttribute(pWriter, BAD_CAST("value"), BAD_CAST(GetColorValue().AsRGBHexString().toUtf8().getStr())); xmlTextWriterEndElement(pWriter); } - -TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem); +SfxPoolItem* XSecondaryFillColorItem::CreateDefault() {return new XSecondaryFillColorItem;} XSecondaryFillColorItem::XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor) : XColorItem(XATTR_SECONDARYFILLCOLOR, rName, rTheColor) @@ -2363,7 +2364,8 @@ bool XGradient::operator==(const XGradient& rGradient) const nStepCount == rGradient.nStepCount ); } -TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex); + +SfxPoolItem* XFillGradientItem::CreateDefault() { return new XFillGradientItem; } XFillGradientItem::XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient) : @@ -2748,7 +2750,8 @@ XFillGradientItem* XFillGradientItem::checkForUniqueItem( SdrModel* pModel ) con return nullptr; } -TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem ); + +SfxPoolItem* XFillFloatTransparenceItem::CreateDefault() { return new XFillFloatTransparenceItem; } XFillFloatTransparenceItem::XFillFloatTransparenceItem() : bEnabled( false ) @@ -2871,7 +2874,8 @@ bool XHatch::operator==(const XHatch& rHatch) const nAngle == rHatch.nAngle ); } -TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex); + +SfxPoolItem* XFillHatchItem::CreateDefault() { return new XFillHatchItem; } XFillHatchItem::XFillHatchItem(const OUString& rName, const XHatch& rTheHatch) : @@ -3156,7 +3160,8 @@ XFillHatchItem* XFillHatchItem::checkForUniqueItem( SdrModel* pModel ) const // --- form text attributes --- -TYPEINIT1_AUTOFACTORY(XFormTextStyleItem, SfxEnumItem); + +SfxPoolItem* XFormTextStyleItem::CreateDefault() { return new XFormTextStyleItem; } XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) : SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< sal_uInt16 >(eTheStyle)) @@ -3198,7 +3203,8 @@ bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ return true; } -TYPEINIT1_AUTOFACTORY(XFormTextAdjustItem, SfxEnumItem); + +SfxPoolItem* XFormTextAdjustItem::CreateDefault() { return new XFormTextAdjustItem; } XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) : SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< sal_uInt16 >(eTheAdjust)) @@ -3240,7 +3246,8 @@ bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId* return true; } -TYPEINIT1_AUTOFACTORY(XFormTextDistanceItem, SfxMetricItem); + +SfxPoolItem* XFormTextDistanceItem::CreateDefault() { return new XFormTextDistanceItem; } XFormTextDistanceItem::XFormTextDistanceItem(long nDist) : SfxMetricItem(XATTR_FORMTXTDISTANCE, nDist) @@ -3262,7 +3269,7 @@ SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c return new XFormTextDistanceItem(rIn); } -TYPEINIT1_AUTOFACTORY(XFormTextStartItem, SfxMetricItem); +SfxPoolItem* XFormTextStartItem::CreateDefault() { return new XFormTextStartItem; } XFormTextStartItem::XFormTextStartItem(long nStart) : SfxMetricItem(XATTR_FORMTXTSTART, nStart) @@ -3284,7 +3291,8 @@ SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) cons return new XFormTextStartItem(rIn); } -TYPEINIT1_AUTOFACTORY(XFormTextMirrorItem, SfxBoolItem); + +SfxPoolItem* XFormTextMirrorItem::CreateDefault() { return new XFormTextMirrorItem; } XFormTextMirrorItem::XFormTextMirrorItem(bool bMirror) : SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror) @@ -3306,7 +3314,8 @@ SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) con return new XFormTextMirrorItem(rIn); } -TYPEINIT1_AUTOFACTORY(XFormTextOutlineItem, SfxBoolItem); + +SfxPoolItem* XFormTextOutlineItem::CreateDefault() { return new XFormTextOutlineItem; } XFormTextOutlineItem::XFormTextOutlineItem(bool bOutline) : SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline) @@ -3328,7 +3337,8 @@ SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) co return new XFormTextOutlineItem(rIn); } -TYPEINIT1_AUTOFACTORY(XFormTextShadowItem, SfxEnumItem); + +SfxPoolItem* XFormTextShadowItem::CreateDefault() { return new XFormTextShadowItem; } XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) : SfxEnumItem( @@ -3371,7 +3381,8 @@ bool XFormTextShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId* return true; } -TYPEINIT1_AUTOFACTORY(XFormTextShadowColorItem, XColorItem); + +SfxPoolItem* XFormTextShadowColorItem::CreateDefault() { return new XFormTextShadowColorItem; } XFormTextShadowColorItem::XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor) : @@ -3394,7 +3405,8 @@ SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/ return new XFormTextShadowColorItem(rIn); } -TYPEINIT1_AUTOFACTORY(XFormTextShadowXValItem, SfxMetricItem); + +SfxPoolItem* XFormTextShadowXValItem::CreateDefault() { return new XFormTextShadowXValItem; } XFormTextShadowXValItem::XFormTextShadowXValItem(long nVal) : SfxMetricItem(XATTR_FORMTXTSHDWXVAL, nVal) @@ -3416,7 +3428,8 @@ SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) return new XFormTextShadowXValItem(rIn); } -TYPEINIT1_AUTOFACTORY(XFormTextShadowYValItem, SfxMetricItem); + +SfxPoolItem* XFormTextShadowYValItem::CreateDefault() { return new XFormTextShadowYValItem; } XFormTextShadowYValItem::XFormTextShadowYValItem(long nVal) : SfxMetricItem(XATTR_FORMTXTSHDWYVAL, nVal) @@ -3438,7 +3451,8 @@ SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) return new XFormTextShadowYValItem(rIn); } -TYPEINIT1_AUTOFACTORY(XFormTextHideFormItem, SfxBoolItem); + +SfxPoolItem* XFormTextHideFormItem::CreateDefault() { return new XFormTextHideFormItem; } XFormTextHideFormItem::XFormTextHideFormItem(bool bHide) : SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide) @@ -3462,7 +3476,6 @@ SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) c // --- SetItems --- -TYPEINIT1(XLineAttrSetItem, SfxSetItem); /// a line attribute set item XLineAttrSetItem::XLineAttrSetItem( SfxItemSet* pItemSet ) : @@ -3508,7 +3521,6 @@ SvStream& XLineAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) } -TYPEINIT1(XFillAttrSetItem, SfxSetItem); /// fill attribute set item XFillAttrSetItem::XFillAttrSetItem( SfxItemSet* pItemSet ) : diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index 5aa7446c19c2..23c676025208 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -34,7 +34,7 @@ #include <libxml/xmlwriter.h> -TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item); +SfxPoolItem* XLineTransparenceItem::CreateDefault() {return new XLineTransparenceItem;} XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) : SfxUInt16Item(XATTR_LINETRANSPARENCE, nLineTransparence) @@ -79,7 +79,8 @@ bool XLineTransparenceItem::GetPresentation } } -TYPEINIT1_AUTOFACTORY(XLineJointItem, SfxEnumItem); + +SfxPoolItem* XLineJointItem::CreateDefault() { return new XLineJointItem; } XLineJointItem::XLineJointItem( css::drawing::LineJoint eLineJoint ) : SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< sal_uInt16 >(eLineJoint)) @@ -182,7 +183,6 @@ sal_uInt16 XLineJointItem::GetValueCount() const return 5; } -TYPEINIT1_AUTOFACTORY(AffineMatrixItem, SfxPoolItem); AffineMatrixItem::AffineMatrixItem(const css::geometry::AffineMatrix2D* pMatrix) : SfxPoolItem(SID_ATTR_TRANSFORM_MATRIX) @@ -283,7 +283,8 @@ bool AffineMatrixItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberI return false; } -TYPEINIT1_AUTOFACTORY(XLineCapItem, SfxEnumItem); + +SfxPoolItem* XLineCapItem::CreateDefault() { return new XLineCapItem; } XLineCapItem::XLineCapItem(css::drawing::LineCap eLineCap) : SfxEnumItem(XATTR_LINECAP, sal::static_int_cast< sal_uInt16 >(eLineCap)) @@ -392,7 +393,7 @@ css::drawing::LineCap XLineCapItem::GetValue() const return eRetval; } -TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item); +SfxPoolItem* XFillTransparenceItem::CreateDefault() {return new XFillTransparenceItem;} XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) : SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence) @@ -445,7 +446,8 @@ void XFillTransparenceItem::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterEndElement(pWriter); } -TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item); + +SfxPoolItem* XFormTextShadowTranspItem::CreateDefault() { return new XFormTextShadowTranspItem; } XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence) : SfxUInt16Item(XATTR_FORMTXTSHDWTRANSP, nShdwTransparence) @@ -469,7 +471,7 @@ SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 /*nVer* // class XFillGradientStepCountItem -TYPEINIT1_AUTOFACTORY(XGradientStepCountItem, SfxUInt16Item); +SfxPoolItem* XGradientStepCountItem::CreateDefault() {return new XGradientStepCountItem;} XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) : SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount ) @@ -505,7 +507,8 @@ bool XGradientStepCountItem::GetPresentation return true; } -TYPEINIT1_AUTOFACTORY( XFillBmpTileItem, SfxBoolItem ); + +SfxPoolItem* XFillBmpTileItem::CreateDefault() {return new XFillBmpTileItem;} XFillBmpTileItem::XFillBmpTileItem( bool bTile ) : SfxBoolItem( XATTR_FILLBMP_TILE, bTile ) @@ -549,7 +552,8 @@ void XFillBmpTileItem::dumpAsXml(xmlTextWriterPtr pWriter) const // class XFillBmpTilePosItem -TYPEINIT1_AUTOFACTORY( XFillBmpPosItem, SfxEnumItem ); + +SfxPoolItem* XFillBmpPosItem::CreateDefault() {return new XFillBmpPosItem;} XFillBmpPosItem::XFillBmpPosItem( RECT_POINT eRP ) : SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< sal_uInt16 >( eRP ) ) @@ -598,7 +602,7 @@ void XFillBmpPosItem::dumpAsXml(xmlTextWriterPtr pWriter) const // class XFillBmpTileSizeXItem -TYPEINIT1_AUTOFACTORY( XFillBmpSizeXItem, SfxMetricItem ); +SfxPoolItem* XFillBmpSizeXItem::CreateDefault() {return new XFillBmpSizeXItem;} XFillBmpSizeXItem::XFillBmpSizeXItem( long nSizeX ) : SfxMetricItem( XATTR_FILLBMP_SIZEX, nSizeX ) @@ -639,7 +643,8 @@ bool XFillBmpSizeXItem::HasMetrics() const // class XFillBmpTileSizeYItem -TYPEINIT1_AUTOFACTORY( XFillBmpSizeYItem, SfxMetricItem ); + +SfxPoolItem* XFillBmpSizeYItem::CreateDefault() {return new XFillBmpSizeYItem;} XFillBmpSizeYItem::XFillBmpSizeYItem( long nSizeY ) : SfxMetricItem( XATTR_FILLBMP_SIZEY, nSizeY ) @@ -680,7 +685,7 @@ bool XFillBmpSizeYItem::HasMetrics() const // class XFillBmpTileLogItem -TYPEINIT1_AUTOFACTORY( XFillBmpSizeLogItem, SfxBoolItem ); +SfxPoolItem* XFillBmpSizeLogItem::CreateDefault() {return new XFillBmpSizeLogItem;} XFillBmpSizeLogItem::XFillBmpSizeLogItem( bool bLog ) : SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog ) @@ -716,7 +721,8 @@ bool XFillBmpSizeLogItem::GetPresentation // class XFillBmpTileOffXItem -TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetXItem, SfxUInt16Item ); + +SfxPoolItem* XFillBmpTileOffsetXItem::CreateDefault() {return new XFillBmpTileOffsetXItem;} XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) : SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX ) @@ -752,7 +758,7 @@ bool XFillBmpTileOffsetXItem::GetPresentation // class XFillBmpTileOffYItem -TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetYItem, SfxUInt16Item ); +SfxPoolItem* XFillBmpTileOffsetYItem::CreateDefault() {return new XFillBmpTileOffsetYItem;} XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) : SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY ) @@ -786,7 +792,7 @@ bool XFillBmpTileOffsetYItem::GetPresentation return true; } -TYPEINIT1_AUTOFACTORY( XFillBmpStretchItem, SfxBoolItem ); +SfxPoolItem* XFillBmpStretchItem::CreateDefault() {return new XFillBmpStretchItem;} XFillBmpStretchItem::XFillBmpStretchItem( bool bStretch ) : SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch ) @@ -830,7 +836,7 @@ void XFillBmpStretchItem::dumpAsXml(xmlTextWriterPtr pWriter) const // class XFillBmpTileOffPosXItem -TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetXItem, SfxUInt16Item ); +SfxPoolItem* XFillBmpPosOffsetXItem::CreateDefault() {return new XFillBmpPosOffsetXItem;} XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX ) : SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, nOffPosX ) @@ -866,7 +872,7 @@ bool XFillBmpPosOffsetXItem::GetPresentation // class XFillBmpTileOffPosYItem -TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetYItem, SfxUInt16Item ); +SfxPoolItem* XFillBmpPosOffsetYItem::CreateDefault() {return new XFillBmpPosOffsetYItem;} XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY ) : SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, nOffPosY ) @@ -900,7 +906,7 @@ bool XFillBmpPosOffsetYItem::GetPresentation return true; } -TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem); +SfxPoolItem* XFillBackgroundItem::CreateDefault() {return new XFillBackgroundItem;} XFillBackgroundItem::XFillBackgroundItem( bool bFill ) : SfxBoolItem( XATTR_FILLBACKGROUND, bFill ) diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index ac6c003f18b7..d5036a6d6d7e 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -199,7 +199,8 @@ void XOBitmap::Array2Bitmap() bGraphicDirty = false; } -TYPEINIT1_AUTOFACTORY(XFillBitmapItem, NameOrIndex); + +SfxPoolItem* XFillBitmapItem::CreateDefault() { return new XFillBitmapItem; } XFillBitmapItem::XFillBitmapItem(const OUString& rName, const GraphicObject& rGraphicObject) : NameOrIndex(XATTR_FILLBITMAP, rName), |