sc/source/filter/inc/namebuff.hxx | 8 ++++----
sc/source/filter/lotus/lotimpop.cxx | 2 +-
sc/source/filter/lotus/tool.cxx | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 4074cd73933276f2d4742ecb7ebce30362ba24c1
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Sep 13 20:11:07 2020 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Sep 14 10:00:06 2020 +0200
RangeNameBufferWK3::Add never called with a null ScDocument*
Change-Id: I01eee29770d8a4459812bf9db3fc8b349166f27d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102613
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/filter/inc/namebuff.hxx
b/sc/source/filter/inc/namebuff.hxx
index b56fee1d169e..9cec310e47e2 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -99,13 +99,13 @@ private:
public:
RangeNameBufferWK3(const ScDocument& rDoc);
~RangeNameBufferWK3();
- void Add( const ScDocument* pDoc, const OUString&
rName, const ScComplexRefData& rCRD );
- inline void Add( const ScDocument* pDoc, const OUString&
rName, const ScRange& aScRange );
+ void Add( const ScDocument& rDoc, const OUString&
rName, const ScComplexRefData& rCRD );
+ inline void Add( const ScDocument& rDoc, const OUString&
rName, const ScRange& aScRange );
bool FindRel( const OUString& rRef, sal_uInt16& rIndex
);
bool FindAbs( const OUString& rRef, sal_uInt16& rIndex
);
};
-inline void RangeNameBufferWK3::Add( const ScDocument* pDoc, const OUString&
rName, const ScRange& aScRange )
+inline void RangeNameBufferWK3::Add( const ScDocument& rDoc, const OUString&
rName, const ScRange& aScRange )
{
ScComplexRefData aCRD;
ScSingleRefData* pSRD;
@@ -118,7 +118,7 @@ inline void RangeNameBufferWK3::Add( const ScDocument*
pDoc, const OUString& rNa
pSRD->InitAddress(aScRange.aEnd);
pSRD->SetFlag3D(true);
- Add( pDoc, rName, aCRD );
+ Add( rDoc, rName, aCRD );
}
class ExtSheetBuffer : public ExcRoot
diff --git a/sc/source/filter/lotus/lotimpop.cxx
b/sc/source/filter/lotus/lotimpop.cxx
index 0c77edab58a9..952d47b2e0aa 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -167,7 +167,7 @@ void ImportLotus::Userrange()
Read( aScRange );
LotusContext &rContext = aConv.getContext();
- rContext.pRngNmBffWK3->Add( &rContext.rDoc, aName, aScRange );
+ rContext.pRngNmBffWK3->Add( rContext.rDoc, aName, aScRange );
}
void ImportLotus::Errcell()
diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx
index 6ca63465052a..eff0740d41de 100644
--- a/sc/source/filter/lotus/tool.cxx
+++ b/sc/source/filter/lotus/tool.cxx
@@ -436,7 +436,7 @@ RangeNameBufferWK3::~RangeNameBufferWK3()
{
}
-void RangeNameBufferWK3::Add( const ScDocument* pDoc, const OUString&
rOrgName, const ScComplexRefData& rCRD )
+void RangeNameBufferWK3::Add( const ScDocument& rDoc, const OUString&
rOrgName, const ScComplexRefData& rCRD )
{
Entry aInsert( rOrgName, rCRD );
@@ -444,8 +444,8 @@ void RangeNameBufferWK3::Add( const ScDocument* pDoc, const
OUString& rOrgName,
const ScSingleRefData& rRef1 = rCRD.Ref1;
const ScSingleRefData& rRef2 = rCRD.Ref2;
- ScAddress aAbs1 = rRef1.toAbs(*pDoc, ScAddress());
- ScAddress aAbs2 = rRef2.toAbs(*pDoc, ScAddress());
+ ScAddress aAbs1 = rRef1.toAbs(rDoc, ScAddress());
+ ScAddress aAbs2 = rRef2.toAbs(rDoc, ScAddress());
if (aAbs1 == aAbs2)
{
pScTokenArray->AddSingleReference( rCRD.Ref1 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
