diff options
Diffstat (limited to 'sc/source/filter/excel')
| -rw-r--r-- | sc/source/filter/excel/excform.cxx | 10 | ||||
| -rw-r--r-- | sc/source/filter/excel/read.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xeformula.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xestyle.cxx | 8 | ||||
| -rw-r--r-- | sc/source/filter/excel/xetable.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/excel/xihelper.cxx | 4 |
7 files changed, 15 insertions, 15 deletions
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 += "\\"; |