diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-07-18 09:45:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-07-19 05:39:06 +0000 |
| commit | a7b5be118191a4e8a6cd422b5b2438a1ac22f36f (patch) | |
| tree | e73de333df6d1db0da6d9a3d23d4b9210f4a6319 /sc/inc | |
| parent | 62442d9066ea553a4b68b8a93fa54748cbe96e06 (diff) | |
sc dif import: plain number formatter is unused
commit 2cb7d3c13cc55d8ee680fe19d99819529d8b9ba5
revealed DifOptions is always set to DifOptions::Excel,
so DifParser.bPlain is never true.
remove import with plain number formatter and DifOptions enum
Change-Id: I8e214f3fff8ecfc7e03622dd1fe3fb53c2fb1e25
Reviewed-on: https://gerrit.libreoffice.org/27277
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/filter.hxx | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index aaeb9f382ad6..e51ee3a05a04 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_INC_FILTER_HXX #define INCLUDED_SC_INC_FILTER_HXX -#include <o3tl/typed_flags_set.hxx> #include <rtl/textenc.h> #include <rtl/ustring.hxx> #include <tools/solar.h> @@ -60,20 +59,6 @@ enum EXCIMPFORMAT { EIF_AUTO, EIF_BIFF5, EIF_BIFF8, EIF_BIFF_LE4 }; enum ExportFormatLotus { ExpWK1, ExpWK3, ExpWK4 }; enum ExportFormatExcel { ExpBiff2, ExpBiff3, ExpBiff4, ExpBiff4W, ExpBiff5, ExpBiff8, Exp2007Xml }; -// options for DIF im-/export (combine with '|') -enum class DifOptions -{ - Plain = 0x00000000, - Date = 0x00000001, - Time = 0x00000002, - Currency = 0x00000004, - - Excel = (Date|Time|Currency) -}; -namespace o3tl { - template<> struct typed_flags<DifOptions> : is_typed_flags<DifOptions, 0x00000007> {}; -} - // These are implemented inside the scfilt library and lazy loaded class ScEEAbsImport { @@ -98,7 +83,7 @@ class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin { // eFormat == EIF_BIFF_LE4 -> only non storage files _might_ be read successfully virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ) = 0; virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, - const rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW, DifOptions nDifOption = DifOptions::Excel ) = 0; + const rtl_TextEncoding eSrc = RTL_TEXTENCODING_DONTKNOW ) = 0; virtual FltError ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) = 0; virtual FltError ScImportHTML( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange, double nOutputFactor = 1.0, bool bCalcWidthHeight = true, SvNumberFormatter* pFormatter = nullptr, bool bConvertDate = true ) = 0; |