diff options
Diffstat (limited to 'sfx2/source')
| -rw-r--r-- | sfx2/source/bastyp/sfxhtml.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/thumbnailview.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/titledockwin.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewprn.cxx | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index f91bd5e59de2..3fa9fe0b1cd0 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -144,14 +144,14 @@ bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBase case HtmlOptionId::ONMOUSEOVER: eScrpType = JAVASCRIPT; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::SDONMOUSEOVER: nEvent = nEventMouseOver; goto IMAPOBJ_SETEVENT; case HtmlOptionId::ONMOUSEOUT: eScrpType = JAVASCRIPT; - SAL_FALLTHROUGH; + [[fallthrough]]; case HtmlOptionId::SDONMOUSEOUT: nEvent = nEventMouseOut; goto IMAPOBJ_SETEVENT; diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx index 5ae456bec36b..beeadd44ebfe 100644 --- a/sfx2/source/control/thumbnailview.cxx +++ b/sfx2/source/control/thumbnailview.cxx @@ -593,7 +593,7 @@ void ThumbnailView::KeyInput( const KeyEvent& rKEvt ) if ( bFoundLast ) OnItemDblClicked( mFilteredItemList[nLastPos] ); } - SAL_FALLTHROUGH; + [[fallthrough]]; default: Control::KeyInput( rKEvt ); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 4e9ffe77520d..d7a3ad778d89 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2322,7 +2322,7 @@ void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, bool bCheck) case SID_STYLE_WATERCAN : if(!bCheck && IsCheckedItem(SID_STYLE_WATERCAN)) Execute_Impl(SID_STYLE_WATERCAN, "", "", 0); - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_STYLE_NEW_BY_EXAMPLE: case SID_STYLE_UPDATE_BY_EXAMPLE: m_aActionTbR->EnableItem(nMesId,bCheck); diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx index 3c5effaae2ba..575b4253a56c 100644 --- a/sfx2/source/dialog/titledockwin.cxx +++ b/sfx2/source/dialog/titledockwin.cxx @@ -262,7 +262,7 @@ namespace sfx2 case DataChangedEventType::SETTINGS: if ( !( i_rDataChangedEvent.GetFlags() & AllSettingsFlags::STYLE ) ) break; - SAL_FALLTHROUGH; + [[fallthrough]]; case DataChangedEventType::FONTS: case DataChangedEventType::FONTSUBSTITUTION: { diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index f1ee0f9a3464..2c2617e9a111 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -524,7 +524,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) case SID_EXPORTDOCASPDF: case SID_DIRECTEXPORTDOCASPDF: bIsPDFExport = true; - SAL_FALLTHROUGH; + [[fallthrough]]; case SID_EXPORTDOCASEPUB: case SID_DIRECTEXPORTDOCASEPUB: case SID_EXPORTDOC: diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 79fad18c8048..67bfb2d00610 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -546,7 +546,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) rReq.AppendItem( SfxBoolItem( SID_FORCERELOAD, true) ); rReq.AppendItem( SfxBoolItem( SID_SILENT, true )); - SAL_FALLTHROUGH; //TODO ??? + [[fallthrough]]; //TODO ??? } case SID_RELOAD: diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index ec2d499974d7..0fad3be55591 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -350,7 +350,7 @@ void SfxPrinterController::jobFinished( css::view::PrintableState nState ) aMsg)); xBox->run(); } - SAL_FALLTHROUGH; + [[fallthrough]]; } case view::PrintableState_JOB_ABORTED : { |