diff options
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/dialog/macassgn.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddb.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/fldui/flddok.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/fldui/fldref.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/column.cxx | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/ui/dialog/macassgn.cxx b/sw/source/ui/dialog/macassgn.cxx index 8e247d052efb..a8ae8c16f73a 100644 --- a/sw/source/ui/dialog/macassgn.cxx +++ b/sw/source/ui/dialog/macassgn.cxx @@ -65,7 +65,7 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) aItem.AddEvent( SwResId(STR_EVENT_IMAGE_LOAD), OUString(), SvMacroItemId::OnImageLoadDone); } - SAL_FALLTHROUGH; + [[fallthrough]]; case MACASSGN_FRMURL: // Frame - URL-Attributes { if( !bHtmlMode && @@ -81,14 +81,14 @@ SfxEventNamesItem SwMacroAssignDlg::AddEvents( DlgEventType eType ) SvMacroItemId::SwFrmMove ); } } - SAL_FALLTHROUGH; + [[fallthrough]]; case MACASSGN_OLE: // OLE { if( !bHtmlMode ) aItem.AddEvent( SwResId(STR_EVENT_OBJECT_SELECT), OUString(), SvMacroItemId::SwObjectSelect ); } - SAL_FALLTHROUGH; + [[fallthrough]]; case MACASSGN_INETFMT: // INetFormat-Attributes { aItem.AddEvent( SwResId(STR_EVENT_MOUSEOVER_OBJECT), OUString(), diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index e41cd8237137..9bd79a7db39d 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1868,7 +1868,7 @@ bool SwSectionFootnoteEndTabPage::FillItemSet( SfxItemSet* rSet ) aFootnote.SetNumType( m_xFootnoteNumViewBox->GetSelectedNumberingType() ); aFootnote.SetPrefix( m_xFootnotePrefixED->get_text().replaceAll("\\t", "\t") ); // fdo#65666 aFootnote.SetSuffix( m_xFootnoteSuffixED->get_text().replaceAll("\\t", "\t") ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FTNEND_ATTXTEND_OWNNUMSEQ: aFootnote.SetOffset( static_cast< sal_uInt16 >( m_xFootnoteOffsetField->get_value()-1 ) ); @@ -1890,7 +1890,7 @@ bool SwSectionFootnoteEndTabPage::FillItemSet( SfxItemSet* rSet ) aEnd.SetNumType( m_xEndNumViewBox->GetSelectedNumberingType() ); aEnd.SetPrefix( m_xEndPrefixED->get_text().replaceAll("\\t", "\t") ); aEnd.SetSuffix( m_xEndSuffixED->get_text().replaceAll("\\t", "\t") ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FTNEND_ATTXTEND_OWNNUMSEQ: aEnd.SetOffset( static_cast< sal_uInt16 >( m_xEndOffsetField->get_value()-1 ) ); @@ -1946,11 +1946,11 @@ void SwSectionFootnoteEndTabPage::ResetState( bool bFootnote, { case FTNEND_ATTXTEND_OWNNUMANDFMT: pNtNumFormatCB->set_state( TRISTATE_TRUE ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FTNEND_ATTXTEND_OWNNUMSEQ: pNtNumCB->set_state( TRISTATE_TRUE ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FTNEND_ATTXTEND: pNtAtTextEndCB->set_state( TRISTATE_TRUE ); @@ -1966,13 +1966,13 @@ void SwSectionFootnoteEndTabPage::ResetState( bool bFootnote, { case FTNEND_ATPGORDOCEND: pNtNumCB->set_sensitive( false ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FTNEND_ATTXTEND: pNtNumFormatCB->set_sensitive( false ); pOffsetField->set_sensitive( false ); pOffsetText->set_sensitive( false ); - SAL_FALLTHROUGH; + [[fallthrough]]; case FTNEND_ATTXTEND_OWNNUMSEQ: pNumViewBox->Enable( false ); diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 3feac5488241..166dcddec941 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -362,7 +362,7 @@ void SwFieldDBPage::TypeHdl( ListBox const * pBox ) case TYP_DBNUMSETFLD: bSetNo = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case TYP_DBNEXTSETFLD: bCond = true; if (IsFieldEdit()) diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 3b756a692136..74f41938e8b3 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -589,7 +589,7 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* ) case TYP_AUTHORFLD: nFormat = nSubType; nSubType = 0; - SAL_FALLTHROUGH; + [[fallthrough]]; case TYP_EXTUSERFLD: nFormat |= m_pFixedCB->IsChecked() ? AF_FIXED : 0; break; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 71afb52f2277..bc9790a6aefb 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -422,7 +422,7 @@ IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void) case REFFLDFLAG_BOOKMARK: bName = true; - SAL_FALLTHROUGH; + [[fallthrough]]; default: if( REFFLDFLAG & nTypeId ) { @@ -807,7 +807,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId) case REFFLDFLAG_HEADING: case REFFLDFLAG_NUMITEM: bAddCrossRefFormats = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case TYP_GETREFFLD: case REFFLDFLAG_BOOKMARK: diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index b65724370016..0935481a27d7 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -840,7 +840,7 @@ void SwColumnPage::UpdateCols() switch(m_nCols) { case 3: bEnable3 = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case 2: bEnable12= true; break; default: /* do nothing */; } |