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 /cui | |
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 'cui')
-rw-r--r-- | cui/source/dialogs/cuifmsearch.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/cuigrfflt.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/connect.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/numfmt.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/paragrph.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/textattr.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tpline.cxx | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 2f3c9af13d13..6882dde07c4a 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -728,7 +728,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, const FmSearchProgress*, pProgress, std::unique_ptr<weld::MessageDialog> xBox(Application::CreateMessageDialog(GetFrameWeld(), VclMessageType::Warning, VclButtonsType::Ok, CuiResId(pErrorId))); xBox->run(); - SAL_FALLTHROUGH; + [[fallthrough]]; } case FmSearchProgress::State::Canceled: EnableSearchUI(true); diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 15e8dc084392..02e93b287074 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -435,7 +435,7 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic, double switch (maCtlLight.GetActualRP()) { default: OSL_FAIL("svx::GraphicFilterEmboss::GetFilteredGraphic(), unknown Reference Point!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case RectPoint::LT: nAzim = 4500; nElev = 4500; break; case RectPoint::MT: nAzim = 9000; nElev = 4500; break; case RectPoint::RT: nAzim = 13500; nElev = 4500; break; diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 286e6ce0e3b1..98a46c8272f2 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -206,12 +206,12 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs ) m_xFtLine1->set_sensitive(false); m_xMtrFldLine1->set_sensitive(false); m_xMtrFldLine1->set_text(""); - SAL_FALLTHROUGH; + [[fallthrough]]; case 1: m_xFtLine2->set_sensitive(false); m_xMtrFldLine2->set_sensitive(false); m_xMtrFldLine2->set_text(""); - SAL_FALLTHROUGH; + [[fallthrough]]; case 2: m_xFtLine3->set_sensitive(false); m_xMtrFldLine3->set_sensitive(false); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 69b25330c98e..46b3279b3a18 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -916,7 +916,7 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( bool bCheckCatChange /*= sal_Fa m_xBtnEngineering->set_sensitive(true); m_xBtnEngineering->set_active( bThousand ); } - SAL_FALLTHROUGH; + [[fallthrough]]; case CAT_NUMBER: case CAT_PERCENT: case CAT_CURRENCY: diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index fde0bffd9804..b1f8c2895d62 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -2012,7 +2012,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, WidowHdl_Impl, weld::ToggleButton&, void case TRISTATE_FALSE: if (m_xOrphanBox->get_state() == TRISTATE_FALSE) m_xKeepTogetherBox->set_sensitive(true); - SAL_FALLTHROUGH; + [[fallthrough]]; case TRISTATE_INDET: m_xWidowRowNo->set_sensitive(false); m_xWidowRowLabel->set_sensitive(false); @@ -2033,7 +2033,7 @@ IMPL_LINK_NOARG(SvxExtParagraphTabPage, OrphanHdl_Impl, weld::ToggleButton&, voi case TRISTATE_FALSE: if (m_xWidowBox->get_state() == TRISTATE_FALSE) m_xKeepTogetherBox->set_sensitive(true); - SAL_FALLTHROUGH; + [[fallthrough]]; case TRISTATE_INDET: m_xOrphanRowNo->set_sensitive(false); m_xOrphanRowLabel->set_sensitive(false); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 0a6d3696ebc0..03bf5caf2b5c 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -364,7 +364,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs) { default: ; //prevent warning OSL_FAIL( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); - SAL_FALLTHROUGH; + [[fallthrough]]; case TRISTATE_FALSE: eFTS = drawing::TextFitToSizeType_AUTOFIT; break; case TRISTATE_TRUE: eFTS = drawing::TextFitToSizeType_PROPORTIONAL; break; } diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index dad85068f793..c71f5de04910 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -132,7 +132,7 @@ SvxLineTabPage::SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs case FieldUnit::M: case FieldUnit::KM: eFUnit = FieldUnit::MM; - SAL_FALLTHROUGH; // we now have mm + [[fallthrough]]; // we now have mm case FieldUnit::MM: m_xMtrLineWidth->set_increments(50, 500, FieldUnit::NONE); m_xMtrStartWidth->set_increments(50, 500, FieldUnit::NONE); |