From 5abc669599001bf888b97c4d3c2715e1fb7523b9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 20 Apr 2016 10:34:01 +0200 Subject: new plugin stylepolice check for local variables which follow our member field naming convention, which is highly confusing Change-Id: Idacedf7145d09843e96a584237b385f7662eea10 --- oox/source/drawingml/shape.cxx | 8 ++++---- oox/source/drawingml/table/tablestylecellstylecontext.cxx | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'oox') diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 5cb9e8c5a534..29e439958349 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1221,8 +1221,8 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase ) return xShape; // Stream in which to place the rendered shape - SvMemoryStream mpTempStream; - Reference < io::XStream > xStream( new utl::OStreamWrapper( mpTempStream ) ); + SvMemoryStream pTempStream; + Reference < io::XStream > xStream( new utl::OStreamWrapper( pTempStream ) ); Reference < io::XOutputStream > xOutputStream( xStream->getOutputStream() ); // Rendering format @@ -1258,11 +1258,11 @@ Reference < XShape > Shape::renderDiagramToGraphic( XmlFilterBase& rFilterBase ) xGraphicExporter->setSourceDocument( xSourceDoc ); xGraphicExporter->filter( aDescriptor ); - mpTempStream.Seek( STREAM_SEEK_TO_BEGIN ); + pTempStream.Seek( STREAM_SEEK_TO_BEGIN ); Graphic aGraphic; GraphicFilter aFilter( false ); - if ( aFilter.ImportGraphic( aGraphic, "", mpTempStream, GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE, static_cast < Sequence < PropertyValue >* > ( nullptr ) ) != GRFILTER_OK ) + if ( aFilter.ImportGraphic( aGraphic, "", pTempStream, GRFILTER_FORMAT_NOTFOUND, nullptr, GraphicFilterImportFlags::NONE, static_cast < Sequence < PropertyValue >* > ( nullptr ) ) != GRFILTER_OK ) { SAL_WARN( "oox.drawingml", OSL_THIS_FUNC << "Unable to import rendered stream into graphic object" ); diff --git a/oox/source/drawingml/table/tablestylecellstylecontext.cxx b/oox/source/drawingml/table/tablestylecellstylecontext.cxx index ef9be244dfe0..6f6f2354203a 100644 --- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx +++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx @@ -66,9 +66,9 @@ TableStyleCellStyleContext::onCreateContext( ::sal_Int32 aElementToken, const At if ( mnLineType != XML_none ) { std::map < sal_Int32, ::oox::drawingml::LinePropertiesPtr >& rLineBorders = mrTableStylePart.getLineBorders(); - ::oox::drawingml::LinePropertiesPtr mpLineProperties( new oox::drawingml::LineProperties ); - rLineBorders[ mnLineType ] = mpLineProperties; - return new LinePropertiesContext( *this, rAttribs, *mpLineProperties ); + ::oox::drawingml::LinePropertiesPtr pLineProperties( new oox::drawingml::LineProperties ); + rLineBorders[ mnLineType ] = pLineProperties; + return new LinePropertiesContext( *this, rAttribs, *pLineProperties ); } } break; -- cgit