summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/html/css1atr.cxx6
-rw-r--r--sw/source/filter/html/htmlform.cxx32
-rw-r--r--sw/source/filter/html/htmlgrin.cxx20
-rw-r--r--sw/source/filter/html/htmltab.cxx10
-rw-r--r--sw/source/filter/html/htmltabw.cxx2
-rw-r--r--sw/source/filter/html/parcss1.cxx6
-rw-r--r--sw/source/filter/html/swhtml.cxx12
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx2
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx8
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx4
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx12
-rw-r--r--sw/source/filter/xml/xmltbli.cxx2
-rw-r--r--sw/source/filter/xml/xmltexte.cxx2
17 files changed, 63 insertions, 63 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index f039ef7ad183..80d9e688dd46 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -348,7 +348,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
{
case FUNIT_100TH_MM:
OSL_ENSURE( FUNIT_MM == eUnit, "Measuring unit not supported" );
- //fall-through
+ SAL_FALLTHROUGH;
case FUNIT_MM:
// 0.01mm = 0.57twip
nMul = 25400; // 25.4 * 1000
@@ -360,7 +360,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
case FUNIT_M:
case FUNIT_KM:
OSL_ENSURE( FUNIT_CM == eUnit, "Measuring unit not supported" );
- //fall-through
+ SAL_FALLTHROUGH;
case FUNIT_CM:
// 0.01cm = 5.7twip (not exact, but the UI is also not exact)
nMul = 2540; // 2.54 * 1000
@@ -371,7 +371,7 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
case FUNIT_TWIP:
OSL_ENSURE( FUNIT_POINT == eUnit, "Measuring unit not supported" );
- //fall-through
+ SAL_FALLTHROUGH;
case FUNIT_POINT:
// 0.1pt = 2.0twip (not exact, but the UI is also not exact)
nMul = 100;
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 835c88bacdc3..bc6e71c2dd7d 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -1285,7 +1285,7 @@ void SwHTMLParser::NewForm( bool bAppend )
case HTML_O_SDONSUBMIT:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONSUBMIT:
nEvent = HTML_ET_ONSUBMITFORM;
bSetEvent = true;
@@ -1293,7 +1293,7 @@ void SwHTMLParser::NewForm( bool bAppend )
case HTML_O_SDONRESET:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONRESET:
nEvent = HTML_ET_ONRESETFORM;
bSetEvent = true;
@@ -1491,7 +1491,7 @@ void SwHTMLParser::InsertInput()
case HTML_O_SDONFOCUS:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONFOCUS:
nEvent = HTML_ET_ONGETFOCUS;
bSetEvent = true;
@@ -1499,7 +1499,7 @@ void SwHTMLParser::InsertInput()
case HTML_O_SDONBLUR: // eigtl. nur EDIT
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONBLUR:
nEvent = HTML_ET_ONLOSEFOCUS;
bSetEvent = true;
@@ -1507,7 +1507,7 @@ void SwHTMLParser::InsertInput()
case HTML_O_SDONCLICK:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONCLICK:
nEvent = HTML_ET_ONCLICK;
bSetEvent = true;
@@ -1515,7 +1515,7 @@ void SwHTMLParser::InsertInput()
case HTML_O_SDONCHANGE: // eigtl. nur EDIT
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONCHANGE:
nEvent = HTML_ET_ONCHANGE;
bSetEvent = true;
@@ -1523,7 +1523,7 @@ void SwHTMLParser::InsertInput()
case HTML_O_SDONSELECT: // eigtl. nur EDIT
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONSELECT:
nEvent = HTML_ET_ONSELECT;
bSetEvent = true;
@@ -1948,7 +1948,7 @@ void SwHTMLParser::NewTextArea()
case HTML_O_SDONFOCUS:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONFOCUS:
nEvent = HTML_ET_ONGETFOCUS;
bSetEvent = true;
@@ -1956,7 +1956,7 @@ void SwHTMLParser::NewTextArea()
case HTML_O_SDONBLUR:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONBLUR:
nEvent = HTML_ET_ONLOSEFOCUS;
bSetEvent = true;
@@ -1964,7 +1964,7 @@ void SwHTMLParser::NewTextArea()
case HTML_O_SDONCLICK:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONCLICK:
nEvent = HTML_ET_ONCLICK;
bSetEvent = true;
@@ -1972,7 +1972,7 @@ void SwHTMLParser::NewTextArea()
case HTML_O_SDONCHANGE:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONCHANGE:
nEvent = HTML_ET_ONCHANGE;
bSetEvent = true;
@@ -1980,7 +1980,7 @@ void SwHTMLParser::NewTextArea()
case HTML_O_SDONSELECT:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONSELECT:
nEvent = HTML_ET_ONSELECT;
bSetEvent = true;
@@ -2224,7 +2224,7 @@ void SwHTMLParser::NewSelect()
case HTML_O_SDONFOCUS:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONFOCUS:
nEvent = HTML_ET_ONGETFOCUS;
bSetEvent = true;
@@ -2232,7 +2232,7 @@ void SwHTMLParser::NewSelect()
case HTML_O_SDONBLUR:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONBLUR:
nEvent = HTML_ET_ONLOSEFOCUS;
bSetEvent = true;
@@ -2240,7 +2240,7 @@ void SwHTMLParser::NewSelect()
case HTML_O_SDONCLICK:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONCLICK:
nEvent = HTML_ET_ONCLICK;
bSetEvent = true;
@@ -2248,7 +2248,7 @@ void SwHTMLParser::NewSelect()
case HTML_O_SDONCHANGE:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONCHANGE:
nEvent = HTML_ET_ONCHANGE;
bSetEvent = true;
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 00ec79fd3f97..48923939e689 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -390,21 +390,21 @@ void SwHTMLParser::InsertImage()
case HTML_O_SDONLOAD:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONLOAD:
nEvent = SVX_EVENT_IMAGE_LOAD;
goto IMAGE_SETEVENT;
case HTML_O_SDONABORT:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONABORT:
nEvent = SVX_EVENT_IMAGE_ABORT;
goto IMAGE_SETEVENT;
case HTML_O_SDONERROR:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONERROR:
nEvent = SVX_EVENT_IMAGE_ERROR;
goto IMAGE_SETEVENT;
@@ -874,7 +874,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONLOAD:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONLOAD:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::OPENDOC );
bSetEvent = true;
@@ -882,7 +882,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONUNLOAD:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONUNLOAD:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::PREPARECLOSEDOC );
bSetEvent = true;
@@ -890,7 +890,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONFOCUS:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONFOCUS:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::ACTIVATEDOC );
bSetEvent = true;
@@ -898,7 +898,7 @@ void SwHTMLParser::InsertBodyOptions()
case HTML_O_SDONBLUR:
eScriptType2 = STARBASIC;
- //fallthrough
+ SAL_FALLTHROUGH;
case HTML_O_ONBLUR:
aEvent = GlobalEventConfig::GetEventName( GlobalEventId::DEACTIVATEDOC );
bSetEvent = true;
@@ -1118,21 +1118,21 @@ void SwHTMLParser::NewAnchor()
case HTML_O_SDONCLICK:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONCLICK:
nEvent = SFX_EVENT_MOUSECLICK_OBJECT;
goto ANCHOR_SETEVENT;
case HTML_O_SDONMOUSEOVER:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONMOUSEOVER:
nEvent = SFX_EVENT_MOUSEOVER_OBJECT;
goto ANCHOR_SETEVENT;
case HTML_O_SDONMOUSEOUT:
eScriptType2 = STARBASIC;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_O_ONMOUSEOUT:
nEvent = SFX_EVENT_MOUSEOUT_OBJECT;
goto ANCHOR_SETEVENT;
diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index 02dfb42cd009..0c1132aa1b46 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3692,7 +3692,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
break;
case SVX_ADJUST_LEFT:
eSurround = SURROUND_RIGHT;
- //fall-through
+ SAL_FALLTHROUGH;
default:
eHori = text::HoriOrientation::LEFT;
break;
@@ -3881,7 +3881,7 @@ void SwHTMLParser::BuildTableCell( HTMLTable *pCurTable, bool bReadOptions,
case HTML_TBODY_OFF:
case HTML_TABLE_OFF:
SkipToken();
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_TABLEHEADER_OFF:
case HTML_TABLEDATA_OFF:
bDone = true;
@@ -4284,7 +4284,7 @@ void SwHTMLParser::BuildTableRow( HTMLTable *pCurTable, bool bReadOptions,
case HTML_TFOOT_OFF:
case HTML_TABLE_OFF:
SkipToken();
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_TABLEROW_OFF:
bDone = true;
break;
@@ -4457,7 +4457,7 @@ void SwHTMLParser::BuildTableSection( HTMLTable *pCurTable,
case HTML_TBODY_ON:
case HTML_TABLE_OFF:
SkipToken();
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_THEAD_OFF:
case HTML_TBODY_OFF:
case HTML_TFOOT_OFF:
@@ -4653,7 +4653,7 @@ void SwHTMLParser::BuildTableColGroup( HTMLTable *pCurTable,
case HTML_TABLEROW_ON:
case HTML_TABLE_OFF:
SkipToken();
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_COLGROUP_OFF:
bDone = true;
break;
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 1773f8d6b42a..c2551a1b4e7a 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -987,7 +987,7 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & rNode,
case text::HoriOrientation::LEFT_AND_WIDTH:
eTabHoriOri = text::HoriOrientation::LEFT;
bCheckDefList = true;
- // no break
+ SAL_FALLTHROUGH;
default:
// In allen anderen Faellen kann eine absolute oder relative
// Breite direkt uebernommen werden.
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index 2b14d4195a7b..6ac6d9d18a8d 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -578,7 +578,7 @@ CSS1Token CSS1Parser::GetNextToken()
bNextCh = false;
break;
}
- // no break
+ SAL_FALLTHROUGH;
default: // IDENT | syntax error
if (rtl::isAsciiAlpha(cNextCh))
@@ -1043,7 +1043,7 @@ CSS1Expression *CSS1Parser::ParseDeclaration( OUString& rProperty )
case CSS1_EMX:
if( '-'==cSign )
nValue = -nValue;
- //fall-through
+ SAL_FALLTHROUGH;
case CSS1_STRING:
case CSS1_PERCENTAGE:
case CSS1_IDENT:
@@ -1308,7 +1308,7 @@ bool CSS1Expression::GetColor( Color &rColor ) const
if( bRet || CSS1_STRING != eType || aValue.isEmpty() ||
aValue[0] != '#' )
break;
-
+ SAL_FALLTHROUGH;
case CSS1_HEXCOLOR:
{
// HACK fuer MS-IE: DIe Farbe kann auch in einem String stehen
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 7a6def77a8a0..53411b8b0497 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -1237,7 +1237,7 @@ void SwHTMLParser::NextToken( int nToken )
case HTML_UNKNOWNCONTROL_OFF:
if( m_aUnknownToken != sSaveToken )
return;
- //fall-through
+ SAL_FALLTHROUGH;
case HTML_FRAMESET_ON:
case HTML_HEAD_OFF:
case HTML_BODY_ON:
@@ -2011,7 +2011,7 @@ void SwHTMLParser::NextToken( int nToken )
!sSaveToken.isEmpty() && '!' != sSaveToken[0] &&
'%' != sSaveToken[0] )
m_aUnknownToken = sSaveToken;
- // no break
+ SAL_FALLTHROUGH;
default:
bInsertUnknown = m_bKeepUnknown;
@@ -2050,7 +2050,7 @@ static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
{
case RES_CHRATR_FONT:
rFont = true;
- //fall-through
+ SAL_FALLTHROUGH;
case RES_CHRATR_FONTSIZE:
case RES_CHRATR_LANGUAGE:
case RES_CHRATR_POSTURE:
@@ -2060,7 +2060,7 @@ static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
break;
case RES_CHRATR_CJK_FONT:
rFont = true;
- //fall-through
+ SAL_FALLTHROUGH;
case RES_CHRATR_CJK_FONTSIZE:
case RES_CHRATR_CJK_LANGUAGE:
case RES_CHRATR_CJK_POSTURE:
@@ -2070,7 +2070,7 @@ static void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr,
break;
case RES_CHRATR_CTL_FONT:
rFont = true;
- //fall-through
+ SAL_FALLTHROUGH;
case RES_CHRATR_CTL_FONTSIZE:
case RES_CHRATR_CTL_LANGUAGE:
case RES_CHRATR_CTL_POSTURE:
@@ -4158,7 +4158,7 @@ void SwHTMLParser::NewTextFormatColl( int nToken, sal_uInt16 nColl )
// Fuer dem Fall, dass ein CLASS angegeben ist, loeschen wir
// es damit wir nicht die CLASS der PRE-Vorlage bekommen.
aClass = aEmptyOUStr;
- // fall-through
+ SAL_FALLTHROUGH;
case HTML_BLOCKQUOTE_ON:
case HTML_BLOCKQUOTE30_ON:
case HTML_PREFORMTXT_ON:
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 42138325ce11..2a13bedef6a5 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3412,7 +3412,7 @@ void RtfAttributeOutput::WriteExpand(const SwField* pField)
//#i119803# Export user field and DB field for RTF filter
case RES_DBFLD:
sCmd = FieldString(ww::eMERGEFIELD);
- // no break !!
+ SAL_FALLTHROUGH;
case RES_USERFLD:
sCmd += pField->GetTyp()->GetName();
m_rExport.OutputField(pField, ww::eNONE, sCmd);
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index d4bac28e8bf9..28e53b319c8a 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -3018,7 +3018,7 @@ sal_Int32 SwEscherEx::WriteTextFlyFrame(const DrawObj &rObj, sal_uInt32 nShapeId
{
default:
OSL_ENSURE(false, "unknown direction type");
- //fall-through
+ SAL_FALLTHROUGH;
case FRMDIR_HORI_LEFT_TOP:
nFlow=mso_txflHorzN;
break;
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 172be21f527a..ad0552504e0b 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -1205,7 +1205,7 @@ void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAt
case TOX_USER:
sText += "\" \\f \"" + OUString((sal_Char)( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) ));
- // fall through - no break;
+ SAL_FALLTHROUGH;
case TOX_CONTENT:
{
eType = ww::eTC;
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index ca7e8950a3bd..47b4e4db29f2 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2335,7 +2335,7 @@ void AttributeOutputBase::GetNumberPara( OUString& rStr, const SwField& rField )
default:
OSL_ENSURE(rField.GetFormat() == SVX_NUM_ARABIC,
"Unknown numbering type exported as default of Arabic\n");
- //fallthrough
+ SAL_FALLTHROUGH;
case SVX_NUM_ARABIC:
rStr += "\\* ARABIC ";
break;
@@ -3467,7 +3467,7 @@ void AttributeOutputBase::FormatBreak( const SvxFormatBreakItem& rBreak )
case SVX_BREAK_COLUMN_BEFORE: // ColumnBreak
bBefore = true;
- // no break;
+ SAL_FALLTHROUGH;
case SVX_BREAK_COLUMN_AFTER:
case SVX_BREAK_COLUMN_BOTH:
if ( GetExport().Sections().CurrentNumberOfColumns( *GetExport().m_pDoc ) > 1 || GetExport().SupportsOneColumnBreak() )
@@ -3567,7 +3567,7 @@ void WW8AttributeOutput::FormatTextGrid( const SwTextGridItem& rGrid )
{
default:
OSL_FAIL("Unknown grid type");
- //fall-through
+ SAL_FALLTHROUGH;
case GRID_NONE:
nGridType = 0;
break;
@@ -4444,7 +4444,7 @@ void WW8AttributeOutput::FormatFrameDirection( const SvxFrameDirectionItem& rDir
default:
//Can't get an unknown type here
OSL_FAIL("Unknown frame direction");
- //fall-through
+ SAL_FALLTHROUGH;
case FRMDIR_HORI_LEFT_TOP:
nTextFlow = 0;
break;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 4a583b86bd44..8ef53ba13070 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -3037,7 +3037,7 @@ SvxFrameDirection MakeDirection(sal_uInt16 nCode, bool bIsBiDi)
{
default:
OSL_ENSURE(eDir == 4, "unknown direction code, maybe it's a bitfield");
- //fall-through
+ SAL_FALLTHROUGH;
case 3:
eDir = bIsBiDi ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP; // #i38158# - Consider RTL tables
break;
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index b6d70adcb925..6d10dc30768b 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -983,7 +983,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
case FLD_TAGTXT:
if ((m_nFieldTagBad[nI] & nMask)) // Flag: Tag bad
return Read_F_Tag(&aF); // Taggen
- //fall through...
+ SAL_FALLTHROUGH;
case FLD_TEXT:
// so viele ueberlesen, das Resultfeld wird wie Haupttext
// eingelesen
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index e421bc08bd19..7e638214df8e 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -165,7 +165,7 @@ void wwSection::SetDirection()
{
default:
OSL_ENSURE(false, "Unknown layout type");
- //fall-through
+ SAL_FALLTHROUGH;
case 0:
meDir=FRMDIR_HORI_LEFT_TOP;
break;
@@ -240,7 +240,7 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrameFormat &rFormat, const wwSection &r
break;
default:
OSL_ENSURE(false, "Unknown grid type");
- //fall-through
+ SAL_FALLTHROUGH;
case 3:
eType = GRID_LINES_CHARS;
aGrid.SetSnapToChars(true);
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index d3481edc8f53..21232c0e9760 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -5364,19 +5364,19 @@ bool WW8Fib::GetBaseCp(ManTypes nType, WW8_CP * cp) const
default:
case MAN_TXBX_HDFT:
nOffset = ccpTxbx;
- // fall through
+ SAL_FALLTHROUGH;
case MAN_TXBX:
if (ccpEdn > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
nOffset += ccpEdn;
- // fall through
+ SAL_FALLTHROUGH;
case MAN_EDN:
if (ccpAtn > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
nOffset += ccpAtn;
- // fall through
+ SAL_FALLTHROUGH;
case MAN_AND:
if (ccpMcr > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
@@ -5395,19 +5395,19 @@ bool WW8Fib::GetBaseCp(ManTypes nType, WW8_CP * cp) const
return false;
}
nOffset += ccpHdr;
- // fall through
+ SAL_FALLTHROUGH;
case MAN_HDFT:
if (ccpFootnote > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
nOffset += ccpFootnote;
- // fall through
+ SAL_FALLTHROUGH;
case MAN_FTN:
if (ccpText > std::numeric_limits<WW8_CP>::max() - nOffset) {
return false;
}
nOffset += ccpText;
- // fall through
+ SAL_FALLTHROUGH;
case MAN_MAINTEXT:
break;
}
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index eda3db88f092..d098832d3b20 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1472,7 +1472,7 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
break;
case XML_TOK_TABLE_HEADER_ROWS:
bHeader = true;
- //fall-through
+ SAL_FALLTHROUGH;
case XML_TOK_TABLE_ROWS:
pContext = new SwXMLTableRowsContext_Impl( GetSwImport(), nPrefix,
rLocalName, xAttrList,
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 4dc0d55a5083..f45d40e07643 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -471,7 +471,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
}
if( '\'' == c || '\\' == c )
aBuffer.append( '\\' );
- // no break!
+ SAL_FALLTHROUGH;
default:
if( !aBuffer.isEmpty() )
aBuffer.append( c );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 08:12:57 +0000