diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-22 10:21:21 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-06-28 10:47:34 +0200 |
commit | bfc1600c6ade6f006eb774bffe7caa9c948e8603 (patch) | |
tree | c660fa18fc6a9e5f05c3cc58fa34411cdc4f4257 /xmloff | |
parent | f9514beb9bfed51aee69227797e74504afed31c6 (diff) |
loplugin:indentation improve checks for brace alignment
Change-Id: I333100fda7e181f68f36b03279b3fbb8cb768310
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117615
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/chart/SchXMLPlotAreaContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/style/impastpl.cxx | 34 | ||||
-rw-r--r-- | xmloff/source/style/xmlnume.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/xmlstyle.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/table/XMLTableExport.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/text/txtflde.cxx | 6 | ||||
-rw-r--r-- | xmloff/source/text/txtparai.cxx | 2 |
8 files changed, 31 insertions, 31 deletions
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index b336b8b56aa1..563798b7c599 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -734,7 +734,7 @@ void SchXMLDataPointContext::startFastElement (sal_Int32 /*Element*/, // Deprecated. New documents use the chart:data-label element // instead in order to store custom label text. case XML_ELEMENT(LO_EXT, XML_CUSTOM_LABEL_FIELD): - if (!mbHasLabelParagraph) + if (!mbHasLabelParagraph) { sCustomLabelField = aIter.toString(); mDataPoint.mCustomLabels.push_back(sCustomLabelField); diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 5ed81e82a247..d9d4116a2c55 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1809,8 +1809,8 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x if( nFound & Found::SPEED && eEffect != presentation::AnimationEffect_NONE ) { - if( eSpeed != presentation::AnimationSpeed_MEDIUM ) - { + if( eSpeed != presentation::AnimationSpeed_MEDIUM ) + { SvXMLUnitConverter::convertEnum( msBuffer, eSpeed, aXML_AnimationSpeed_EnumMap ); mrExport.AddAttribute( XML_NAMESPACE_PRESENTATION, XML_SPEED, msBuffer.makeStringAndClear() ); } @@ -1852,7 +1852,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference< drawing::XShape >& x SvXMLElementExport aElem( mrExport, XML_NAMESPACE_PRESENTATION, XML_SOUND, true, true ); } - } + } } else if( aClickEventType == gsStarBasic ) { diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx index b965b7a5a8f8..c61f9351ffc3 100644 --- a/xmloff/source/style/impastpl.cxx +++ b/xmloff/source/style/impastpl.cxx @@ -160,26 +160,26 @@ XMLAutoStylePoolProperties::XMLAutoStylePoolProperties( XMLAutoStyleFamily& rFam aStemBuffer.append( rFamilyData.maStrPrefix ); if (!rParentName.isEmpty()) - { - aStemBuffer.append("-"); - aStemBuffer.append(rParentName); - } + { + aStemBuffer.append("-"); + aStemBuffer.append(rParentName); + } // Create a name based on the properties used for(XMLPropertyState const & rState : maProperties) - { - if (rState.mnIndex == -1) - continue; - OUString sXMLName(rFamilyData.mxMapper->getPropertySetMapper()->GetEntryXMLName(rState.mnIndex)); - if (sXMLName.isEmpty()) - continue; - aStemBuffer.append("-"); - aStemBuffer.append(static_cast<sal_Int32>(rFamilyData.mxMapper->getPropertySetMapper()->GetEntryNameSpace(rState.mnIndex))); - aStemBuffer.append(":"); - aStemBuffer.append(sXMLName); - aStemBuffer.append("="); - aStemBuffer.append(any2string(rState.maValue)); - } + { + if (rState.mnIndex == -1) + continue; + OUString sXMLName(rFamilyData.mxMapper->getPropertySetMapper()->GetEntryXMLName(rState.mnIndex)); + if (sXMLName.isEmpty()) + continue; + aStemBuffer.append("-"); + aStemBuffer.append(static_cast<sal_Int32>(rFamilyData.mxMapper->getPropertySetMapper()->GetEntryNameSpace(rState.mnIndex))); + aStemBuffer.append(":"); + aStemBuffer.append(sXMLName); + aStemBuffer.append("="); + aStemBuffer.append(any2string(rState.maValue)); + } #if 0 // Finally append an incremental counter in an attempt to make identical diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 132e3f701a2e..6568d3ea9496 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -773,7 +773,7 @@ void SvxXMLNumRuleExport::exportOutline() // style:name="..." GetExport().CheckAttrList(); if ( !sOutlineStyleName.isEmpty() ) - { + { bool bEncoded = false; GetExport().AddAttribute( XML_NAMESPACE_STYLE, XML_NAME, GetExport().EncodeStyleName( sOutlineStyleName, diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 9453e1963729..38ec932fe132 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -273,7 +273,7 @@ const SvXMLStyleContext *SvXMLStylesContext_Impl::FindStyleChildContext( XmlStyl IndicesType::iterator aFind = pIndices->find(aIndex); if( aFind != pIndices->end() ) pStyle = aFind->GetStyle(); - } + } else { for( size_t i = 0; !pStyle && i < aStyles.size(); i++ ) diff --git a/xmloff/source/table/XMLTableExport.cxx b/xmloff/source/table/XMLTableExport.cxx index 6deb085fcba7..c4baf426bf95 100644 --- a/xmloff/source/table/XMLTableExport.cxx +++ b/xmloff/source/table/XMLTableExport.cxx @@ -395,8 +395,8 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) const sal_Int32 nColumnCount = xtableColumnsIndexAccess->getCount(); for( sal_Int32 nColumn = 0; nColumn < nColumnCount; ++nColumn ) { - Reference< XPropertySet > xColumnProperties( xtableColumnsIndexAccess->getByIndex(nColumn) , UNO_QUERY ); - if ( xColumnProperties.is() ) + Reference< XPropertySet > xColumnProperties( xtableColumnsIndexAccess->getByIndex(nColumn) , UNO_QUERY ); + if ( xColumnProperties.is() ) { // table:style-name if( rTableInfo ) @@ -411,8 +411,8 @@ static bool has_states( const std::vector< XMLPropertyState >& xPropStates ) // have identical properties. If yes, attr table:number-columns-repeated // has to be written. SvXMLElementExport tableColumnElement( mrExport, XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, true, true ); - } - } + } + } } // ODF export for a table cell. diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 93f43ee6c082..0513dc8e5273 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -523,21 +523,21 @@ enum FieldIdEnum XMLTextFieldExport::MapFieldName( break; case FIELD_ID_DOCINFO_CREATION_TIME: - if (GetBoolProperty(gsPropertyIsDate, xPropSet)) + if (GetBoolProperty(gsPropertyIsDate, xPropSet)) { nToken = FIELD_ID_DOCINFO_CREATION_DATE; } break; case FIELD_ID_DOCINFO_PRINT_TIME: - if (GetBoolProperty(gsPropertyIsDate, xPropSet)) + if (GetBoolProperty(gsPropertyIsDate, xPropSet)) { nToken = FIELD_ID_DOCINFO_PRINT_DATE; } break; case FIELD_ID_DOCINFO_SAVE_TIME: - if (GetBoolProperty(gsPropertyIsDate, xPropSet)) + if (GetBoolProperty(gsPropertyIsDate, xPropSet)) { nToken = FIELD_ID_DOCINFO_SAVE_DATE; } diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index c74fbeb0fcd7..92b12c71cff5 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -2062,7 +2062,7 @@ XMLNumberedParaContext::XMLNumberedParaContext( XMLTextListsHelper& rTextListsHelper( i_rImport.GetTextImport()->GetTextListHelper() ); if (m_ListId.isEmpty()) - { + { SAL_WARN_IF(0 <= i_rImport.GetODFVersion().compareTo(u"1.2"), "xmloff.text", "invalid numbered-paragraph: no list-id (1.2)"); m_ListId = rTextListsHelper.GetNumberedParagraphListId(m_Level, StyleName); |