diff options
author | Noel Grandin <noel@peralex.com> | 2016-04-20 10:34:01 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-04-21 08:32:47 +0200 |
commit | 5abc669599001bf888b97c4d3c2715e1fb7523b9 (patch) | |
tree | 2407c6fc040a795e6ffc69de02ba940285c04c7f /xmloff | |
parent | 5bb308a9ad16f6002486a60e4a753693818580b6 (diff) |
new plugin stylepolice
check for local variables which follow our member field naming
convention, which is highly confusing
Change-Id: Idacedf7145d09843e96a584237b385f7662eea10
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/chart/SchXMLChartContext.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/core/xmlimp.cxx | 3 | ||||
-rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/xforms/xformsapi.cxx | 10 |
4 files changed, 12 insertions, 15 deletions
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 2c6c6bd7823c..3a05c5c61b14 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -1149,7 +1149,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut { sal_Int16 nAttrCount = xAttrList.is()? xAttrList->getLength(): 0; - css::awt::Point maPosition; + css::awt::Point aPosition; bool bHasXPosition=false; bool bHasYPosition=false; @@ -1165,13 +1165,13 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut if( IsXMLToken( aLocalName, XML_X ) ) { GetImport().GetMM100UnitConverter().convertMeasureToCore( - maPosition.X, aValue ); + aPosition.X, aValue ); bHasXPosition = true; } else if( IsXMLToken( aLocalName, XML_Y ) ) { GetImport().GetMM100UnitConverter().convertMeasureToCore( - maPosition.Y, aValue ); + aPosition.Y, aValue ); bHasYPosition = true; } } @@ -1185,7 +1185,7 @@ void SchXMLTitleContext::StartElement( const uno::Reference< xml::sax::XAttribut if( mxTitleShape.is()) { if( bHasXPosition && bHasYPosition ) - mxTitleShape->setPosition( maPosition ); + mxTitleShape->setPosition( aPosition ); uno::Reference< beans::XPropertySet > xProp( mxTitleShape, uno::UNO_QUERY ); if( xProp.is()) diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 7034d75850cf..f3e897eae52b 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -413,9 +413,6 @@ void SvXMLImport::InitCtor_() mxEventListener.set(new SvXMLImportEventListener(this)); mxModel->addEventListener(mxEventListener); } - - ::comphelper::UnoInterfaceToUniqueIdentifierMapper maInterfaceToIdentifierMapper; - } SvXMLImport::SvXMLImport( diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 4577f7256e56..a305be733999 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -585,7 +585,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape sal_Int32 nZIndex = 0; uno::Reference< beans::XPropertySet > xSet( xShape, uno::UNO_QUERY ); - std::unique_ptr< SvXMLElementExport > mpHyperlinkElement; + std::unique_ptr< SvXMLElementExport > pHyperlinkElement; // export hyperlinks with <a><shape/></a>. Currently only in draw since draw // does not support document events @@ -605,7 +605,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sURL ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, XML_SIMPLE ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_SHOW, XML_EMBED ); - mpHyperlinkElement.reset( new SvXMLElementExport(mrExport, XML_NAMESPACE_DRAW, XML_A, true, true) ); + pHyperlinkElement.reset( new SvXMLElementExport(mrExport, XML_NAMESPACE_DRAW, XML_A, true, true) ); } } } @@ -935,7 +935,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape } } - mpHyperlinkElement.reset(); + pHyperlinkElement.reset(); // #97489# #97111# // if there was an error and no element for the shape was exported diff --git a/xmloff/source/xforms/xformsapi.cxx b/xmloff/source/xforms/xformsapi.cxx index 5916051b3a07..17383a4908b9 100644 --- a/xmloff/source/xforms/xformsapi.cxx +++ b/xmloff/source/xforms/xformsapi.cxx @@ -197,14 +197,14 @@ sal_uInt16 xforms_getTypeClass( OUString sLocalName; sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName(rXMLName, &sLocalName); SvXMLTokenMap aMap( aTypes ); - sal_uInt16 mnToken = aMap.Get( nPrefix, sLocalName ); + sal_uInt16 nToken = aMap.Get( nPrefix, sLocalName ); sal_uInt16 nTypeClass = css::xsd::DataTypeClass::STRING; - if( mnToken != XML_TOK_UNKNOWN ) + if( nToken != XML_TOK_UNKNOWN ) { // we found an XSD name: then get the proper API name for it DBG_ASSERT( xRepository.is(), "can't find type without repository"); - switch( mnToken ) + switch( nToken ) { case XML_STRING: nTypeClass = css::xsd::DataTypeClass::STRING; @@ -267,8 +267,8 @@ OUString xforms_getTypeName( OUString sLocalName; sal_uInt16 nPrefix = rNamespaceMap.GetKeyByAttrName(rXMLName, &sLocalName); SvXMLTokenMap aMap( aTypes ); - sal_uInt16 mnToken = aMap.Get( nPrefix, sLocalName ); - return ( mnToken == XML_TOK_UNKNOWN ) + sal_uInt16 nToken = aMap.Get( nPrefix, sLocalName ); + return ( nToken == XML_TOK_UNKNOWN ) ? rXMLName : xforms_getBasicTypeName( xRepository, rNamespaceMap, rXMLName ); } |