diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-07-05 07:54:21 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-05 09:26:00 +0200 |
| commit | 0153c51bb8530a34d665932e52ffd47064376c83 (patch) | |
| tree | a03ed674120004315fea4bd5ad05b18d6311f806 /sc/source/filter/excel/excel.cxx | |
| parent | 96dec6af8fbc7f46f2032a227c47370256b7d5a9 (diff) | |
Revert "With ScFormatFilterMissing gone we don't need ScFormatFilterPluginImpl"
This reverts commit cc0524a724d0a9b9516ce9eaf499d845165863f8, which broke
UBSan's -fsanitize=vptr, where Library_sc needs the RTTI typeinfo symbol for
ScFormatFilterPlugin, but that would now only be emitted in Library_scfilt,
together with the first non-pure, non-inline virtual function, and Library_sc
cannot link against Library_scfilt (which already links against Library_sc).
Diffstat (limited to 'sc/source/filter/excel/excel.cxx')
| -rw-r--r-- | sc/source/filter/excel/excel.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 9451fd915fc0..b6087bf30715 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -45,7 +45,7 @@ #include <memory> -ErrCode ScFormatFilterPlugin::ScImportExcel( SfxMedium& rMedium, ScDocument* pDocument, const EXCIMPFORMAT eFormat ) +ErrCode ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument* pDocument, const EXCIMPFORMAT eFormat ) { // check the passed Calc document OSL_ENSURE( pDocument, "::ScImportExcel - no document" ); @@ -197,7 +197,7 @@ static ErrCode lcl_ExportExcelBiff( SfxMedium& rMedium, ScDocument *pDocument, return eRet; } -ErrCode ScFormatFilterPlugin::ScExportExcel5( SfxMedium& rMedium, ScDocument *pDocument, +ErrCode ScFormatFilterPluginImpl::ScExportExcel5( SfxMedium& rMedium, ScDocument *pDocument, ExportFormatExcel eFormat, rtl_TextEncoding eNach ) { if( eFormat != ExpBiff5 && eFormat != ExpBiff8 ) |