ConvertDoubleRef never passed a null ScDocument*

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

6 files changed, 9 insertions, 9 deletions

diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 8a4d9b6afc98..c2304965b240 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -964,7 +964,7 @@ bool ConvertSingleRef( const ScDocument* pDocument, const OUString& rRefString,
                        const ScAddress::Details& rDetails,
                        ScAddress::ExternalInfo* pExtInfo = nullptr );
 
-bool ConvertDoubleRef( const ScDocument* pDocument, const OUString& rRefString,
+bool ConvertDoubleRef( const ScDocument& rDocument, const OUString& rRefString,
                        SCTAB nDefTab, ScRefAddress& rStartRefAddress,
                        ScRefAddress& rEndRefAddress,
                        const ScAddress::Details& rDetails,
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index ffa9fa0ab705..dc820a73582c 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -1515,7 +1515,7 @@ bool ConvertSingleRef( const ScDocument* pDoc, const OUString& rRefString,
     return bRet;
 }
 
-bool ConvertDoubleRef( const ScDocument* pDoc, const OUString& rRefString, SCTAB nDefTab,
+bool ConvertDoubleRef( const ScDocument& rDoc, const OUString& rRefString, SCTAB nDefTab,
                        ScRefAddress& rStartRefAddress, ScRefAddress& rEndRefAddress,
                        const ScAddress::Details& rDetails,
                        ScAddress::ExternalInfo* pExtInfo /* = NULL */ )
@@ -1524,7 +1524,7 @@ bool ConvertDoubleRef( const ScDocument* pDoc, const OUString& rRefString, SCTAB
     if (pExtInfo || (ScGlobal::FindUnquoted( rRefString, SC_COMPILER_FILE_TAB_SEP) == -1))
     {
         ScRange aRange( ScAddress( 0, 0, nDefTab));
-        ScRefFlags nRes = aRange.Parse( rRefString, pDoc, rDetails, pExtInfo);
+        ScRefFlags nRes = aRange.Parse( rRefString, &rDoc, rDetails, pExtInfo);
         if ( nRes & ScRefFlags::VALID )
         {
             rStartRefAddress.Set( aRange.aStart,
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 3601881e3404..3c6dea7ce105 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8092,8 +8092,8 @@ void ScInterpreter::ScIndirect()
     OUString sRefStr = GetString().getString();
     ScRefAddress aRefAd, aRefAd2;
     ScAddress::ExternalInfo aExtInfo;
-    if ( ConvertDoubleRef(&mrDoc, sRefStr, nTab, aRefAd, aRefAd2, aDetails, &aExtInfo) ||
-         ( bTryXlA1 && ConvertDoubleRef(&mrDoc, sRefStr, nTab, aRefAd,
+    if ( ConvertDoubleRef(mrDoc, sRefStr, nTab, aRefAd, aRefAd2, aDetails, &aExtInfo) ||
+         ( bTryXlA1 && ConvertDoubleRef(mrDoc, sRefStr, nTab, aRefAd,
                                         aRefAd2, aDetailsXlA1, &aExtInfo) ) )
     {
         if (aExtInfo.mbExternal)
diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx
index 1e709a4b7100..2e5c09ac2b2f 100644
--- a/sc/source/core/tool/rangeutl.cxx
+++ b/sc/source/core/tool/rangeutl.cxx
@@ -56,7 +56,7 @@ bool ScRangeUtil::MakeArea( const OUString&   rAreaStr,
         aStrArea += ":" + rAreaStr.copy( nPointPos+1 ); // do not include '.' in copy
     }
 
-    bSuccess = ConvertDoubleRef( &rDoc, aStrArea, nTab, startPos, endPos, rDetails );
+    bSuccess = ConvertDoubleRef( rDoc, aStrArea, nTab, startPos, endPos, rDetails );
 
     if ( bSuccess )
         rArea = ScArea( startPos.Tab(),
@@ -179,7 +179,7 @@ bool ScRangeUtil::IsAbsArea( const OUString&  rAreaStr,
     ScRefAddress    startPos;
     ScRefAddress    endPos;
 
-    bool bIsAbsArea = ConvertDoubleRef( &rDoc, rAreaStr, nTab, startPos, endPos, rDetails );
+    bool bIsAbsArea = ConvertDoubleRef( rDoc, rAreaStr, nTab, startPos, endPos, rDetails );
 
     if ( bIsAbsArea )
     {
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
index 294771e955be..fa4be02ab400 100644
--- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx
+++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx
@@ -418,7 +418,7 @@ void ScPivotLayoutDialog::UpdateSourceRange()
             ScRefAddress aStart;
             ScRefAddress aEnd;
 
-            ConvertDoubleRef(&mrDocument, aSourceString, 1, aStart, aEnd, maAddressDetails);
+            ConvertDoubleRef(mrDocument, aSourceString, 1, aStart, aEnd, maAddressDetails);
             aSourceRange.aStart = aStart.GetAddress();
             aSourceRange.aEnd = aEnd.GetAddress();
         }
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index 625b9ca4b393..5fda368f1c40 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -213,7 +213,7 @@ static bool lcl_Parse( const OUString& rString, const ScDocument& rDoc, SCTAB nC
     bool bRet = false;
     const formula::FormulaGrammar::AddressConvention eConv = rDoc.GetAddressConvention();
     if ( rString.indexOf(':') != -1 )
-        bRet = ConvertDoubleRef( &rDoc, rString, nCurTab, rStart, rEnd, eConv );
+        bRet = ConvertDoubleRef( rDoc, rString, nCurTab, rStart, rEnd, eConv );
     else
     {
         bRet = ConvertSingleRef( &rDoc, rString, nCurTab, rStart, eConv );