diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-05-19 10:07:30 +0000 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-05-19 11:11:39 +0000 |
| commit | 373ef6eeb026a03b2198c3517d23daf282189702 (patch) | |
| tree | de8dbdb36b61be123eea1443d6bc0119cf1f4548 /sc/source/filter/excel/excel.cxx | |
| parent | 7415b7d4e594c75708ca19a2b21fe9b09136498d (diff) | |
Revert "tdf#35208 Allow choosing encoding for old Excel files"
This reverts commit 4f1ce46b8d65360436e09750242101b566e6186c.
Change-Id: I4b93ef8233f172935e72401ec51abd3d4c8a9fac
Reviewed-on: https://gerrit.libreoffice.org/25152
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'sc/source/filter/excel/excel.cxx')
| -rw-r--r-- | sc/source/filter/excel/excel.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 323e209892fa..73ee93ed3773 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -45,7 +45,7 @@ #include <memory> -FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument* pDocument, const EXCIMPFORMAT eFormat, rtl_TextEncoding eSrc ) +FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument* pDocument, const EXCIMPFORMAT eFormat ) { // check the passed Calc document OSL_ENSURE( pDocument, "::ScImportExcel - no document" ); @@ -129,11 +129,6 @@ FltError ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument case EXC_BIFF3: case EXC_BIFF4: case EXC_BIFF5: - if ( eSrc != RTL_TEXTENCODING_DONTKNOW ) - { - aImpData.meTextEnc = eSrc; - aImpData.mbForcedTextEnc = true; - } xFilter.reset( new ImportExcel( aImpData, *pBookStrm ) ); break; case EXC_BIFF8: |