ScRange::Parse never passed a null ScDocument*

Change-Id: I2c504f051f77c89f7e2e6d54990d030351824121
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102956
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 11 insertions, 11 deletions

diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index ed729725695d..5881990eb535 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -309,10 +309,10 @@ OUString XclExpName::GetWithDefaultRangeSeparator( const OUString& rSymbol ) con
         // convert with validation
         ScRange aRange;
         ScAddress::Details detailsXL( ::formula::FormulaGrammar::CONV_XL_A1 );
-        ScRefFlags nRes = aRange.Parse( rSymbol.copy(0, nPos), &GetDoc(), detailsXL );
+        ScRefFlags nRes = aRange.Parse( rSymbol.copy(0, nPos), GetDoc(), detailsXL );
         if ( nRes & ScRefFlags::VALID )
         {
-            nRes = aRange.Parse( rSymbol.copy(nPos+1), &GetDoc(), detailsXL );
+            nRes = aRange.Parse( rSymbol.copy(nPos+1), GetDoc(), detailsXL );
             if ( nRes & ScRefFlags::VALID )
             {
                 return rSymbol.replaceFirst(";", ",");
diff --git a/sc/source/filter/oox/revisionfragment.cxx b/sc/source/filter/oox/revisionfragment.cxx
index 537149108597..69d5786fe0ec 100644
--- a/sc/source/filter/oox/revisionfragment.cxx
+++ b/sc/source/filter/oox/revisionfragment.cxx
@@ -410,7 +410,7 @@ void RevisionLogFragment::importRrc( const AttributeList& rAttribs )
         return;
 
     OUString aRefStr = rAttribs.getString(XML_ref, OUString());
-    mpImpl->maRange.Parse(aRefStr, &getScDocument(), formula::FormulaGrammar::CONV_XL_OOX);
+    mpImpl->maRange.Parse(aRefStr, getScDocument(), formula::FormulaGrammar::CONV_XL_OOX);
     if (!mpImpl->maRange.IsValid())
         return;
 
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index ccce5bb9e436..142f78a5205b 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -188,7 +188,7 @@ os::src_range_t ScOrcusRefResolver::resolve_range(const char* p, size_t n)
     OUString aStr(p, n, mrGlobalSettings.getTextEncoding());
 
     ScRange aRange;
-    aRange.Parse(aStr, &mrGlobalSettings.getDoc().getDoc(),
+    aRange.Parse(aStr, mrGlobalSettings.getDoc().getDoc(),
         formula::FormulaGrammar::extractRefConvention(
             mrGlobalSettings.getCalcGrammar()));
 
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 11c0b9b792ad..59073a9b3516 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -1171,26 +1171,26 @@ GetEditAs( const XclObjAny& rObj )
 
 namespace {
 
-ScRefFlags parseRange(const OUString& rString, ScRange& rRange, const ScDocument* pDoc)
+ScRefFlags parseRange(const OUString& rString, ScRange& rRange, const ScDocument& rDoc)
 {
     // start with the address convention set in the document
-    formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
-    ScRefFlags nResult = rRange.Parse(rString, pDoc, eConv);
+    formula::FormulaGrammar::AddressConvention eConv = rDoc.GetAddressConvention();
+    ScRefFlags nResult = rRange.Parse(rString, rDoc, eConv);
     if ( nResult & ScRefFlags::VALID )
         return nResult;
 
     // try the default calc address convention
-    nResult = rRange.Parse(rString, pDoc);
+    nResult = rRange.Parse(rString, rDoc);
     if ( nResult & ScRefFlags::VALID )
         return nResult;
 
     // try excel a1
-    nResult = rRange.Parse(rString, pDoc, formula::FormulaGrammar::CONV_XL_A1);
+    nResult = rRange.Parse(rString, rDoc, formula::FormulaGrammar::CONV_XL_A1);
     if ( nResult & ScRefFlags::VALID )
         return nResult;
 
     // try r1c1
-    return rRange.Parse(rString, pDoc, formula::FormulaGrammar::CONV_XL_R1C1);
+    return rRange.Parse(rString, rDoc, formula::FormulaGrammar::CONV_XL_R1C1);
 }
 
 ScRefFlags parseAddress(const OUString& rString, ScAddress& rAddress, const ScDocument* pDoc)
@@ -1226,7 +1226,7 @@ void transformURL(const OUString& rOldURL, OUString& rNewURL, const ScDocument&
 
         ScRange aRange;
         ScAddress aAddress;
-        ScRefFlags nResult = parseRange(aAddressString, aRange, &rDoc);
+        ScRefFlags nResult = parseRange(aAddressString, aRange, rDoc);
         if ( nResult & ScRefFlags::VALID )
         {
             OUString aString = aRange.Format(rDoc, nResult, formula::FormulaGrammar::CONV_XL_OOX);