loplugin:cstylecast: deal with remaining pointer casts

Change-Id: Ia702fa56c6ed17b26817e1c0d1720cb26199a6da

5 files changed, 6 insertions, 6 deletions

diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
index 5b20196f9ca3..4cf8b2b0b62c 100644
--- a/oox/source/ppt/dgmimport.cxx
+++ b/oox/source/ppt/dgmimport.cxx
@@ -48,7 +48,7 @@ uno::Sequence< OUString > SAL_CALL QuickDiagrammingImport_getSupportedServiceNam
 
 uno::Reference< uno::XInterface > SAL_CALL QuickDiagrammingImport_createInstance( const Reference< XComponentContext >& rxContext ) throw( Exception )
 {
-    return (cppu::OWeakObject*)new QuickDiagrammingImport( rxContext );
+    return static_cast<cppu::OWeakObject*>(new QuickDiagrammingImport( rxContext ));
 }
 
 QuickDiagrammingImport::QuickDiagrammingImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx
index 681f5b532a7a..493d161b4b2f 100644
--- a/oox/source/ppt/dgmlayout.cxx
+++ b/oox/source/ppt/dgmlayout.cxx
@@ -55,7 +55,7 @@ uno::Sequence< OUString > SAL_CALL QuickDiagrammingLayout_getSupportedServiceNam
 
 uno::Reference< uno::XInterface > SAL_CALL QuickDiagrammingLayout_createInstance( const Reference< XComponentContext >& rxContext ) throw( Exception )
 {
-    return (cppu::OWeakObject*)new QuickDiagrammingLayout( rxContext );
+    return static_cast<cppu::OWeakObject*>(new QuickDiagrammingLayout( rxContext ));
 }
 
 QuickDiagrammingLayout::QuickDiagrammingLayout( const Reference< XComponentContext >& rxContext )
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx
index 05044caa23b0..3b3d20cfc649 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -56,7 +56,7 @@ PPTShapeGroupContext::PPTShapeGroupContext(
 : ShapeGroupContext( rParent, pMasterShapePtr, pGroupShapePtr )
 , mpSlidePersistPtr( rSlidePersistPtr )
 , meShapeLocation( eShapeLocation )
-, pGraphicShape( (PPTShape *)NULL )
+, pGraphicShape( nullptr )
 {
 }
 
@@ -136,7 +136,7 @@ void PPTShapeGroupContext::importExtDrawings( )
                 if( pGraphicShape->getFontRefColorForNodes().isUsed() )
                     applyFontRefColor(mpGroupShapePtr, pGraphicShape->getFontRefColorForNodes());
             }
-            pGraphicShape = oox::drawingml::ShapePtr( (PPTShape *)NULL );
+            pGraphicShape = oox::drawingml::ShapePtr( nullptr );
     }
 }
 
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;
     }