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 /oox | |
| 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 'oox')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 2 | ||||
| -rw-r--r-- | oox/source/export/shapes.cxx | 2 | ||||
| -rw-r--r-- | oox/source/export/vmlexport.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index c4021a391ef1..a8e3f8818a3e 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2095,7 +2095,7 @@ void DrawingML::WriteText( Reference< XInterface > rXIface, const OUString& pres uno::Reference<drawing::XShape> xShape(rXIface, uno::UNO_QUERY); SdrObject* pSdrObject = xShape.is() ? GetSdrObjectFromXShape(xShape) : 0; - const SdrTextObj* pTxtObj = PTR_CAST(SdrTextObj, pSdrObject); + const SdrTextObj* pTxtObj = dynamic_cast<SdrTextObj*>( pSdrObject ); if (pTxtObj && mpTextExport) { const OutlinerParaObject* pParaObj = 0; diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 571177d7feae..2f73d27e02b8 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1501,7 +1501,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( Reference< XShape > xShape ) SdrObject* pSdrOLE2( GetSdrObjectFromXShape( xShape ) ); // The spec doesn't allow <p:pic> here, but PowerPoint requires it. bool bEcma = mpFB->getVersion() == oox::core::ECMA_DIALECT; - if ( pSdrOLE2 && pSdrOLE2->ISA( SdrOle2Obj ) && bEcma) + if ( pSdrOLE2 && dynamic_cast<const SdrOle2Obj*>( pSdrOLE2) != nullptr && bEcma) { const Graphic* pGraphic = static_cast<SdrOle2Obj*>(pSdrOLE2)->GetGraphic(); if ( pGraphic ) diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx index c71ffa7564c6..6fad39092bc4 100644 --- a/oox/source/export/vmlexport.cxx +++ b/oox/source/export/vmlexport.cxx @@ -1141,7 +1141,7 @@ sal_Int32 VMLExport::StartShape() m_pSerializer->startElementNS( XML_v, nShapeElement, XFastAttributeListRef( m_pShapeAttrList ) ); // now check if we have some editeng text (not associated textbox) and we have a text exporter registered - const SdrTextObj* pTxtObj = PTR_CAST(SdrTextObj, m_pSdrObject); + const SdrTextObj* pTxtObj = dynamic_cast<const SdrTextObj*>( m_pSdrObject ); if (pTxtObj && m_pTextExport && msfilter::util::HasTextBoxContent(m_nShapeType) && !IsWaterMarkShape(m_pSdrObject->GetName()) && !lcl_isTextBox(m_pSdrObject)) { const OutlinerParaObject* pParaObj = 0; |