diff options
author | Oliver Specht <oliver.specht@cib.de> | 2015-09-29 15:35:28 +0200 |
---|---|---|
committer | Oliver Specht <oliver.specht@cib.de> | 2015-10-01 08:32:26 +0000 |
commit | 85f93697defd9a812a0cda0bc4e9364e28c0339e (patch) | |
tree | 0c43827cda0e18b03c3d28599b696bcab3a8069a /svx/source/sdr | |
parent | c1e0a697a70872ef1b6deaf5222538899554221b (diff) |
tdf#94559: third step to remove rtti.hxx
replaced use of PTR_CAST, IS_TYPE, ISA in
oox, reportdesign, svl, svtools, svx, tools
Change-Id: I1f85ff92267a0668eba625fa61b4f07feb8f3d4e
Reviewed-on: https://gerrit.libreoffice.org/19002
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/contact/objectcontactofpageview.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/contact/viewcontactofsdrobj.cxx | 6 | ||||
-rw-r--r-- | svx/source/sdr/properties/e3dsceneproperties.cxx | 6 | ||||
-rw-r--r-- | svx/source/sdr/properties/itemsettools.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/properties/properties.cxx | 2 | ||||
-rw-r--r-- | svx/source/sdr/properties/textproperties.cxx | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 05c6ab4ce0f0..f27bfdd8b0cd 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -329,7 +329,7 @@ namespace sdr if(pActiveGroupList) { - if(pActiveGroupList->ISA(SdrPage)) + if(dynamic_cast<const SdrPage*>( pActiveGroupList) != nullptr) { // It's a Page itself return &(static_cast<SdrPage*>(pActiveGroupList)->GetViewContact()); diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 5e457dc4908a..6ff5375ae927 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -52,7 +52,7 @@ ViewContactOfSdrObj::ViewContactOfSdrObj(SdrObject& rObj) meRememberedAnimationKind(SDRTEXTANI_NONE) { // init AnimationKind - if(GetSdrObject().ISA(SdrTextObj)) + if(dynamic_cast<const SdrTextObj*>( &GetSdrObject() ) != nullptr) { SdrTextObj& rTextObj = static_cast<SdrTextObj&>(GetSdrObject()); meRememberedAnimationKind = rTextObj.GetTextAniKind(); @@ -90,7 +90,7 @@ ViewContact* ViewContactOfSdrObj::GetParentContact() const if(pObjList) { - if(pObjList->ISA(SdrPage)) + if(dynamic_cast<const SdrPage*>( pObjList) != nullptr) { // Is a page pRetval = &(static_cast<SdrPage*>(pObjList)->GetViewContact()); @@ -112,7 +112,7 @@ ViewContact* ViewContactOfSdrObj::GetParentContact() const void ViewContactOfSdrObj::ActionChanged() { // look for own changes - if(GetSdrObject().ISA(SdrTextObj)) + if(dynamic_cast<const SdrTextObj*>( &GetSdrObject() ) != nullptr) { SdrTextObj& rTextObj = static_cast<SdrTextObj&>(GetSdrObject()); diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 25c9ff66e143..3494219726ca 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -80,7 +80,7 @@ namespace sdr { SdrObject* pObj = pSub->GetObj(a); - if(pObj && pObj->ISA(E3dCompoundObject)) + if(pObj && dynamic_cast<const E3dCompoundObject* >(pObj) != nullptr) { const SfxItemSet& rSet = pObj->GetMergedItemSet(); SfxWhichIter aIter(rSet); @@ -135,7 +135,7 @@ namespace sdr { SdrObject* pObj = pSub->GetObj(a); - if(pObj && pObj->ISA(E3dCompoundObject)) + if(pObj && dynamic_cast<const E3dCompoundObject* >(pObj) != nullptr) { // set merged ItemSet at contained 3d object. pObj->SetMergedItemSet(*pNewSet, bClearAllItems); @@ -291,7 +291,7 @@ namespace sdr while(a3DIterator.IsMore()) { E3dObject* pObj = static_cast<E3dObject*>(a3DIterator.Next()); - DBG_ASSERT(pObj->ISA(E3dObject), "In scenes there are only 3D objects allowed (!)"); + DBG_ASSERT(dynamic_cast<const E3dObject* >(pObj) != nullptr, "In scenes there are only 3D objects allowed (!)"); pObj->GetProperties().MoveToItemPool(pSrcPool, pDestPool, pNewModel); } } diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index 77ca0bda361e..e97c4479af68 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -36,7 +36,7 @@ namespace sdr { ItemChangeBroadcaster::ItemChangeBroadcaster(const SdrObject& rObj) { - if(rObj.ISA(SdrObjGroup)) + if(dynamic_cast<const SdrObjGroup*>( &rObj ) != nullptr) { SdrObjListIter aIter(static_cast<const SdrObjGroup&>(rObj), IM_DEEPNOGROUPS); mpData = new RectangleVector; diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index 9ab5f2a79858..5c2029f3246f 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -140,7 +140,7 @@ namespace sdr //} // invalidate all new rectangles - if(GetSdrObject().ISA(SdrObjGroup)) + if(dynamic_cast<const SdrObjGroup*>( &GetSdrObject() ) != nullptr) { SdrObjListIter aIter(static_cast<SdrObjGroup&>(GetSdrObject()), IM_DEEPNOGROUPS); diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 7bb4e4af908b..02a6dbf6d9d6 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -473,7 +473,7 @@ namespace sdr { const SvxFieldData* pData = pFieldItem->GetField(); - if(pData && pData->ISA(SvxURLField)) + if(pData && dynamic_cast<const SvxURLField*>( pData) != nullptr) { bHasURL = true; break; |