diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 09:46:01 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-08 13:28:16 +0100 |
commit | ab9b67bbb001f380b3973941443bfbc59fe7141c (patch) | |
tree | 4737847b2970d2310932f115935a9454aacff6fe /xmloff | |
parent | 3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (diff) |
Remove obsolete SAL_FALLTHROUGH completely
...after 7ffdd830d5fb52f2ca25aa80277d22ea6d89970b
"HAVE_CPP_ATTRIBUTE_FALLTHROUGH is always true now"
Change-Id: I54e5ff4e036a6bb3e5774d1c0524158aae18e937
Reviewed-on: https://gerrit.libreoffice.org/64800
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/chart/SchXMLTableContext.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/core/nmspmap.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/animationexport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/animationimport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/draw/eventimp.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/forms/elementexport.cxx | 12 | ||||
-rw-r--r-- | xmloff/source/forms/propertyimport.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/forms/valueproperties.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/style/numehelp.cxx | 8 | ||||
-rw-r--r-- | xmloff/source/style/xmlnumfe.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextListBlockContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextListItemContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/XMLTextMarkImportContext.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/text/txtexppr.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtflde.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtimp.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/text/txtimppr.cxx | 4 | ||||
-rw-r--r-- | xmloff/source/transform/StyleOASISTContext.cxx | 2 | ||||
-rw-r--r-- | xmloff/source/transform/TransformerBase.cxx | 14 |
19 files changed, 37 insertions, 37 deletions
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index 35218c5325f0..cb607630f502 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -239,7 +239,7 @@ SvXMLImportContextRef SchXMLTableContext::CreateChildContext( { case XML_TOK_TABLE_HEADER_COLS: mrTable.bHasHeaderColumn = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_TOK_TABLE_COLUMNS: pContext = new SchXMLTableColumnsContext( GetImport(), rLocalName, mrTable ); break; @@ -250,7 +250,7 @@ SvXMLImportContextRef SchXMLTableContext::CreateChildContext( case XML_TOK_TABLE_HEADER_ROWS: mrTable.bHasHeaderRow = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_TOK_TABLE_ROWS: pContext = new SchXMLTableRowsContext( mrImportHelper, GetImport(), rLocalName, mrTable ); break; diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx index e70dafd83b4e..d916d56e794e 100644 --- a/xmloff/source/core/nmspmap.cxx +++ b/xmloff/source/core/nmspmap.cxx @@ -197,7 +197,7 @@ OUString SvXMLNamespaceMap::GetQNameByKey( sal_uInt16 nKey, case XML_NAMESPACE_UNKNOWN: // ...if it's a completely unknown namespace, assert and return the local name SAL_WARN("xmloff.core", "unknown namespace, probable missing xmlns: declaration"); - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_NAMESPACE_NONE: // ...if there isn't one, return the local name return rLocalName; diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index de66a89dcd8d..db53c162472d 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -690,7 +690,7 @@ void AnimationsExporterImpl::prepareNode( const Reference< XAnimationNode >& xNo { Reference< XIterateContainer > xIter( xNode, UNO_QUERY_THROW ); prepareValue( xIter->getTarget() ); - SAL_FALLTHROUGH; + [[fallthrough]]; } case AnimationNodeType::PAR: case AnimationNodeType::SEQ: diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 3f7337dd5030..6402d130f26e 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -870,7 +870,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax: xAudio->setSource( makeAny(lcl_GetMediaReference(GetImport(), rValue)) ); break; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case ANA_Target: { diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx index c543eee01752..73a92b9592e3 100644 --- a/xmloff/source/draw/eventimp.cxx +++ b/xmloff/source/draw/eventimp.cxx @@ -399,7 +399,7 @@ void SdXMLEventContext::EndElement() case ClickAction_BOOKMARK: msBookmark = msBookmark.copy(1); - SAL_FALLTHROUGH; + [[fallthrough]]; case ClickAction_DOCUMENT: case ClickAction_PROGRAM: @@ -422,7 +422,7 @@ void SdXMLEventContext::EndElement() pProperties->State = beans::PropertyState_DIRECT_VALUE; pProperties++; - SAL_FALLTHROUGH; + [[fallthrough]]; case ClickAction_SOUND: pProperties->Name = "SoundURL"; diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index d0fee7480896..8a4e99168e58 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -1444,7 +1444,7 @@ namespace xmloff case FormComponentType::DATEFIELD: m_eType = DATE; knownType = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::TIMEFIELD: if ( !knownType ) { @@ -1452,7 +1452,7 @@ namespace xmloff knownType = true; } m_nIncludeSpecial |= SCAFlags::Validation; - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::NUMERICFIELD: case FormComponentType::CURRENCYFIELD: case FormComponentType::PATTERNFIELD: @@ -1461,7 +1461,7 @@ namespace xmloff m_eType = FORMATTED_TEXT; knownType = true; } - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::TEXTFIELD: { // it's some kind of edit. To know which type we need further investigation @@ -1615,7 +1615,7 @@ namespace xmloff m_eType = BUTTON; m_nIncludeCommon |= CCAFlags::TabStop | CCAFlags::Label; m_nIncludeSpecial = SCAFlags::DefaultButton | SCAFlags::Toggle | SCAFlags::FocusOnClick | SCAFlags::ImagePosition | SCAFlags::RepeatDelay; - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::IMAGEBUTTON: if (BUTTON != m_eType) { @@ -1632,7 +1632,7 @@ namespace xmloff case FormComponentType::CHECKBOX: m_eType = CHECKBOX; m_nIncludeSpecial = SCAFlags::CurrentState | SCAFlags::IsTristate | SCAFlags::State; - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::RADIOBUTTON: m_nIncludeCommon = CCAFlags::Name | CCAFlags::ServiceName | CCAFlags::Disabled | CCAFlags::Label | CCAFlags::Printable | @@ -1697,7 +1697,7 @@ namespace xmloff default: OSL_FAIL("OControlExport::examineControl: unknown control type (class id)!"); - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::NAVIGATIONBAR: // TODO: should we have an own file format for this? diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index e9ac0bba5dec..1099af354d77 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -126,7 +126,7 @@ Any PropertyConversion::convertString( const css::uno::Type& _rExpectedType, break; } bEnumAsInt = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case TypeClass_ENUM: { sal_uInt16 nEnumValue(0); diff --git a/xmloff/source/forms/valueproperties.cxx b/xmloff/source/forms/valueproperties.cxx index 94bd723c7a5b..1728ad7f4c90 100644 --- a/xmloff/source/forms/valueproperties.cxx +++ b/xmloff/source/forms/valueproperties.cxx @@ -61,7 +61,7 @@ namespace xmloff case FormComponentType::FILECONTROL: case FormComponentType::COMBOBOX: _rpValuePropertyName = PROPERTY_DEFAULT_TEXT; - SAL_FALLTHROUGH; + [[fallthrough]]; case FormComponentType::COMMANDBUTTON: _rpCurrentValuePropertyName = PROPERTY_TEXT; break; diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index 4e835bf68a6e..d50bfbbfb83c 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -108,7 +108,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp { rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_FLOAT); bWasSetTypeAttribute = true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case util::NumberFormat::PERCENT: { @@ -117,7 +117,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes(SvXMLExport& rXMLExp rXMLExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_VALUE_TYPE, XML_PERCENTAGE); bWasSetTypeAttribute = true; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case util::NumberFormat::CURRENCY: { @@ -374,7 +374,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( { pExport->AddAttribute(sAttrValType, XML_FLOAT); bWasSetTypeAttribute = true; - SAL_FALLTHROUGH; + [[fallthrough]]; } case util::NumberFormat::PERCENT: { @@ -383,7 +383,7 @@ void XMLNumberFormatAttributesExportHelper::WriteAttributes( pExport->AddAttribute(sAttrValType, XML_PERCENTAGE); bWasSetTypeAttribute = true; } - SAL_FALLTHROUGH; + [[fallthrough]]; } case util::NumberFormat::CURRENCY: { diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 4a4028717490..98a8e72f17ce 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -1063,7 +1063,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt // number-style. case SvNumFormatType::UNDEFINED: SAL_WARN("xmloff.style","UNDEFINED number format: '" << rFormat.GetFormatstring() << "'"); - SAL_FALLTHROUGH; + [[fallthrough]]; // Type is 0 if a format contains no recognized elements // (like text only) - this is handled as a number-style. case SvNumFormatType::ALL: diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx index aeb74de1d951..7f62cf03dc95 100644 --- a/xmloff/source/text/XMLTextListBlockContext.cxx +++ b/xmloff/source/text/XMLTextListBlockContext.cxx @@ -266,7 +266,7 @@ SvXMLImportContextRef XMLTextListBlockContext::CreateChildContext( { case XML_TOK_TEXT_LIST_HEADER: bHeader = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_TOK_TEXT_LIST_ITEM: pContext = new XMLTextListItemContext( GetImport(), mrTxtImport, nPrefix, rLocalName, diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx index 66edfc6f7df8..3b2961e02ebe 100644 --- a/xmloff/source/text/XMLTextListItemContext.cxx +++ b/xmloff/source/text/XMLTextListItemContext.cxx @@ -141,7 +141,7 @@ SvXMLImportContextRef XMLTextListItemContext::CreateChildContext( { case XML_TOK_TEXT_H: bHeading = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_TOK_TEXT_P: pContext = new XMLParaContext( GetImport(), nPrefix, rLocalName, diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx index ea00d0aae2cd..3e2533b8de35 100644 --- a/xmloff/source/text/XMLTextMarkImportContext.cxx +++ b/xmloff/source/text/XMLTextMarkImportContext.cxx @@ -217,7 +217,7 @@ void XMLTextMarkImportContext::EndElement() } } } - SAL_FALLTHROUGH; + [[fallthrough]]; case TypeFieldmark: { const char *formFieldmarkName=lcl_getFormFieldmarkName(m_sFieldName); @@ -284,7 +284,7 @@ void XMLTextMarkImportContext::EndElement() } } } - SAL_FALLTHROUGH; + [[fallthrough]]; case TypeFieldmarkEnd: { // get old range, and construct diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx index 8e963dbe9e0a..552c72b69cc7 100644 --- a/xmloff/source/text/txtexppr.cxx +++ b/xmloff/source/text/txtexppr.cxx @@ -985,7 +985,7 @@ void XMLTextExportPropertySetMapper::ContextFilter( // no wrapping: disable para-only and contour if( pWrapParagraphOnlyState ) pWrapParagraphOnlyState->mnIndex = -1; - SAL_FALLTHROUGH; + [[fallthrough]]; case WrapTextMode_THROUGH: // wrap through: disable only contour if( pWrapContourState ) diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index cb192f8df4fb..8576b261d5ce 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -838,7 +838,7 @@ void XMLTextFieldExport::ExportFieldAutoStyle( bool dummy_for_autostyles(true); ExportMetaField(xPropSet, true, bProgress, dummy_for_autostyles); } - SAL_FALLTHROUGH; + [[fallthrough]]; case FIELD_ID_DOCINFO_PRINT_TIME: case FIELD_ID_DOCINFO_PRINT_DATE: case FIELD_ID_DOCINFO_CREATION_DATE: diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 60768588f3ee..c12ab120785f 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -2234,7 +2234,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTextChildContext( { case XML_TOK_TEXT_H: bHeading = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_TOK_TEXT_P: pContext = new XMLParaContext( rImport, nPrefix, rLocalName, diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx index 7fa6d4bd00ef..a3303594ce7b 100644 --- a/xmloff/source/text/txtimppr.cxx +++ b/xmloff/source/text/txtimppr.cxx @@ -483,7 +483,7 @@ void XMLTextImportPropertyMapper::finished( case CTF_FRAMEHEIGHT_MIN_REL: // case CTF_SYNCHEIGHT_MIN: bHasAnyMinHeight = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case CTF_FRAMEHEIGHT_ABS: case CTF_FRAMEHEIGHT_REL: // case CTF_SYNCHEIGHT: @@ -491,7 +491,7 @@ void XMLTextImportPropertyMapper::finished( case CTF_FRAMEWIDTH_MIN_ABS: case CTF_FRAMEWIDTH_MIN_REL: bHasAnyMinWidth = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case CTF_FRAMEWIDTH_ABS: case CTF_FRAMEWIDTH_REL: bHasAnyWidth = true; break; diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index ee56231ccc93..45b5129c5973 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -835,7 +835,7 @@ void XMLStyleOASISTContext::StartElement( break; case XML_ATACTION_DECODE_STYLE_NAME: m_bControlStyle = rAttrValue.startsWith( "ctrl" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_DECODE_STYLE_NAME_REF: { OUString aAttrValue( rAttrValue ); diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index 727deec521d2..1b864ae662c1 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -513,7 +513,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_IN2INCH: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_IN2INCH: { OUString aAttrValue( rAttrValue ); @@ -530,7 +530,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_INCH2IN: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_INCH2IN: { OUString aAttrValue( rAttrValue ); @@ -578,7 +578,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_DECODE_STYLE_NAME_REF: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_DECODE_STYLE_NAME: case XML_ATACTION_DECODE_STYLE_NAME_REF: { @@ -605,7 +605,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_ENCODE_STYLE_NAME_REF: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_ENCODE_STYLE_NAME_REF: { OUString aAttrValue( rAttrValue ); @@ -615,7 +615,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_NEG_PERCENT: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_NEG_PERCENT: { OUString aAttrValue( rAttrValue ); @@ -625,7 +625,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_ADD_NAMESPACE_PREFIX: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_ADD_NAMESPACE_PREFIX: { OUString aAttrValue( rAttrValue ); @@ -652,7 +652,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( break; case XML_ATACTION_RENAME_REMOVE_NAMESPACE_PREFIX: bRename = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case XML_ATACTION_REMOVE_NAMESPACE_PREFIX: { OUString aAttrValue( rAttrValue ); |