diff options
Diffstat (limited to 'xmloff/source/forms')
-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 |
3 files changed, 8 insertions, 8 deletions
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; |