diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-22 15:40:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-24 19:05:07 +0100 |
| commit | f326c3c01c3f2dd1ed244bded68d096cd680ad18 (patch) | |
| tree | 46d5b976b442b00feef6e70fee76e2a91dce41c3 | |
| parent | 1ab34cdb4a8bf255ba6a0eb96b2a30c7be5e451b (diff) | |
remove unused FuncFlags::BIFFIMPORTONLY,STATE::S_WK1
Change-Id: I94d88f871bfc78a066f6fd583b7fb7a7305944c8
Reviewed-on: https://gerrit.libreoffice.org/63943
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | compilerplugins/clang/unusedenumconstants.readonly.results | 2 | ||||
| -rw-r--r-- | sc/source/filter/lotus/lotread.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/oox/formulabase.cxx | 13 |
3 files changed, 6 insertions, 13 deletions
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results index 0ad6cb92a0c2..88093da091b3 100644 --- a/compilerplugins/clang/unusedenumconstants.readonly.results +++ b/compilerplugins/clang/unusedenumconstants.readonly.results @@ -1178,8 +1178,6 @@ sc/source/filter/inc/unitconverter.hxx:44 enum oox::xls::Unit UNIT_REFDEVY sc/source/filter/lotus/lotread.cxx:41 enum STATE S_WK1 -sc/source/filter/oox/formulabase.cxx:63 - enum FuncFlags BIFFIMPORTONLY sc/source/ui/inc/viewdata.hxx:43 enum ScSplitMode SC_SPLIT_MODE_MAX_ENUM sc/source/ui/inc/viewdata.hxx:45 diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index 5be4db478cfc..155e265a6f4b 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -38,7 +38,6 @@ ErrCode ImportLotus::parse() enum STATE { S_START, // analyse first BOF - S_WK1, // in WK1-Stream S_WK3, // in WK3-Section S_WK4, S_FM3, @@ -107,9 +106,6 @@ ErrCode ImportLotus::parse() } break; - case S_WK1: // S_WK1 - break; - case S_WK3: // S_WK3 case S_WK4: // S_WK4 switch( nOp ) diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 4a11eef0ff87..7872a03529d1 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -60,13 +60,12 @@ enum class FuncFlags : sal_uInt16 { MACROCALL_NEW = MACROCALL | MACROCALL_FN, /** New Excel functions not defined in OOXML, _xlfn. prefix in all formats. OOXML name must exist. */ - BIFFIMPORTONLY = 0x0800, /// Only used in BIFF binary import filter. BIFFEXPORTONLY = 0x1000, /// Only used in BIFF binary export filter. INTERNAL = 0x2000, /// Function is internal in Calc. EUROTOOL = 0x4000, /// function of euro tool lib, FUNCLIB_EUROTOOL }; namespace o3tl { - template<> struct typed_flags<FuncFlags> : is_typed_flags<FuncFlags, 0x7fff> {}; + template<> struct typed_flags<FuncFlags> : is_typed_flags<FuncFlags, 0x77ff> {}; } namespace oox { @@ -191,13 +190,13 @@ struct FunctionData bool FunctionData::isSupported(bool bImportFilter) const { /* For import filters: the FuncFlags::EXPORTONLY, FuncFlags::BIFFEXPORTONLY - and FuncFlags::BIFFIMPORTONLY flag must not be set. - For export filters: the FuncFlags::IMPORTONLY, FuncFlags::BIFFIMPORTONLY - and FuncFlags::BIFFEXPORTONLY flag must not be set. */ + must not be set. + For export filters: the FuncFlags::IMPORTONLY, FuncFlags::BIFFEXPORTONLY + must not be set. */ if (bImportFilter) - return !(mnFlags & ( FuncFlags::EXPORTONLY | FuncFlags::BIFFEXPORTONLY | FuncFlags::BIFFIMPORTONLY)); + return !(mnFlags & ( FuncFlags::EXPORTONLY | FuncFlags::BIFFEXPORTONLY)); else - return !(mnFlags & ( FuncFlags::IMPORTONLY | FuncFlags::BIFFIMPORTONLY | FuncFlags::BIFFEXPORTONLY)); + return !(mnFlags & ( FuncFlags::IMPORTONLY | FuncFlags::BIFFEXPORTONLY)); } const sal_uInt16 NOID = SAL_MAX_UINT16; /// No BIFF function identifier available. |