summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/dif/difimp.cxx2
-rw-r--r--sc/source/filter/excel/excform.cxx10
-rw-r--r--sc/source/filter/excel/read.cxx2
-rw-r--r--sc/source/filter/excel/xeformula.cxx2
-rw-r--r--sc/source/filter/excel/xestyle.cxx8
-rw-r--r--sc/source/filter/excel/xetable.cxx2
-rw-r--r--sc/source/filter/excel/xiescher.cxx2
-rw-r--r--sc/source/filter/excel/xihelper.cxx4
-rw-r--r--sc/source/filter/html/htmlexp.cxx2
-rw-r--r--sc/source/filter/html/htmlpars.cxx2
-rw-r--r--sc/source/filter/oox/formulabuffer.cxx2
-rw-r--r--sc/source/filter/oox/worksheetfragment.cxx2
-rw-r--r--sc/source/filter/xml/xmlcondformat.cxx2
13 files changed, 21 insertions, 21 deletions
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 8f759b0ba076..86036728258e 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -372,7 +372,7 @@ TOPIC DifParser::GetNextTopic()
case S_UNKNOWN:
// skip 2 lines
ReadNextLine( aLine );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case S_ERROR_L2: // error happened in line 2
// skip 1 line
ReadNextLine( aLine );
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 7989d2610012..9c20a8a7257b 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -408,7 +408,7 @@ ConvErr ExcelToSc::Convert( std::unique_ptr<ScTokenArray>& pResult, XclImpStream
case EXC_BIFF4: aIn.Ignore( 10 ); break;
case EXC_BIFF5:
SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" );
}
@@ -421,7 +421,7 @@ ConvErr ExcelToSc::Convert( std::unique_ptr<ScTokenArray>& pResult, XclImpStream
case EXC_BIFF4: aIn.Ignore( 4 ); break;
case EXC_BIFF5:
SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" );
}
@@ -619,7 +619,7 @@ ConvErr ExcelToSc::Convert( std::unique_ptr<ScTokenArray>& pResult, XclImpStream
case 0x66:
case 0x26: // Constant Reference Subexpression [321 271]
aExtensions.push_back( EXTENSION_MEMAREA );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case 0x47:
case 0x67:
@@ -990,7 +990,7 @@ ConvErr ExcelToSc::Convert( ScRangeListTabs& rRangeList, XclImpStream& aIn, std:
case EXC_BIFF3:
case EXC_BIFF4: nIgnore = 10; break;
case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" );
}
break;
@@ -1001,7 +1001,7 @@ ConvErr ExcelToSc::Convert( ScRangeListTabs& rRangeList, XclImpStream& aIn, std:
case EXC_BIFF3:
case EXC_BIFF4: nIgnore = 4; break;
case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" );
}
break;
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 150e104a8269..7933d75f5601 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -905,7 +905,7 @@ ErrCode ImportExcel8::Read()
break;
case Biff8W: // workbook
OSL_FAIL( "ImportExcel8::Read - double workbook globals" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case Biff8V: // VB module
default:
// TODO: do not create a sheet in the Calc document
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index a85d12a03081..a94d23f370d7 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1755,7 +1755,7 @@ void XclExpFmlaCompImpl::AppendTrailingParam( XclExpFuncData& rFuncData )
PrepareParam( rFuncData );
AppendIntToken( 0 );
FinishParam( rFuncData );
- SAL_FALLTHROUGH; // add next default parameter
+ [[fallthrough]]; // add next default parameter
case 2:
PrepareParam( rFuncData );
AppendIntToken( 1 );
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 3002523be642..0f8916e23394 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1502,7 +1502,7 @@ bool XclExpCellAlign::FillFromItemSet(
SetScFrameDir( rItemSet.Get( ATTR_WRITINGDIR ).GetValue() );
bUsed |= ScfTools::CheckItem( rItemSet, ATTR_WRITINGDIR, bStyle );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case EXC_BIFF5: // attributes new in BIFF5
@@ -1528,7 +1528,7 @@ bool XclExpCellAlign::FillFromItemSet(
}
mnOrient = XclTools::GetXclOrientFromRot( mnRotation );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case EXC_BIFF3: // attributes new in BIFF3
@@ -1537,7 +1537,7 @@ bool XclExpCellAlign::FillFromItemSet(
mbLineBreak = bForceLineBreak || rItemSet.Get( ATTR_LINEBREAK ).GetValue();
bUsed |= bForceLineBreak || ScfTools::CheckItem( rItemSet, ATTR_LINEBREAK, bStyle );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case EXC_BIFF2: // attributes new in BIFF2
@@ -1769,7 +1769,7 @@ bool XclExpCellBorder::FillFromItemSet(
bUsed |= ScfTools::CheckItem( rItemSet, ATTR_BORDER_TLBR, bStyle ) ||
ScfTools::CheckItem( rItemSet, ATTR_BORDER_BLTR, bStyle );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case EXC_BIFF5:
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 7ab2bd2b7809..f3f34a141641 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2582,7 +2582,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
default:
OSL_FAIL( "XclExpCellTable::XclExpCellTable - unknown cell type" );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case CELLTYPE_NONE:
{
xCell.reset( new XclExpBlankCell(
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 5d9b7b04ffc9..179af25f84b1 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1564,7 +1564,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
case EXC_OBJ_ORIENT_STACKED:
{
// sj: STACKED is not supported, maybe it can be optimized here a bit
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case EXC_OBJ_ORIENT_90CW:
{
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index 260a5fd59db4..2382dc5cfec8 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -407,7 +407,7 @@ void XclImpHFConverter::ParseString( const OUString& rHFString )
{
case '\"':
--pChar;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case ',':
eState = xlPSFontStyle;
break;
@@ -685,7 +685,7 @@ void XclImpUrlHelper::DecodeUrl(
lclAppendUrlChar( rUrl, cCurrDrive );
rUrl += ":";
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
case EXC_URL_SUBDIR:
if( bEncoded )
rUrl += "\\";
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 359e0154d60f..ce6fd53b399e 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1144,7 +1144,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
bFieldText = WriteFieldText(aCell.mpEditText);
if ( bFieldText )
break;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
ScCellFormat::GetString(aCell, nFormat, aStrOut, &pColor, *pFormatter, pDoc);
}
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 183e63f6ae29..16b0325e45be 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1530,7 +1530,7 @@ void ScHTMLLayoutParser::ProcToken( HtmlImportInfo* pInfo )
// Do not set bInCell to true, TableDataOn does that
mxActEntry->aItemSet.Put(
SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT) );
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case HtmlTokenId::TABLEDATA_ON: // Opens cell
{
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index 91bddc80ec76..d9e94483fc1e 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -173,7 +173,7 @@ void applySharedFormulas(
pCell->SetChanged(false);
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
// Mark it for re-calculation.
pCell->SetDirty();
diff --git a/sc/source/filter/oox/worksheetfragment.cxx b/sc/source/filter/oox/worksheetfragment.cxx
index e0ff875fe1fb..944affa28348 100644
--- a/sc/source/filter/oox/worksheetfragment.cxx
+++ b/sc/source/filter/oox/worksheetfragment.cxx
@@ -230,7 +230,7 @@ OUString NormalizeOoxList(const OUString& aList)
aResult.append("\",\"");
break;
}
- SAL_FALLTHROUGH;
+ [[fallthrough]];
default:
aResult.append(ch);
break;
diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx
index d50b6206c951..f1ee6d7fdc02 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -153,7 +153,7 @@ static bool HasRelRefIgnoringSheet0Relative( ScDocument* pDoc, const ScTokenArra
ScSingleRefData& rRef2 = t->GetDoubleRef()->Ref2;
if ( rRef2.IsColRel() || rRef2.IsRowRel() || (rRef2.IsFlag3D() && rRef2.IsTabRel()) )
return true;
- SAL_FALLTHROUGH;
+ [[fallthrough]];
}
case formula::svSingleRef:
generated by cgit (git 2.34.1) at 2024-07-29 02:21:45 +0000