diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:26:48 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-08 16:26:48 +0200 |
commit | 17a5b0f6ed885f1e638b5265f13f96a9c234efcf (patch) | |
tree | dfe795df26cecf2499b56654ba54ca5aa19ea470 /oox/source/shape | |
parent | b17d8a19e0880713f8e5ebbe36e38dffc3899758 (diff) |
loplugin:cstylecast: deal with remaining pointer casts
Change-Id: Ia702fa56c6ed17b26817e1c0d1720cb26199a6da
Diffstat (limited to 'oox/source/shape')
-rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 2 | ||||
-rw-r--r-- | oox/source/shape/ShapeDrawingFragmentHandler.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 39cc970f0be1..5dbcdfc87df4 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -475,7 +475,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception) pShapePtr->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix, pShapePtr->getFillProperties() ); xResult = pShapePtr->getXShape(); } - mpShape.reset((Shape*)0); + mpShape.reset(); } mxDiagramShapeContext.clear(); } diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx b/oox/source/shape/ShapeDrawingFragmentHandler.cxx index 8f64af353012..2a86ae08b88a 100644 --- a/oox/source/shape/ShapeDrawingFragmentHandler.cxx +++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx @@ -32,7 +32,7 @@ void SAL_CALL ShapeDrawingFragmentHandler::endDocument() throw (xml::sax::SAXExc switch( Element ) { case DSP_TOKEN( spTree ): - return new oox::drawingml::ShapeGroupContext(*this, oox::drawingml::ShapePtr((oox::drawingml::Shape*)0), mpGroupShapePtr); + return new oox::drawingml::ShapeGroupContext(*this, oox::drawingml::ShapePtr(nullptr), mpGroupShapePtr); default: break; } |