summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/customshapes/EnhancedCustomShape2d.cxx6
-rw-r--r--svx/source/dialog/rubydialog.cxx4
-rw-r--r--svx/source/dialog/svxruler.cxx2
-rw-r--r--svx/source/fmcomp/gridctrl.cxx4
-rw-r--r--svx/source/form/fmshell.cxx4
-rw-r--r--svx/source/form/fmsrcimp.cxx2
-rw-r--r--svx/source/form/fmvwimp.cxx2
-rw-r--r--svx/source/form/formcontrolfactory.cxx2
-rw-r--r--svx/source/items/numfmtsh.cxx2
-rw-r--r--svx/source/items/rotmodit.cxx2
-rw-r--r--svx/source/svdraw/svdhdl.cxx2
-rw-r--r--svx/source/svdraw/svdobj.cxx2
-rw-r--r--svx/source/svdraw/svdopath.cxx2
-rw-r--r--svx/source/toolbars/extrusionbar.cxx22
-rw-r--r--svx/source/toolbars/fontworkbar.cxx8
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx2
-rw-r--r--svx/source/xoutdev/xattr2.cxx4
17 files changed, 36 insertions, 36 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index eed455440237..1b1312aff615 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -1574,7 +1574,7 @@ void EnhancedCustomShape2d::CreateSubPath(
}
aNewB2DPolygon.clear();
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case ANGLEELLIPSETO :
{
@@ -1756,7 +1756,7 @@ void EnhancedCustomShape2d::CreateSubPath(
aNewB2DPolygon.clear();
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case ARCTO :
case CLOCKWISEARCTO :
@@ -2059,7 +2059,7 @@ static void CorrectCalloutArrows(
case mso_sptAccentCallout2 :
case mso_sptAccentBorderCallout2 :
bAccent = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case mso_sptCallout2 :
case mso_sptBorderCallout2 :
{
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 8c8daa71a1ec..452ae7fc3dcc 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -879,7 +879,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang
nLeftStart += nCharWidth;
nRightEnd -= nCharWidth;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case RubyAdjust_BLOCK:
{
@@ -896,7 +896,7 @@ void RubyPreview::Paint(vcl::RenderContext& rRenderContext, const tools::Rectang
}
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case RubyAdjust_CENTER:
rRenderContext.DrawText(Point(nCenter - nOutTextWidth / 2 , nYOutput), sOutputText);
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index cea75dc33fe8..22c4ea7c25ec 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1796,7 +1796,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mxRulerImpl->lLastLMargin))
{
default: ;//prevent warning
OSL_FAIL("svx::SvxRuler::DragBorders(), unknown drag type!" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case RulerType::Border:
if(mxRulerImpl->bIsTableRows)
{
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index cad58eaea61d..0ff3ff4df8e6 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -2841,7 +2841,7 @@ void DbGridControl::Command(const CommandEvent& rEvt)
return;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
default:
EditBrowseBox::Command(rEvt);
@@ -3253,7 +3253,7 @@ bool DbGridControl::PreNotify(NotifyEvent& rEvt)
}
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
default:
return EditBrowseBox::PreNotify(rEvt);
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 3404c091c21c..e24ca7ca09ea 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -251,7 +251,7 @@ bool FmFormShell::PrepareClose(bool bUI)
{
case RET_YES:
bResult = rController->commitCurrentRecord( );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case RET_NO:
GetImpl()->didPrepareClose_Lock(true);
break;
@@ -848,7 +848,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
rSet.Put( SfxVisibilityItem( nWhich, false ) );
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case SID_FM_SCROLLBAR:
case SID_FM_IMAGECONTROL:
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 4aaf9dc6d2dd..dd06a9a4b1db 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -490,7 +490,7 @@ FmSearchEngine::SearchResult FmSearchEngine::SearchRegularApprox(const OUString&
bFound = false;
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case MATCHING_BEGINNING :
if (nStart != 0)
bFound = false;
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 59a497d34e46..a2ae47c50013 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -1283,7 +1283,7 @@ SdrObjectUniquePtr FmXFormView::implCreateFieldControl( const svx::ODataAccessDe
case DataType::TIMESTAMP:
bDateNTimeField = true;
sLabelPostfix = SvxResId(RID_STR_POSTFIX_DATE);
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case DataType::DATE:
nOBJID = OBJ_FM_DATEFIELD;
break;
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index cef44279d9df..817dedefb4e6 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -400,7 +400,7 @@ namespace svxform
{
case FormComponentType::SCROLLBAR:
_rxControlModel->setPropertyValue("LiveScroll", makeAny( true ) );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case FormComponentType::SPINBUTTON:
{
sal_Int32 eOrientation = ScrollBarOrientation::HORIZONTAL;
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index cb68b9be56b7..1fb809379a6c 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -105,7 +105,7 @@ SvxNumberFormatShell::SvxNumberFormatShell(SvNumberFormatter* pNumFormatter, sal
{
nValNum = GetDefaultValNum(pFormatter->GetType(nCurFormatKey));
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case SvxNumberValueType::Undefined:
default:
aValStr.clear();
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index b1f21a131517..bf147b2aa2d6 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -74,7 +74,7 @@ bool SvxRotateModeItem::GetPresentation(
{
case SfxItemPresentation::Complete:
rText += "...: ";
- SAL_FALLTHROUGH; // break; // FALL THROUGH!!!
+ [[fallthrough]]; // break; // FALL THROUGH!!!
case SfxItemPresentation::Nameless:
rText += OUStringLiteral1( GetValue() );
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 0a51a0a580ef..4e0854ceac8d 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -130,7 +130,7 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
default:
{
OSL_FAIL( "Unknown kind of marker." );
- SAL_FALLTHROUGH; // return Rect_9x9 as default
+ [[fallthrough]]; // return Rect_9x9 as default
}
case BitmapMarkerKind::Rect_9x9:
{
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 72373d9c98e3..5aaa8ca3a442 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2710,7 +2710,7 @@ void SdrObject::SendUserCall(SdrUserCallType eUserCall, const tools::Rectangle&
{
case SdrUserCallType::Resize:
notifyShapePropertyChange( svx::ShapeProperty::Size );
- SAL_FALLTHROUGH; // RESIZE might also imply a change of the position
+ [[fallthrough]]; // RESIZE might also imply a change of the position
case SdrUserCallType::MoveOnly:
notifyShapePropertyChange( svx::ShapeProperty::Position );
break;
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 63481a141248..68bb5e40e542 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -1265,7 +1265,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
case OBJ_CCUT:
case OBJ_SECT:
eNewKind=OBJ_CARC;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case OBJ_RECT:
case OBJ_LINE:
case OBJ_PLIN:
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 94bb8e326721..4959b44d99a1 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -462,67 +462,67 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindi
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_EXTRUSION_TILT_DOWN:
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_DOWN;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_EXTRUSION_TILT_UP:
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_UP;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_EXTRUSION_TILT_LEFT:
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_LEFT;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_EXTRUSION_TILT_RIGHT:
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ROTATE_RIGHT;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_EXTRUSION_DIRECTION:
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ORIENTATION;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_EXTRUSION_PROJECTION:
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_PROJECTION;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_EXTRUSION_DEPTH:
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_DEPTH;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_EXTRUSION_3D_COLOR:
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_EXTRUSION_SURFACE:
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_EXTRUSION_LIGHTING_INTENSITY:
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_BRIGHTNESS;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_EXTRUSION_LIGHTING_DIRECTION:
{
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 290c1f746fe4..1ccc28761a7d 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -262,7 +262,7 @@ static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& r
SdrTextHorzAdjust eHorzAdjust;
switch ( nValue )
{
- case 4 : eFTS = drawing::TextFitToSizeType_ALLLINES; SAL_FALLTHROUGH;
+ case 4 : eFTS = drawing::TextFitToSizeType_ALLLINES; [[fallthrough]];
case 3 : eHorzAdjust = SDRTEXTHORZADJUST_BLOCK; break;
default: eHorzAdjust = SDRTEXTHORZADJUST_LEFT; break;
case 1 : eHorzAdjust = SDRTEXTHORZADJUST_CENTER; break;
@@ -491,19 +491,19 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindin
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_FONTWORK_CHARACTER_SPACING:
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_FONTWORK_KERN_CHARACTER_PAIRS:
{
if ( !pStrResId )
pStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case SID_FONTWORK_SAME_LETTER_HEIGHTS:
{
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 64367526b458..eba66ba8af83 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -346,7 +346,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
break;
case css::style::NumberingType::ROMAN_UPPER:
bUpper = true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case css::style::NumberingType::ROMAN_LOWER:
aPageNumValue += SvxNumberFormat::CreateRomanString(mnPageNumber, bUpper);
break;
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index f81f42eaf6e0..54fad1415071 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -60,7 +60,7 @@ bool XLineTransparenceItem::GetPresentation
{
case SfxItemPresentation::Complete:
rText = SvxResId(RID_SVXSTR_TRANSPARENCE) + ": ";
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case SfxItemPresentation::Nameless:
rText += unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
@@ -348,7 +348,7 @@ bool XFillTransparenceItem::GetPresentation
{
case SfxItemPresentation::Complete:
rText = SvxResId(RID_SVXSTR_TRANSPARENCE) + ": ";
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case SfxItemPresentation::Nameless:
rText += unicode::formatPercent(GetValue(),
Application::GetSettings().GetUILanguageTag());
generated by cgit (git 2.34.1) at 2024-07-29 08:08:07 +0000