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

loplugin:subtlezeroinit: oox

Browse Source 
Change-Id: I8a1b6baba6191b20264f32cbf73f5d75bc50235b
This commit is contained in:
Stephan Bergmann
2017-02-20 19:45:31 +01:00
parent d763944d30
commit d1ffd54cf4
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oox/source/crypto/DocumentDecryption.cxx
View File

@@ -242,7 +242,7 @@ bool DocumentDecryption::readAgileEncryptionInfo(Reference< XInputStream >& xInp
bool DocumentDecryption::readStandard2007EncryptionInfo(BinaryInputStream& rStream) bool DocumentDecryption::readStandard2007EncryptionInfo(BinaryInputStream& rStream)
{ {
Standard2007Engine* engine = new Standard2007Engine(); Standard2007Engine* engine = new Standard2007Engine;
mEngine.reset(engine); mEngine.reset(engine);
msfilter::StandardEncryptionInfo& info = engine->getInfo(); msfilter::StandardEncryptionInfo& info = engine->getInfo();

2
oox/source/drawingml/customshapegeometry.cxx
View File

@@ -442,7 +442,7 @@ static OUString convertToOOEquation( CustomShapeProperties& rCustomShapeProperti
{ {
if ( !pCommandHashMap ) if ( !pCommandHashMap )
{ {
FormulaCommandHMap* pHM = new FormulaCommandHMap(); FormulaCommandHMap* pHM = new FormulaCommandHMap;
for(const FormularCommandNameTable& i : pFormularCommandNameTable) for(const FormularCommandNameTable& i : pFormularCommandNameTable)
(*pHM)[ OUString::createFromAscii( i.pS ) ] = i.pE; (*pHM)[ OUString::createFromAscii( i.pS ) ] = i.pE;
pCommandHashMap = pHM; pCommandHashMap = pHM;

8
oox/source/drawingml/diagram/diagram.cxx
View File

@@ -392,12 +392,12 @@ void loadDiagram( ShapePtr& pShape,
const OUString& rQStylePath, const OUString& rQStylePath,
const OUString& rColorStylePath ) const OUString& rColorStylePath )
{ {
DiagramPtr pDiagram( new Diagram() ); DiagramPtr pDiagram( new Diagram );
DiagramDataPtr pData( new DiagramData() ); DiagramDataPtr pData( new DiagramData() );
pDiagram->setData( pData ); pDiagram->setData( pData );
DiagramLayoutPtr pLayout( new DiagramLayout() ); DiagramLayoutPtr pLayout( new DiagramLayout );
pDiagram->setLayout( pLayout ); pDiagram->setLayout( pLayout );
// data // data
@@ -489,12 +489,12 @@ void loadDiagram( const ShapePtr& pShape,
const uno::Reference<xml::dom::XDocument>& rXQStyleDom, const uno::Reference<xml::dom::XDocument>& rXQStyleDom,
const uno::Reference<xml::dom::XDocument>& rXColorStyleDom ) const uno::Reference<xml::dom::XDocument>& rXColorStyleDom )
{ {
DiagramPtr pDiagram( new Diagram() ); DiagramPtr pDiagram( new Diagram );
DiagramDataPtr pData( new DiagramData() ); DiagramDataPtr pData( new DiagramData() );
pDiagram->setData( pData ); pDiagram->setData( pData );
DiagramLayoutPtr pLayout( new DiagramLayout() ); DiagramLayoutPtr pLayout( new DiagramLayout );
pDiagram->setLayout( pLayout ); pDiagram->setLayout( pLayout );
// data // data

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

@@ -106,7 +106,7 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext( sal_Int32 aElementToken
{ {
// The shape wants a background, but the slide doesn't have // The shape wants a background, but the slide doesn't have
// one: default to white. // one: default to white.
pBackgroundPropertiesPtr.reset(new oox::drawingml::FillProperties()); pBackgroundPropertiesPtr.reset(new oox::drawingml::FillProperties);
pBackgroundPropertiesPtr->moFillType = XML_solidFill; pBackgroundPropertiesPtr->moFillType = XML_solidFill;
pBackgroundPropertiesPtr->maFillColor.setSrgbClr(0xFFFFFF); pBackgroundPropertiesPtr->maFillColor.setSrgbClr(0xFFFFFF);
} }

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

@@ -169,7 +169,7 @@ SlideFragmentHandler::~SlideFragmentHandler()
const FillProperties *pFillProperties = nullptr; const FillProperties *pFillProperties = nullptr;
if( mpSlidePersistPtr->getTheme() ) if( mpSlidePersistPtr->getTheme() )
pFillProperties = mpSlidePersistPtr->getTheme()->getFillStyle( rAttribs.getInteger( XML_idx, -1 ) ); pFillProperties = mpSlidePersistPtr->getTheme()->getFillStyle( rAttribs.getInteger( XML_idx, -1 ) );
FillPropertiesPtr pFillPropertiesPtr( pFillProperties ? new FillProperties( *pFillProperties ) : new FillProperties() ); FillPropertiesPtr pFillPropertiesPtr( pFillProperties ? new FillProperties( *pFillProperties ) : new FillProperties );
mpSlidePersistPtr->setBackgroundProperties( pFillPropertiesPtr ); mpSlidePersistPtr->setBackgroundProperties( pFillPropertiesPtr );
ContextHandlerRef ret = new ColorContext( *this, mpSlidePersistPtr->getBackgroundColor() ); ContextHandlerRef ret = new ColorContext( *this, mpSlidePersistPtr->getBackgroundColor() );
return ret; return ret;
@@ -179,7 +179,7 @@ SlideFragmentHandler::~SlideFragmentHandler()
case A_TOKEN( overrideClrMapping ): case A_TOKEN( overrideClrMapping ):
case PPT_TOKEN( clrMap ): // CT_ColorMapping case PPT_TOKEN( clrMap ): // CT_ColorMapping
{ {
oox::drawingml::ClrMapPtr pClrMapPtr( ( aElementToken == PPT_TOKEN( clrMap ) || !mpSlidePersistPtr.get() || !mpSlidePersistPtr->getClrMap().get() ) ? new oox::drawingml::ClrMap() : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) ); oox::drawingml::ClrMapPtr pClrMapPtr( ( aElementToken == PPT_TOKEN( clrMap ) || !mpSlidePersistPtr.get() || !mpSlidePersistPtr->getClrMap().get() ) ? new oox::drawingml::ClrMap : new oox::drawingml::ClrMap( *mpSlidePersistPtr->getClrMap() ) );
ContextHandlerRef ret = new oox::drawingml::clrMapContext( *this, rAttribs, *pClrMapPtr ); ContextHandlerRef ret = new oox::drawingml::clrMapContext( *this, rAttribs, *pClrMapPtr );
mpSlidePersistPtr->setClrMap( pClrMapPtr ); mpSlidePersistPtr->setClrMap( pClrMapPtr );
return ret; return ret;