diff options
author | Noel Grandin <noel@peralex.com> | 2016-04-27 09:22:13 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-28 09:31:16 +0000 |
commit | 43b4903db3e925c652e25c34362490f8adc9c5ec (patch) | |
tree | af12777b72d42280467e8cc19b914b2c7f4f3816 /xmloff/source/draw | |
parent | 7d6308dad9f4a079d57719a6e3a9c4cebb47d051 (diff) |
teach stylepolice plugin about ref-counted-pointer naming
Change-Id: I6e91d22fc1826038c05ddb6fc065563c6a250752
Reviewed-on: https://gerrit.libreoffice.org/24459
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 66 | ||||
-rw-r--r-- | xmloff/source/draw/ximp3dobject.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/draw/ximp3dscene.cxx | 10 |
4 files changed, 45 insertions, 45 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 03586a0a73fb..80f18e17095d 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1653,18 +1653,18 @@ OUString SdXMLExport::ImpCreatePresPageStyleName( const Reference<XDrawPage>& xD const rtl::Reference< SvXMLExportPropertyMapper > aMapperRef( GetPresPagePropsMapper() ); - std::vector< XMLPropertyState > xPropStates( aMapperRef->Filter( xPropSet ) ); + std::vector< XMLPropertyState > aPropStates( aMapperRef->Filter( xPropSet ) ); - if( !xPropStates.empty() ) + if( !aPropStates.empty() ) { // there are filtered properties -> hard attributes // try to find this style in AutoStylePool - sStyleName = GetAutoStylePool()->Find(XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, sStyleName, xPropStates); + sStyleName = GetAutoStylePool()->Find(XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, sStyleName, aPropStates); if(sStyleName.isEmpty()) { // Style did not exist, add it to AutoStalePool - sStyleName = GetAutoStylePool()->Add(XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, sStyleName, xPropStates); + sStyleName = GetAutoStylePool()->Add(XML_STYLE_FAMILY_SD_DRAWINGPAGE_ID, sStyleName, aPropStates); } } } diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index a305be733999..92c965ee0e71 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -377,12 +377,12 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap } // filter propset - std::vector< XMLPropertyState > xPropStates; + std::vector< XMLPropertyState > aPropStates; sal_Int32 nCount = 0; if( (!bIsEmptyPresObj || (aShapeInfo.meShapeType != XmlShapeTypePresPageShape)) ) { - xPropStates = GetPropertySetMapper()->Filter( xPropSet ); + aPropStates = GetPropertySetMapper()->Filter( xPropSet ); if (XmlShapeTypeDrawControlShape == aShapeInfo.meShapeType) { @@ -403,13 +403,13 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap DBG_ASSERT(-1 != nIndex, "XMLShapeExport::collectShapeAutoStyles: could not obtain the index for our context id!"); XMLPropertyState aNewState(nIndex, uno::makeAny(sNumberStyle)); - xPropStates.push_back(aNewState); + aPropStates.push_back(aNewState); } } } - std::vector< XMLPropertyState >::iterator aIter = xPropStates.begin(); - std::vector< XMLPropertyState >::iterator aEnd = xPropStates.end(); + std::vector< XMLPropertyState >::iterator aIter = aPropStates.begin(); + std::vector< XMLPropertyState >::iterator aEnd = aPropStates.end(); while( aIter != aEnd ) { if( aIter->mnIndex != -1 ) @@ -427,19 +427,19 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap { // there are filtered properties -> hard attributes // try to find this style in AutoStylePool - aShapeInfo.msStyleName = mrExport.GetAutoStylePool()->Find(aShapeInfo.mnFamily, aParentName, xPropStates); + aShapeInfo.msStyleName = mrExport.GetAutoStylePool()->Find(aShapeInfo.mnFamily, aParentName, aPropStates); if(aShapeInfo.msStyleName.isEmpty()) { // Style did not exist, add it to AutoStalePool - aShapeInfo.msStyleName = mrExport.GetAutoStylePool()->Add(aShapeInfo.mnFamily, aParentName, xPropStates); + aShapeInfo.msStyleName = mrExport.GetAutoStylePool()->Add(aShapeInfo.mnFamily, aParentName, aPropStates); } } // optionaly generate auto style for text attributes if( (!bIsEmptyPresObj || (aShapeInfo.meShapeType != XmlShapeTypePresPageShape)) && bObjSupportsText ) { - xPropStates = GetExport().GetTextParagraphExport()->GetParagraphPropertyMapper()->Filter( xPropSet ); + aPropStates = GetExport().GetTextParagraphExport()->GetParagraphPropertyMapper()->Filter( xPropSet ); // yet more additionally, we need to care for the ParaAdjust property if ( XmlShapeTypeDrawControlShape == aShapeInfo.meShapeType ) @@ -467,14 +467,14 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap uno::Any aParaAdjustValue = xPropSet->getPropertyValue( "ParaAdjust" ); XMLPropertyState aAlignDefaultState( nIndex, aParaAdjustValue ); - xPropStates.push_back( aAlignDefaultState ); + aPropStates.push_back( aAlignDefaultState ); } } } nCount = 0; - std::vector< XMLPropertyState >::iterator aIter = xPropStates.begin(); - std::vector< XMLPropertyState >::iterator aEnd = xPropStates.end(); + std::vector< XMLPropertyState >::iterator aIter = aPropStates.begin(); + std::vector< XMLPropertyState >::iterator aEnd = aPropStates.end(); while( aIter != aEnd ) { if( aIter->mnIndex != -1 ) @@ -484,11 +484,11 @@ void XMLShapeExport::collectShapeAutoStyles(const uno::Reference< drawing::XShap if( nCount ) { - aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Find( XML_STYLE_FAMILY_TEXT_PARAGRAPH, "", xPropStates ); + aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Find( XML_STYLE_FAMILY_TEXT_PARAGRAPH, "", aPropStates ); if(aShapeInfo.msTextStyleName.isEmpty()) { // Style did not exist, add it to AutoStalePool - aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TEXT_PARAGRAPH, "", xPropStates); + aShapeInfo.msTextStyleName = mrExport.GetAutoStylePool()->Add(XML_STYLE_FAMILY_TEXT_PARAGRAPH, "", aPropStates); } } } @@ -3459,10 +3459,10 @@ void XMLShapeExport::ImpExport3DShape( // transformation (UNO_NAME_3D_TRANSFORM_MATRIX == "D3DTransformMatrix") uno::Any aAny = xPropSet->getPropertyValue("D3DTransformMatrix"); - drawing::HomogenMatrix xHomMat; - aAny >>= xHomMat; + drawing::HomogenMatrix aHomMat; + aAny >>= aHomMat; SdXMLImExTransform3D aTransform; - aTransform.AddHomogenMatrix(xHomMat); + aTransform.AddHomogenMatrix(aHomMat); if(aTransform.NeedsAction()) mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_TRANSFORM, aTransform.GetExportString(mrExport.GetMM100UnitConverter())); @@ -3550,13 +3550,13 @@ void XMLShapeExport::ImpExport3DShape( { // write special 3DLathe/3DExtrude attributes, get 3D tools::PolyPolygon as drawing::PolyPolygonShape3D aAny = xPropSet->getPropertyValue("D3DPolyPolygon3D"); - drawing::PolyPolygonShape3D xPolyPolygon3D; - aAny >>= xPolyPolygon3D; + drawing::PolyPolygonShape3D aUnoPolyPolygon3D; + aAny >>= aUnoPolyPolygon3D; // convert to 3D PolyPolygon const basegfx::B3DPolyPolygon aPolyPolygon3D( basegfx::tools::UnoPolyPolygonShape3DToB3DPolyPolygon( - xPolyPolygon3D)); + aUnoPolyPolygon3D)); // convert to 2D tools::PolyPolygon using identity 3D transformation (just grep X and Y) const basegfx::B3DHomMatrix aB3DHomMatrixFor2DConversion; @@ -3614,10 +3614,10 @@ void XMLShapeExport::export3DSceneAttributes( const css::uno::Reference< css::be // world transformation (UNO_NAME_3D_TRANSFORM_MATRIX == "D3DTransformMatrix") uno::Any aAny = xPropSet->getPropertyValue("D3DTransformMatrix"); - drawing::HomogenMatrix xHomMat; - aAny >>= xHomMat; + drawing::HomogenMatrix aHomMat; + aAny >>= aHomMat; SdXMLImExTransform3D aTransform; - aTransform.AddHomogenMatrix(xHomMat); + aTransform.AddHomogenMatrix(aHomMat); if(aTransform.NeedsAction()) mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_TRANSFORM, aTransform.GetExportString(mrExport.GetMM100UnitConverter())); @@ -3652,9 +3652,9 @@ void XMLShapeExport::export3DSceneAttributes( const css::uno::Reference< css::be // projection "D3DScenePerspective" drawing::ProjectionMode aAny = xPropSet->getPropertyValue("D3DScenePerspective"); - drawing::ProjectionMode xPrjMode; - aAny >>= xPrjMode; - if(xPrjMode == drawing::ProjectionMode_PARALLEL) + drawing::ProjectionMode aPrjMode; + aAny >>= aPrjMode; + if(aPrjMode == drawing::ProjectionMode_PARALLEL) aStr = GetXMLToken(XML_PARALLEL); else aStr = GetXMLToken(XML_PERSPECTIVE); @@ -3688,14 +3688,14 @@ void XMLShapeExport::export3DSceneAttributes( const css::uno::Reference< css::be // shadeMode aAny = xPropSet->getPropertyValue("D3DSceneShadeMode"); - drawing::ShadeMode xShadeMode; - if(aAny >>= xShadeMode) + drawing::ShadeMode aShadeMode; + if(aAny >>= aShadeMode) { - if(xShadeMode == drawing::ShadeMode_FLAT) + if(aShadeMode == drawing::ShadeMode_FLAT) aStr = GetXMLToken(XML_FLAT); - else if(xShadeMode == drawing::ShadeMode_PHONG) + else if(aShadeMode == drawing::ShadeMode_PHONG) aStr = GetXMLToken(XML_PHONG); - else if(xShadeMode == drawing::ShadeMode_SMOOTH) + else if(aShadeMode == drawing::ShadeMode_SMOOTH) aStr = GetXMLToken(XML_GOURAUD); else aStr = GetXMLToken(XML_DRAFT); @@ -3738,7 +3738,7 @@ void XMLShapeExport::export3DLamps( const css::uno::Reference< css::beans::XProp OUString aPropName; OUString aIndexStr; ::basegfx::B3DVector aLightDirection; - drawing::Direction3D xLightDir; + drawing::Direction3D aLightDir; bool bLightOnOff = false; for(sal_Int32 nLamp = 1; nLamp <= 8; nLamp++) { @@ -3756,8 +3756,8 @@ void XMLShapeExport::export3DLamps( const css::uno::Reference< css::beans::XProp // lightdirection aPropName = aDirectionPropName; aPropName += aIndexStr; - xPropSet->getPropertyValue(aPropName) >>= xLightDir; - aLightDirection = ::basegfx::B3DVector(xLightDir.DirectionX, xLightDir.DirectionY, xLightDir.DirectionZ); + xPropSet->getPropertyValue(aPropName) >>= aLightDir; + aLightDirection = ::basegfx::B3DVector(aLightDir.DirectionX, aLightDir.DirectionY, aLightDir.DirectionZ); SvXMLUnitConverter::convertB3DVector(sStringBuffer, aLightDirection); aStr = sStringBuffer.makeStringAndClear(); mrExport.AddAttribute(XML_NAMESPACE_DR3D, XML_DIRECTION, aStr); diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index e41fffcd5547..96eb4df63123 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -358,14 +358,14 @@ void SdXML3DPolygonBasedShapeContext::StartElement(const uno::Reference< xml::sa aPolyPolygon)); // convert to UNO API class PolyPolygonShape3D - drawing::PolyPolygonShape3D xPolyPolygon3D; + drawing::PolyPolygonShape3D aPolyPolygon3D; basegfx::tools::B3DPolyPolygonToUnoPolyPolygonShape3D( aB3DPolyPolygon, - xPolyPolygon3D); + aPolyPolygon3D); // set polygon data uno::Any aAny; - aAny <<= xPolyPolygon3D; + aAny <<= aPolyPolygon3D; xPropSet->setPropertyValue("D3DPolyPolygon3D", aAny); } else diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx index 69fb32aef63f..666306d48dc3 100644 --- a/xmloff/source/draw/ximp3dscene.cxx +++ b/xmloff/source/draw/ximp3dscene.cxx @@ -392,11 +392,11 @@ void SdXML3DSceneAttributesHelper::setSceneAttributes( const css::uno::Reference // set anys aAny <<= pCtx->GetDiffuseColor(); - drawing::Direction3D xLightDir; - xLightDir.DirectionX = pCtx->GetDirection().getX(); - xLightDir.DirectionY = pCtx->GetDirection().getY(); - xLightDir.DirectionZ = pCtx->GetDirection().getZ(); - aAny2 <<= xLightDir; + drawing::Direction3D aLightDir; + aLightDir.DirectionX = pCtx->GetDirection().getX(); + aLightDir.DirectionY = pCtx->GetDirection().getY(); + aLightDir.DirectionZ = pCtx->GetDirection().getZ(); + aAny2 <<= aLightDir; aAny3 <<= pCtx->GetEnabled(); switch(a) |