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.cxx12
-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.cxx12
-rw-r--r--sc/source/filter/excel/xetable.cxx2
-rw-r--r--sc/source/filter/excel/xiescher.cxx3
-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.cxx3
10 files changed, 30 insertions, 22 deletions
diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx
index 1dd10d6fc16c..46487a3f99c4 100644
--- a/sc/source/filter/dif/difimp.cxx
+++ b/sc/source/filter/dif/difimp.cxx
@@ -382,7 +382,7 @@ TOPIC DifParser::GetNextTopic()
case S_UNKNOWN:
// skip 2 lines
ReadNextLine( aLine );
- // fall-through
+ SAL_FALLTHROUGH;
case S_ERROR_L2: // error happened in line 2
// skip 1 line
ReadNextLine( aLine );
@@ -700,8 +700,9 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
eS = S_EXP;
break;
case 0x00: // IsNumberEnding( cAkt )
- bRet = true; // no
- default: // break!
+ bRet = true;
+ SAL_FALLTHROUGH;
+ default:
eS = S_END;
}
}
@@ -721,8 +722,9 @@ bool DifParser::ScanFloatVal( const sal_Unicode* pStart )
eS = S_EXP_FIRST;
break;
case 0x00: // IsNumberEnding( cAkt )
- bRet = true; // no
- default: // break!
+ bRet = true;
+ SAL_FALLTHROUGH;
+ default:
eS = S_END;
}
}
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 47d7a85204a4..c05f8adf3bec 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -414,7 +414,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
case EXC_BIFF4: aIn.Ignore( 10 ); break;
case EXC_BIFF5:
SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" );
- //fall-through
+ SAL_FALLTHROUGH;
default:
SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" );
}
@@ -427,7 +427,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
case EXC_BIFF4: aIn.Ignore( 4 ); break;
case EXC_BIFF5:
SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" );
- //fall-through
+ SAL_FALLTHROUGH;
default:
SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" );
}
@@ -625,7 +625,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
case 0x66:
case 0x26: // Constant Reference Subexpression [321 271]
aExtensions.push_back( EXTENSION_MEMAREA );
- // fall through
+ SAL_FALLTHROUGH;
case 0x47:
case 0x67:
@@ -1028,7 +1028,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
case EXC_BIFF3:
case EXC_BIFF4: nIgnore = 10; break;
case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1A does not exist in Biff5!" );
- //fall-through
+ SAL_FALLTHROUGH;
default: SAL_INFO( "sc", "-ExcelToSc::Convert(): A little oblivious?" );
}
break;
@@ -1039,7 +1039,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
case EXC_BIFF3:
case EXC_BIFF4: nIgnore = 4; break;
case EXC_BIFF5: SAL_INFO( "sc", "-ExcelToSc::Convert(): 0x1B does not exist in Biff5!" );
- //fall-through
+ SAL_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 93ed6df0a48d..29188b3fa6ba 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -904,7 +904,7 @@ FltError ImportExcel8::Read()
break;
case Biff8W: // workbook
OSL_FAIL( "ImportExcel8::Read - double workbook globals" );
- // run through
+ SAL_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 7ef64cc074bf..74bb0cd8d1b8 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1742,7 +1742,7 @@ void XclExpFmlaCompImpl::AppendTrailingParam( XclExpFuncData& rFuncData )
PrepareParam( rFuncData );
AppendIntToken( 0 );
FinishParam( rFuncData );
- // do not break, add next default parameter
+ SAL_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 8e67c026e4c1..39697ac68910 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1478,8 +1478,6 @@ bool XclExpCellAlign::FillFromItemSet(
switch( eBiff )
{
- // ALL 'case's - run through!
-
case EXC_BIFF8: // attributes new in BIFF8
{
// text indent
@@ -1495,6 +1493,8 @@ bool XclExpCellAlign::FillFromItemSet(
// CTL text direction
SetScFrameDir( GETITEMVALUE( rItemSet, SvxFrameDirectionItem, ATTR_WRITINGDIR, SvxFrameDirection ) );
bUsed |= ScfTools::CheckItem( rItemSet, ATTR_WRITINGDIR, bStyle );
+
+ SAL_FALLTHROUGH;
}
case EXC_BIFF5: // attributes new in BIFF5
@@ -1519,6 +1519,8 @@ bool XclExpCellAlign::FillFromItemSet(
bUsed |= ScfTools::CheckItem( rItemSet, ATTR_ROTATE_VALUE, bStyle );
}
mnOrient = XclTools::GetXclOrientFromRot( mnRotation );
+
+ SAL_FALLTHROUGH;
}
case EXC_BIFF3: // attributes new in BIFF3
@@ -1526,6 +1528,8 @@ bool XclExpCellAlign::FillFromItemSet(
// text wrap
mbLineBreak = bForceLineBreak || GETITEMBOOL( rItemSet, ATTR_LINEBREAK );
bUsed |= bForceLineBreak || ScfTools::CheckItem( rItemSet, ATTR_LINEBREAK, bStyle );
+
+ SAL_FALLTHROUGH;
}
case EXC_BIFF2: // attributes new in BIFF2
@@ -1711,8 +1715,6 @@ bool XclExpCellBorder::FillFromItemSet(
switch( eBiff )
{
- // ALL 'case's - run through!
-
case EXC_BIFF8: // attributes new in BIFF8
{
const SvxLineItem& rTLBRItem = GETITEM( rItemSet, SvxLineItem, ATTR_BORDER_TLBR );
@@ -1740,6 +1742,8 @@ bool XclExpCellBorder::FillFromItemSet(
bUsed |= ScfTools::CheckItem( rItemSet, ATTR_BORDER_TLBR, bStyle ) ||
ScfTools::CheckItem( rItemSet, ATTR_BORDER_BLTR, bStyle );
+
+ SAL_FALLTHROUGH;
}
case EXC_BIFF5:
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index b05b3d31234b..1dc6dbbf4d75 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2505,7 +2505,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
default:
OSL_FAIL( "XclExpCellTable::XclExpCellTable - unknown cell type" );
- // run-through!
+ SAL_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 a1eb0433d214..ca306b57c4f1 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1540,9 +1540,10 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
}
break;
- case EXC_OBJ_ORIENT_STACKED: // PASSTHROUGH INTENDED
+ case EXC_OBJ_ORIENT_STACKED:
{
// sj: STACKED is not supported, maybe it can be optimized here a bit
+ SAL_FALLTHROUGH;
}
case EXC_OBJ_ORIENT_90CW:
{
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index 6b1bc9497ddc..dc243fdd9095 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -405,7 +405,7 @@ void XclImpHFConverter::ParseString( const OUString& rHFString )
{
case '\"':
--pChar;
- // run through
+ SAL_FALLTHROUGH;
case ',':
eState = xlPSFontStyle;
break;
@@ -688,7 +688,7 @@ void XclImpUrlHelper::DecodeUrl(
lclAppendUrlChar( rUrl, cCurrDrive );
rUrl += ":";
}
- // run through
+ SAL_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 12ce2a120229..60e802655669 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -1181,7 +1181,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
bFieldText = WriteFieldText(aCell.mpEditText);
if ( bFieldText )
break;
- //! else: fallthru
+ SAL_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 5ecfeaa71f0c..ba3e01a1531d 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1594,7 +1594,8 @@ void ScHTMLLayoutParser::ProcToken( ImportInfo* pInfo )
// Do not set bInCell to true, TableDataOn does that
pActEntry->aItemSet.Put(
SvxWeightItem( WEIGHT_BOLD, ATTR_FONT_WEIGHT) );
- } // fall through
+ SAL_FALLTHROUGH;
+ }
case HTML_TABLEDATA_ON: // Opens cell
{
TableDataOn( pInfo );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 22:18:41 +0000