sc/source/filter/inc/qproform.hxx | 2 +-
sc/source/filter/qpro/qpro.cxx | 2 +-
sc/source/filter/qpro/qproform.cxx | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 710d2abf48c60549dedc8ff57a8c860f6c3c9573
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Sep 13 19:38:49 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 14 09:53:08 2020 +0200
QProToSc::Convert never passed a nullptr
Change-Id: I17477f969cc34079139c02bc922223d7e961636e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102601
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/filter/inc/qproform.hxx
b/sc/source/filter/inc/qproform.hxx
index 520c80920bd4..c9cded627d79 100644
--- a/sc/source/filter/inc/qproform.hxx
+++ b/sc/source/filter/inc/qproform.hxx
@@ -58,7 +58,7 @@ private:
public:
static const size_t nBufSize = 256;
QProToSc( SvStream &aStr, svl::SharedStringPool& rSPool, const ScAddress&
rRefPos );
- ConvErr Convert( const ScDocument* pDoc, std::unique_ptr<ScTokenArray>&
pArray );
+ ConvErr Convert( const ScDocument& rDoc, std::unique_ptr<ScTokenArray>&
pArray );
void DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const char* pExtString );
void ReadSRD( const ScDocument* pDoc, ScSingleRefData& rR, sal_Int8 nPage,
sal_Int8 nCol, sal_uInt16 rRel );
void IncToken( TokenId &aParam );
diff --git a/sc/source/filter/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx
index 09ffa346a57b..73dd66f19473 100644
--- a/sc/source/filter/qpro/qpro.cxx
+++ b/sc/source/filter/qpro/qpro.cxx
@@ -109,7 +109,7 @@ ErrCode ScQProReader::readSheet( SCTAB nTab, ScDocument*
pDoc, ScQProStyle *pSty
std::unique_ptr<ScTokenArray> pArray;
QProToSc aConv(*mpStream, pDoc->GetSharedStringPool(), aAddr);
- if (ConvErr::OK != aConv.Convert( pDoc, pArray ))
+ if (ConvErr::OK != aConv.Convert( *pDoc, pArray ))
eRet = SCERR_IMPORT_FORMAT;
else
{
diff --git a/sc/source/filter/qpro/qproform.cxx
b/sc/source/filter/qpro/qproform.cxx
index 8eb05e9f1ccf..c78cf1acc0fb 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -188,7 +188,7 @@ do { \
break; /* switch */ \
}
-ConvErr QProToSc::Convert( const ScDocument* pDoc,
std::unique_ptr<ScTokenArray>& pArray )
+ConvErr QProToSc::Convert( const ScDocument& rDoc,
std::unique_ptr<ScTokenArray>& pArray )
{
sal_uInt8 nFmla[ nBufSize ];
sal_uInt8 nArgArray[ nBufSize ] = {0};
@@ -320,17 +320,17 @@ ConvErr QProToSc::Convert( const ScDocument* pDoc,
std::unique_ptr<ScTokenArray>
case FT_Cref : // Single cell reference
maIn.ReadUInt16( nNote ).ReadSChar( nCol ).ReadSChar( nPage
).ReadUInt16( nRelBits );
SAFEREAD_OR_BREAK( maIn, i, nRef, eRet, ConvErr::Count);
- ReadSRD( pDoc, aSRD, nPage, nCol, nRelBits );
+ ReadSRD( &rDoc, aSRD, nPage, nCol, nRelBits );
aStack << aPool.Store( aSRD );
break;
case FT_Range: // Block reference
maIn.ReadUInt16( nNote ).ReadSChar( nCol ).ReadSChar( nPage
).ReadUInt16( nRelBits );
SAFEREAD_OR_BREAK( maIn, i, nRef, eRet, ConvErr::Count);
- ReadSRD( pDoc, aCRD.Ref1, nPage, nCol, nRelBits );
+ ReadSRD( &rDoc, aCRD.Ref1, nPage, nCol, nRelBits );
maIn.ReadSChar( nCol ).ReadSChar( nPage ).ReadUInt16( nRelBits
);
SAFEREAD_OR_BREAK( maIn, i, nRef, eRet, ConvErr::Count);
- ReadSRD( pDoc, aCRD.Ref2, nPage, nCol, nRelBits );
+ ReadSRD( &rDoc, aCRD.Ref2, nPage, nCol, nRelBits );
// Sheet name of second corner is not displayed if identical
if (aCRD.Ref1.IsFlag3D() && aCRD.Ref1.Tab() == aCRD.Ref2.Tab()
&&
aCRD.Ref1.IsTabRel() == aCRD.Ref2.IsTabRel())
@@ -391,7 +391,7 @@ ConvErr QProToSc::Convert( const ScDocument* pDoc,
std::unique_ptr<ScTokenArray>
}
i++;
}
- pArray = aPool.GetTokenArray(*pDoc, aStack.Get());
+ pArray = aPool.GetTokenArray(rDoc, aStack.Get());
return eRet;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
