sc/source/filter/inc/lotimpop.hxx | 2 +-
sc/source/filter/lotus/lotimpop.cxx | 6 +++---
sc/source/filter/lotus/lotread.cxx | 2 +-
sc/source/filter/lotus/lotus.cxx | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit ee5582bacf99beac1b8a4206f57a2a5d3d3d980f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Sep 13 19:15:14 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 14 09:44:52 2020 +0200
unnecessary ScDocument argument
Change-Id: I537fca17cf9b2866bdf9b74701bfd7432ef02483
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102596
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/filter/inc/lotimpop.hxx
b/sc/source/filter/inc/lotimpop.hxx
index 2214d17daa82..1820856b3faa 100644
--- a/sc/source/filter/inc/lotimpop.hxx
+++ b/sc/source/filter/inc/lotimpop.hxx
@@ -72,7 +72,7 @@ private:
inline void Skip( const sal_uInt16 nNumBytes );
public:
- ImportLotus(LotusContext& rContext, SvStream&, ScDocument*,
rtl_TextEncoding eSrc);
+ ImportLotus(LotusContext& rContext, SvStream&, rtl_TextEncoding eSrc);
virtual ~ImportLotus() override;
diff --git a/sc/source/filter/lotus/lotimpop.cxx
b/sc/source/filter/lotus/lotimpop.cxx
index ebff4e67480d..ddc7fc3d5fbf 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -40,10 +40,10 @@
static osl::Mutex aLotImpSemaphore;
-ImportLotus::ImportLotus(LotusContext &rContext, SvStream& aStream,
ScDocument* pDoc, rtl_TextEncoding eQ)
- : ImportTyp(pDoc, eQ)
+ImportLotus::ImportLotus(LotusContext &rContext, SvStream& aStream,
rtl_TextEncoding eQ)
+ : ImportTyp(&rContext.rDoc, eQ)
, pIn(&aStream)
- , aConv(rContext, *pIn, pDoc->GetSharedStringPool(), eQ, false)
+ , aConv(rContext, *pIn, rContext.rDoc.GetSharedStringPool(), eQ, false)
, nTab(0)
, nExtTab(0)
{
diff --git a/sc/source/filter/lotus/lotread.cxx
b/sc/source/filter/lotus/lotread.cxx
index b0eefbf13466..e1c13226f231 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -322,7 +322,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool
TestImportWKS(SvStream& rStream)
aDocument.SetInsertingFromOtherDoc(true);
LotusContext aContext(aDocument, RTL_TEXTENCODING_ASCII_US);
- ImportLotus aLotusImport(aContext, rStream, &aDocument,
RTL_TEXTENCODING_ASCII_US);
+ ImportLotus aLotusImport(aContext, rStream, RTL_TEXTENCODING_ASCII_US);
ErrCode eRet = aLotusImport.parse();
if (eRet == ErrCode(0xFFFFFFFF))
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index 9e0e2216cec7..0cef334009aa 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -40,7 +40,7 @@ ErrCode ScFormatFilterPluginImpl::ScImportLotus123(
SfxMedium& rMedium, ScDocume
LotusContext aContext(*pDocument, eSrc);
- ImportLotus aLotusImport(aContext, *pStream, pDocument, eSrc);
+ ImportLotus aLotusImport(aContext, *pStream, eSrc);
ErrCode eRet;
if (ScFilterOptions().GetWK3Flag())
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
