summaryrefslogtreecommitdiff
path: root/sc/source/filter/excel
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/excel')
-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
7 files changed, 20 insertions, 15 deletions
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 3815c0fde88f..c3190550a68c 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 96b8ebf0d8a9..f064faf0c2a2 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 fb747cb763eb..3be306e5b82e 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 08007ec51a37..7de430196b67 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
@@ -1729,8 +1733,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 );
@@ -1758,6 +1760,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 c08b05615ace..5f4a65a3adc7 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -2504,7 +2504,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 d5d793c1470a..27139cc307f0 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1538,9 +1538,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 56774dd66342..6a9c78c00a0f 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 += "\\";
generated by cgit (git 2.34.1) at 2024-08-21 03:39:16 +0000