diff options
| -rw-r--r-- | sc/inc/filter.hxx | 1 | ||||
| -rw-r--r-- | sc/source/filter/inc/ftools.hxx | 1 | ||||
| -rw-r--r-- | sc/source/filter/starcalc/scflt.cxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/docshell/docsh.cxx | 15 |
4 files changed, 0 insertions, 24 deletions
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx index 04a0f4206985..5bef4a0e07d0 100644 --- a/sc/inc/filter.hxx +++ b/sc/inc/filter.hxx @@ -65,7 +65,6 @@ class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin { // eFormat == EIF_BIFF5 -> only Biff5 stream is read successfully (in an Excel97 doc, too) // eFormat == EIF_BIFF8 -> only Biff8 stream is read successfully (only in Excel97 docs) // eFormat == EIF_BIFF_LE4 -> only non storage files _might_ be read successfully - virtual ErrCode ScImportStarCalc10( SvStream&, ScDocument* ) = 0; virtual ErrCode ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, const rtl_TextEncoding eSrc ) = 0; virtual ErrCode ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) = 0; diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index d73bb5785745..086ba65fb4d2 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -270,7 +270,6 @@ public: // eFormat == EIF_BIFF5 -> only Biff5 stream leads to success (even in an Excel97 doc) // eFormat == EIF_BIFF8 -> only Biff8 stream leads to success (only in Excel97 docs) // eFormat == EIF_BIFF_LE4 -> only non-storage files _could_ lead to success - virtual ErrCode ScImportStarCalc10( SvStream&, ScDocument* ) override; virtual ErrCode ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, const rtl_TextEncoding eSrc ) override; virtual ErrCode ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) override; diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index f1e74b1544c8..d15bf25b90cb 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -2400,11 +2400,4 @@ void Sc10Import::LoadObjects() } } -ErrCode ScFormatFilterPluginImpl::ScImportStarCalc10( SvStream& rStream, ScDocument* pDocument ) -{ - rStream.Seek( 0 ); - Sc10Import aImport( rStream, pDocument ); - return aImport.Import(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index f9d2cc684d91..f4e19318d23d 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1089,21 +1089,6 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if (aFltName == pFilterXML) bRet = LoadXML( &rMedium, nullptr ); - else if (aFltName == "StarCalc 1.0") - { - SvStream* pStream = rMedium.GetInStream(); - if (pStream) - { - ErrCode eError = ScFormatFilter::Get().ScImportStarCalc10( *pStream, &aDocument ); - if (eError != ERRCODE_NONE) - { - if (!GetError()) - SetError(eError); - } - else - bRet = true; - } - } else if (aFltName == pFilterLotus) { OUString sItStr; |