summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-04-10 09:26:16 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-04-10 11:40:13 +0200
commit5ab0d0a69ff65eaef1bf043526040b1230fcdb89 (patch)
tree43fec535f04aa7bea0a43f2c0268c567ed3bf2f5 /oox
parent78acb910d2c1d69b03f701dc2dc1fdcbc020125f (diff)
loplugin:inlinefields in oox::vml::VMLExport
Change-Id: Ia6880212503b2945953ca4c3d62d3ddb1d159c7b Reviewed-on: https://gerrit.libreoffice.org/36351 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/vmlexport.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index b68fa6452c73..89d8e5bfb95c 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -65,10 +65,9 @@ VMLExport::VMLExport( ::sax_fastparser::FSHelperPtr const & pSerializer, VMLText
, m_nShapeType( ESCHER_ShpInst_Nil )
, m_nShapeFlags(0)
, m_ShapeStyle( 200 )
- , m_pShapeTypeWritten( new bool[ ESCHER_ShpInst_COUNT ] )
+ , m_aShapeTypeWritten( ESCHER_ShpInst_COUNT )
{
mnGroupLevel = 1;
- memset( m_pShapeTypeWritten, 0, ESCHER_ShpInst_COUNT * sizeof( bool ) );
}
void VMLExport::SetFS( const ::sax_fastparser::FSHelperPtr& pSerializer )
@@ -80,8 +79,6 @@ VMLExport::~VMLExport()
{
delete mpOutStrm;
mpOutStrm = nullptr;
- delete[] m_pShapeTypeWritten;
- m_pShapeTypeWritten = nullptr;
}
void VMLExport::OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance )
@@ -1039,10 +1036,10 @@ sal_Int32 VMLExport::StartShape()
if ( aShapeType != "NULL" )
{
bReferToShapeType = true;
- if ( !m_pShapeTypeWritten[ m_nShapeType ] )
+ if ( !m_aShapeTypeWritten[ m_nShapeType ] )
{
m_pSerializer->write( aShapeType.getStr() );
- m_pShapeTypeWritten[ m_nShapeType ] = true;
+ m_aShapeTypeWritten[ m_nShapeType ] = true;
}
}
else