diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-08 13:19:12 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-02-09 17:07:45 +0100 |
commit | 82b91027691a0a7138c0f70b94d6500e35bb8b44 (patch) | |
tree | 1f1947f79c3f0f7127814b317e398cea1333206e /oox | |
parent | 2ae813975ae8ba97e2adbce13be272e6902ca7b5 (diff) |
loplugin:indentation in oox..package
Change-Id: Ie50a1ad6e27786ccdaae2ba1ae96f5682c4a38f6
Reviewed-on: https://gerrit.libreoffice.org/67560
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 8 | ||||
-rw-r--r-- | oox/source/dump/oledumper.cxx | 4 | ||||
-rw-r--r-- | oox/source/export/chartexport.cxx | 2 | ||||
-rw-r--r-- | oox/source/export/drawingml.cxx | 2 | ||||
-rw-r--r-- | oox/source/export/shapes.cxx | 2 | ||||
-rw-r--r-- | oox/source/helper/propertymap.cxx | 82 | ||||
-rw-r--r-- | oox/source/ppt/buildlistcontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/layoutfragmenthandler.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/pptshapecontext.cxx | 6 | ||||
-rw-r--r-- | oox/source/ppt/pptshapegroupcontext.cxx | 2 | ||||
-rw-r--r-- | oox/source/ppt/slidetransition.cxx | 10 | ||||
-rw-r--r-- | oox/source/vml/vmlshapecontainer.cxx | 4 |
12 files changed, 63 insertions, 63 deletions
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index d6a02570f535..1e7e9607172e 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -848,12 +848,12 @@ void AlgAtom::layoutShape( const ShapePtr& rShape, double fAspectRatio = 0.32; awt::Size aChildSize = rShape->getSize(); - aChildSize.Width /= nCount; - aChildSize.Height /= nCount; + aChildSize.Width /= nCount; + aChildSize.Height /= nCount; awt::Point aCurrPos(0, 0); - aCurrPos.X = fAspectRatio*aChildSize.Width*(nCount-1); - aCurrPos.Y = fAspectRatio*aChildSize.Height; + aCurrPos.X = fAspectRatio*aChildSize.Width*(nCount-1); + aCurrPos.Y = fAspectRatio*aChildSize.Height; for (auto & aCurrShape : rShape->getChildren()) { diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx index c878267eb8ad..aebb5ac681c3 100644 --- a/oox/source/dump/oledumper.cxx +++ b/oox/source/dump/oledumper.cxx @@ -1881,8 +1881,8 @@ bool VbaDirStreamObject::implIsValid() const bool VbaDirStreamObject::implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) { - ornRecId = rBaseStrm.readuInt16(); - ornRecSize = rBaseStrm.readInt32(); + ornRecId = rBaseStrm.readuInt16(); + ornRecSize = rBaseStrm.readInt32(); // for no obvious reason, PROJECTVERSION record contains size field of 4, but is 6 bytes long if( ornRecId == 9 ) diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 78002bfdbeb0..624d1922a35a 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -832,7 +832,7 @@ void ChartExport::exportLegend( const Reference< css::chart::XChartDocument >& x try { Any aAny( xProp->getPropertyValue( "Alignment" )); - aAny >>= aLegendPos; + aAny >>= aLegendPos; } catch( beans::UnknownPropertyException & ) { diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 361a17cd7ea4..d7697a3d8e7e 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -1579,7 +1579,7 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool } } - if (GetProperty(rXPropSet, "CharKerning")) + if (GetProperty(rXPropSet, "CharKerning")) nCharKerning = static_cast<sal_Int32>(*o3tl::doAccess<sal_Int16>(mAny)); /** While setting values in propertymap, * CharKerning converted using GetTextSpacingPoint diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 7544db053339..e16944af5b06 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -169,7 +169,7 @@ static void lcl_ConvertProgID(OUString const& rProgID, } else if (rProgID.startsWith("PowerPoint.Slide.12")) { - o_rMediaType = "application/vnd.openxmlformats-officedocument.presentationml.slide"; + o_rMediaType = "application/vnd.openxmlformats-officedocument.presentationml.slide"; o_rRelationType = oox::getRelationship(Relationship::PACKAGE); o_rFileExtension = "sldx"; } diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx index 8e7d3c505f98..a50ca358a6ee 100644 --- a/oox/source/helper/propertymap.cxx +++ b/oox/source/helper/propertymap.cxx @@ -286,24 +286,24 @@ Reference< XPropertySet > PropertyMap::makePropertySet() const #if OSL_DEBUG_LEVEL > 0 static void lclDumpAnyValue( const Any& value) { - OUString strValue; - Sequence< OUString > strArray; - Sequence< Any > anyArray; - Sequence< PropertyValue > propArray; - Sequence< Sequence< PropertyValue > > propArrayArray; - Sequence< EnhancedCustomShapeAdjustmentValue > adjArray; - Sequence< EnhancedCustomShapeSegment > segArray; - Sequence< EnhancedCustomShapeParameterPair > ppArray; - EnhancedCustomShapeSegment segment; - EnhancedCustomShapeParameterPair pp; - EnhancedCustomShapeParameter par; - HomogenMatrix3 aMatrix; - sal_Int32 intValue = 0; - sal_uInt32 uintValue = 0; - sal_Int16 int16Value = 0; - sal_uInt16 uint16Value = 0; - float floatValue = 0; - bool boolValue = false; + OUString strValue; + Sequence< OUString > strArray; + Sequence< Any > anyArray; + Sequence< PropertyValue > propArray; + Sequence< Sequence< PropertyValue > > propArrayArray; + Sequence< EnhancedCustomShapeAdjustmentValue > adjArray; + Sequence< EnhancedCustomShapeSegment > segArray; + Sequence< EnhancedCustomShapeParameterPair > ppArray; + EnhancedCustomShapeSegment segment; + EnhancedCustomShapeParameterPair pp; + EnhancedCustomShapeParameter par; + HomogenMatrix3 aMatrix; + sal_Int32 intValue = 0; + sal_uInt32 uintValue = 0; + sal_Int16 int16Value = 0; + sal_uInt16 uint16Value = 0; + float floatValue = 0; + bool boolValue = false; LineSpacing spacing; // RectanglePoint pointValue; WritingMode aWritingMode; @@ -311,73 +311,73 @@ static void lclDumpAnyValue( const Any& value) TextHorizontalAdjust aTextHorizAdj; Reference< XIndexReplace > xNumRule; - if( value >>= strValue ) + if( value >>= strValue ) fprintf (stderr,"\"%s\"\n", USS( strValue ) ); - else if( value >>= strArray ) { + else if( value >>= strArray ) { fprintf (stderr,"%s\n", USS(value.getValueTypeName())); for( int i=0; i<strArray.getLength(); i++ ) fprintf (stderr,"\t\t\t[%3d] \"%s\"\n", i, USS( strArray[i] ) ); - } else if( value >>= propArray ) { + } else if( value >>= propArray ) { fprintf (stderr,"%s\n", USS(value.getValueTypeName())); for( int i=0; i<propArray.getLength(); i++ ) { fprintf (stderr,"\t\t\t[%3d] %s (%s) ", i, USS( propArray[i].Name ), USS(propArray[i].Value.getValueTypeName()) ); lclDumpAnyValue( propArray[i].Value ); } - } else if( value >>= propArrayArray ) { + } else if( value >>= propArrayArray ) { fprintf (stderr,"%s\n", USS(value.getValueTypeName())); for( int i=0; i<propArrayArray.getLength(); i++ ) { fprintf (stderr,"\t\t\t[%3d] ", i); lclDumpAnyValue( makeAny (propArrayArray[i]) ); } - } else if( value >>= anyArray ) { + } else if( value >>= anyArray ) { fprintf (stderr,"%s\n", USS(value.getValueTypeName())); for( int i=0; i<anyArray.getLength(); i++ ) { fprintf (stderr,"\t\t\t[%3d] (%s) ", i, USS(value.getValueTypeName()) ); lclDumpAnyValue( anyArray[i] ); } - } else if( value >>= adjArray ) { + } else if( value >>= adjArray ) { fprintf (stderr,"%s\n", USS(value.getValueTypeName())); for( int i=0; i<adjArray.getLength(); i++ ) { fprintf (stderr,"\t\t\t[%3d] (%s) ", i, USS(adjArray[i].Value.getValueTypeName()) ); lclDumpAnyValue( adjArray[i].Value ); } - } else if( value >>= segArray ) { + } else if( value >>= segArray ) { fprintf (stderr,"%s\n", USS(value.getValueTypeName())); for( int i=0; i<segArray.getLength(); i++ ) { fprintf (stderr,"\t\t\t[%3d] ", i ); lclDumpAnyValue( makeAny( segArray[i] ) ); } - } else if( value >>= ppArray ) { + } else if( value >>= ppArray ) { fprintf (stderr,"%s\n", USS(value.getValueTypeName())); for( int i=0; i<ppArray.getLength(); i++ ) { fprintf (stderr,"\t\t\t[%3d] ", i ); lclDumpAnyValue( makeAny( ppArray[i] ) ); } - } else if( value >>= segment ) { + } else if( value >>= segment ) { fprintf (stderr,"Command: %d Count: %d\n", segment.Command, segment.Count); - } else if( value >>= pp ) { + } else if( value >>= pp ) { fprintf (stderr,"First: "); lclDumpAnyValue( makeAny (pp.First) ); fprintf (stderr,"\t\t\t Second: "); lclDumpAnyValue( makeAny (pp.Second) ); - } else if( value >>= par ) { + } else if( value >>= par ) { fprintf (stderr,"Parameter (%s): ", USS(par.Value.getValueTypeName())); lclDumpAnyValue( par.Value ); - } else if( value >>= aMatrix ) { + } else if( value >>= aMatrix ) { fprintf (stderr,"Matrix\n%f %f %f\n%f %f %f\n%f %f %f\n", aMatrix.Line1.Column1, aMatrix.Line1.Column2, aMatrix.Line1.Column3, aMatrix.Line2.Column1, aMatrix.Line2.Column2, aMatrix.Line2.Column3, aMatrix.Line3.Column1, aMatrix.Line3.Column2, aMatrix.Line3.Column3); - } else if( value >>= intValue ) + } else if( value >>= intValue ) fprintf (stderr,"%-10" SAL_PRIdINT32 " (hex: %" SAL_PRIxUINT32 ")\n", intValue, intValue); - else if( value >>= uintValue ) + else if( value >>= uintValue ) fprintf (stderr,"%-10" SAL_PRIuUINT32 " (hex: %" SAL_PRIxUINT32 ")\n", uintValue, uintValue); - else if( value >>= int16Value ) + else if( value >>= int16Value ) fprintf (stderr,"%-10d (hex: %x)\n", int16Value, int16Value); - else if( value >>= uint16Value ) + else if( value >>= uint16Value ) fprintf (stderr,"%-10d (hex: %x)\n", uint16Value, uint16Value); - else if( value >>= floatValue ) + else if( value >>= floatValue ) fprintf (stderr,"%f\n", floatValue); - else if( value >>= boolValue ) + else if( value >>= boolValue ) fprintf (stderr,"%-10d (bool)\n", boolValue); - else if( value >>= xNumRule ) { + else if( value >>= xNumRule ) { fprintf (stderr, "XIndexReplace\n"); if (xNumRule.is()) { for (int k=0; k<xNumRule->getCount(); k++) { @@ -393,9 +393,9 @@ static void lclDumpAnyValue( const Any& value) } else { fprintf (stderr, "empty reference\n"); } - } else if( value >>= aWritingMode ) + } else if( value >>= aWritingMode ) fprintf(stderr, "%d writing mode\n", static_cast<int>(aWritingMode)); - else if( value >>= aTextVertAdj ) { + else if( value >>= aTextVertAdj ) { const char* s = "unknown"; switch( aTextVertAdj ) { case TextVerticalAdjust_TOP: @@ -413,8 +413,8 @@ static void lclDumpAnyValue( const Any& value) case TextVerticalAdjust::TextVerticalAdjust_MAKE_FIXED_SIZE: s = "make_fixed_size"; break; - } - fprintf (stderr, "%s\n", s); + } + fprintf (stderr, "%s\n", s); } else if( value >>= aTextHorizAdj ) { const char* s = "unknown"; switch( aTextHorizAdj ) { diff --git a/oox/source/ppt/buildlistcontext.cxx b/oox/source/ppt/buildlistcontext.cxx index b220755984c5..ae38a0e09ee3 100644 --- a/oox/source/ppt/buildlistcontext.cxx +++ b/oox/source/ppt/buildlistcontext.cxx @@ -68,7 +68,7 @@ namespace oox { namespace ppt { // bool uiExpand = rAttribs.getBool( XML_uiExpand, true ); /* this is unsigned */ // sal_uInt32 nGroupId = rAttribs.getUnsignedInteger( XML_grpId, 0 ); - return this; + return this; } case A_TOKEN( bldDgm ): case A_TOKEN( bldOleChart ): diff --git a/oox/source/ppt/layoutfragmenthandler.cxx b/oox/source/ppt/layoutfragmenthandler.cxx index 8faa5108037f..a405e13a0cdd 100644 --- a/oox/source/ppt/layoutfragmenthandler.cxx +++ b/oox/source/ppt/layoutfragmenthandler.cxx @@ -64,7 +64,7 @@ ContextHandlerRef LayoutFragmentHandler::onCreateContext( sal_Int32 aElementToke if( aShowMasterShapes.has() && !aShowMasterShapes.get() ) { mpSlidePersistPtr->hideShapesAsMasterShapes(); } - break; + break; } case PPT_TOKEN( hf ): // CT_HeaderFooter return new HeaderFooterContext( *this, rAttribs, mpSlidePersistPtr->getHeaderFooter() ); diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx index caec14ffe1ba..c0c81effba0c 100644 --- a/oox/source/ppt/pptshapecontext.cxx +++ b/oox/source/ppt/pptshapecontext.cxx @@ -127,7 +127,7 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con default: break; } - if ( nFirstPlaceholder ) + if ( nFirstPlaceholder ) { oox::drawingml::ShapePtr pPlaceholder; if ( eShapeLocation == Layout ) // for layout objects the referenced object can be found within the same shape tree @@ -158,8 +158,8 @@ ContextHandlerRef PPTShapeContext::onCreateContext( sal_Int32 aElementToken, con } } - } - break; + } + break; } // nvSpPr CT_ShapeNonVisual end diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx index 4caa76b1c1c7..199bb790efff 100644 --- a/oox/source/ppt/pptshapegroupcontext.cxx +++ b/oox/source/ppt/pptshapegroupcontext.cxx @@ -141,7 +141,7 @@ void PPTShapeGroupContext::importExtDrawings( ) if( pGraphicShape->getFontRefColorForNodes().isUsed() ) applyFontRefColor(mpGroupShapePtr, pGraphicShape->getFontRefColorForNodes()); } - pGraphicShape = oox::drawingml::ShapePtr( nullptr ); + pGraphicShape = oox::drawingml::ShapePtr( nullptr ); } } diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index b835b0f1ebb1..82eaeabf2eec 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -147,7 +147,7 @@ namespace oox { namespace ppt { sal_Int16 SlideTransition::ooxToOdpEightDirections( ::sal_Int32 nOoxType ) { - sal_Int16 nOdpDirection; + sal_Int16 nOdpDirection; nOdpDirection = ooxToOdpBorderDirections( nOoxType ); if( nOdpDirection == 0 ) { @@ -158,7 +158,7 @@ namespace oox { namespace ppt { sal_Int16 SlideTransition::ooxToOdpBorderDirections( ::sal_Int32 nOoxType ) { - sal_Int16 nOdpDirection; + sal_Int16 nOdpDirection; switch( nOoxType ) { case XML_d: @@ -182,7 +182,7 @@ namespace oox { namespace ppt { sal_Int16 SlideTransition::ooxToOdpSideDirections( ::sal_Int32 nOoxType ) { - sal_Int16 nOdpDirection; + sal_Int16 nOdpDirection; switch( nOoxType ) { case XML_d: @@ -215,7 +215,7 @@ namespace oox { namespace ppt { sal_Int16 SlideTransition::ooxToOdpCornerDirections( ::sal_Int32 nOoxType ) { - sal_Int16 nOdpDirection; + sal_Int16 nOdpDirection; switch( nOoxType ) { case XML_lu: @@ -239,7 +239,7 @@ namespace oox { namespace ppt { sal_Int16 SlideTransition::ooxToOdpDirection( ::sal_Int32 nOoxType ) { - sal_Int16 nOdpDir; + sal_Int16 nOdpDir; switch( nOoxType ) { case XML_vert: diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx index 474c6ac2c86f..e8008a1f4638 100644 --- a/oox/source/vml/vmlshapecontainer.cxx +++ b/oox/source/vml/vmlshapecontainer.cxx @@ -86,7 +86,7 @@ const ShapeType* ShapeContainer::getShapeTypeById( const OUString& rShapeId ) co for (auto const& shape : maShapes) if( const ShapeType* pType = shape->getChildTypeById( rShapeId ) ) return pType; - return nullptr; + return nullptr; } const ShapeBase* ShapeContainer::getShapeById( const OUString& rShapeId ) const @@ -98,7 +98,7 @@ const ShapeBase* ShapeContainer::getShapeById( const OUString& rShapeId ) const for (auto const& shape : maShapes) if( const ShapeBase* pShape = shape->getChildById( rShapeId ) ) return pShape; - return nullptr; + return nullptr; } std::shared_ptr< ShapeBase > ShapeContainer::takeLastShape() |