diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2015-11-07 14:43:19 +0100 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2015-11-11 10:49:30 +0000 |
| commit | fa91dd31f39a24329d288d4e1cda28db3a16af0d (patch) | |
| tree | 603d7c206ac0ec1f1a08cc9f3bf8835bd8d2fb2f /svx/source/sdr | |
| parent | c21ddcdb30b8dd7be56176e00bc2d4780cb342e1 (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/sdr')
| -rw-r--r-- | svx/source/sdr/properties/attributeproperties.cxx | 6 | ||||
| -rw-r--r-- | svx/source/sdr/properties/measureproperties.cxx | 3 | ||||
| -rw-r--r-- | svx/source/sdr/properties/textproperties.cxx | 4 |
3 files changed, 6 insertions, 7 deletions
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); |