mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:cstylecast: deal with remaining pointer casts

Browse Source 
Change-Id: Ia702fa56c6ed17b26817e1c0d1720cb26199a6da
This commit is contained in:
Stephan Bergmann
2015-06-08 16:26:48 +02:00
parent b17d8a19e0
commit 17a5b0f6ed
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oox/source/ppt/dgmimport.cxx
View File

@@ -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 ) 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 ) QuickDiagrammingImport::QuickDiagrammingImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )

2
oox/source/ppt/dgmlayout.cxx
View File

@@ -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 ) 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 ) QuickDiagrammingLayout::QuickDiagrammingLayout( const Reference< XComponentContext >& rxContext )

4
oox/source/ppt/pptshapegroupcontext.cxx
View File

@@ -56,7 +56,7 @@ PPTShapeGroupContext::PPTShapeGroupContext(
: ShapeGroupContext( rParent, pMasterShapePtr, pGroupShapePtr ) : ShapeGroupContext( rParent, pMasterShapePtr, pGroupShapePtr )
, mpSlidePersistPtr( rSlidePersistPtr ) , mpSlidePersistPtr( rSlidePersistPtr )
, meShapeLocation( eShapeLocation ) , meShapeLocation( eShapeLocation )
, pGraphicShape( (PPTShape *)NULL ) , pGraphicShape( nullptr )
{ {
} }
@@ -136,7 +136,7 @@ void PPTShapeGroupContext::importExtDrawings( )
if( pGraphicShape->getFontRefColorForNodes().isUsed() ) if( pGraphicShape->getFontRefColorForNodes().isUsed() )
applyFontRefColor(mpGroupShapePtr, pGraphicShape->getFontRefColorForNodes()); applyFontRefColor(mpGroupShapePtr, pGraphicShape->getFontRefColorForNodes());
} }
pGraphicShape = oox::drawingml::ShapePtr( (PPTShape *)NULL ); pGraphicShape = oox::drawingml::ShapePtr( nullptr );
} }
} }

2
oox/source/shape/ShapeContextHandler.cxx
View File

@@ -475,7 +475,7 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException, std::exception)
pShapePtr->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix, pShapePtr->getFillProperties() ); pShapePtr->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix, pShapePtr->getFillProperties() );
xResult = pShapePtr->getXShape(); xResult = pShapePtr->getXShape();
} }
mpShape.reset((Shape*)0); mpShape.reset();
} }
mxDiagramShapeContext.clear(); mxDiagramShapeContext.clear();
} }

2
oox/source/shape/ShapeDrawingFragmentHandler.cxx
View File

@@ -32,7 +32,7 @@ void SAL_CALL ShapeDrawingFragmentHandler::endDocument() throw (xml::sax::SAXExc
switch( Element ) switch( Element )
{ {
case DSP_TOKEN( spTree ): 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: default:
break; break;
} }