summaryrefslogtreecommitdiff
path: root/svx/source/svdraw
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2015-11-07 14:43:19 +0100
committerOliver Specht <oliver.specht@cib.de>2015-11-11 10:49:30 +0000
commitfa91dd31f39a24329d288d4e1cda28db3a16af0d (patch)
tree603d7c206ac0ec1f1a08cc9f3bf8835bd8d2fb2f /svx/source/svdraw
parentc21ddcdb30b8dd7be56176e00bc2d4780cb342e1 (diff)
5th step to remove tools/rtti.hxx
tools/rtti.hxx removed completed the interface of some Sdr.* Items and removed pseudo items Change-Id: I0cdcd01494be35b97a27d5985aa908affa96048a Reviewed-on: https://gerrit.libreoffice.org/19837 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'svx/source/svdraw')
-rw-r--r--svx/source/svdraw/svdattr.cxx133
-rw-r--r--svx/source/svdraw/svdcrtv.cxx2
-rw-r--r--svx/source/svdraw/svddrgm1.hxx8
-rw-r--r--svx/source/svdraw/svddrgmt.cxx12
-rw-r--r--svx/source/svdraw/svddrgv.cxx2
-rw-r--r--svx/source/svdraw/svdibrow.cxx47
-rw-r--r--svx/source/svdraw/svdmodel.cxx1
-rw-r--r--svx/source/svdraw/svdoashp.cxx1
-rw-r--r--svx/source/svdraw/svdoattr.cxx1
-rw-r--r--svx/source/svdraw/svdobj.cxx7
-rw-r--r--svx/source/svdraw/svdocapt.cxx1
-rw-r--r--svx/source/svdraw/svdocirc.cxx1
-rw-r--r--svx/source/svdraw/svdoedge.cxx3
-rw-r--r--svx/source/svdraw/svdograf.cxx1
-rw-r--r--svx/source/svdraw/svdogrp.cxx1
-rw-r--r--svx/source/svdraw/svdomeas.cxx2
-rw-r--r--svx/source/svdraw/svdomedia.cxx1
-rw-r--r--svx/source/svdraw/svdoole2.cxx1
-rw-r--r--svx/source/svdraw/svdopage.cxx1
-rw-r--r--svx/source/svdraw/svdopath.cxx1
-rw-r--r--svx/source/svdraw/svdorect.cxx1
-rw-r--r--svx/source/svdraw/svdotext.cxx1
-rw-r--r--svx/source/svdraw/svdotxat.cxx8
-rw-r--r--svx/source/svdraw/svdotxdr.cxx4
-rw-r--r--svx/source/svdraw/svdouno.cxx1
-rw-r--r--svx/source/svdraw/svdovirt.cxx1
-rw-r--r--svx/source/svdraw/svdpage.cxx2
-rw-r--r--svx/source/svdraw/svdpntv.cxx1
-rw-r--r--svx/source/svdraw/svdundo.cxx1
-rw-r--r--svx/source/svdraw/svdview.cxx1
30 files changed, 130 insertions, 118 deletions
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),