Kaydet (Commit) 083360df authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Eike Rathke

ScImportStarCalc10 appears uncallable

I can't see a mention of "StarCalc 1.0" anywhere in our code
which might appear here as a filtername

last mention of something like it is...

commit cf8f6fe1
Author: Michael Stahl <mstahl@redhat.com>
Date:   Tue Feb 5 15:49:26 2013 +0100

    officecfg: remove references to binfilter formats

Change-Id: Ia6f9ab89489e33ca3680c150fd896035b8dee491
Reviewed-on: https://gerrit.libreoffice.org/44426Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
üst 8fc98bb3
...@@ -65,7 +65,6 @@ class SAL_DLLPUBLIC_RTTI ScFormatFilterPlugin { ...@@ -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_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_BIFF8 -> only Biff8 stream is read successfully (only in Excel97 docs)
// eFormat == EIF_BIFF_LE4 -> only non storage files _might_ be read successfully // 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, virtual ErrCode ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos,
const rtl_TextEncoding eSrc ) = 0; const rtl_TextEncoding eSrc ) = 0;
virtual ErrCode ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) = 0; virtual ErrCode ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) = 0;
......
...@@ -270,7 +270,6 @@ public: ...@@ -270,7 +270,6 @@ public:
// eFormat == EIF_BIFF5 -> only Biff5 stream leads to success (even in an Excel97 doc) // 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_BIFF8 -> only Biff8 stream leads to success (only in Excel97 docs)
// eFormat == EIF_BIFF_LE4 -> only non-storage files _could_ lead to success // 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, virtual ErrCode ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos,
const rtl_TextEncoding eSrc ) override; const rtl_TextEncoding eSrc ) override;
virtual ErrCode ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) override; virtual ErrCode ScImportRTF( SvStream&, const OUString& rBaseURL, ScDocument*, ScRange& rRange ) override;
......
...@@ -2400,11 +2400,4 @@ void Sc10Import::LoadObjects() ...@@ -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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -1089,21 +1089,6 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) ...@@ -1089,21 +1089,6 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium )
if (aFltName == pFilterXML) if (aFltName == pFilterXML)
bRet = LoadXML( &rMedium, nullptr ); 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) else if (aFltName == pFilterLotus)
{ {
OUString sItStr; OUString sItStr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment