Make ScToken::GetSingleRef etc. return * instead of &

...so that default implementations can return nullptr without further ado

Change-Id: Idc8778fe868efa00b1de597a54aa07a2e6fa3bc0

6 files changed, 14 insertions, 14 deletions

diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index 11a29a22c8de..b64285a932ec 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -922,7 +922,7 @@ sal_uInt16 XclExpChSourceLink::ConvertDataSequence( Reference< XDataSequence > x
             case ::formula::svExternalDoubleRef:
             {
                 // split 3-dimensional ranges into single sheets
-                const ScComplexRefData& rComplexRef = static_cast< const ScToken* >( pToken )->GetDoubleRef();
+                const ScComplexRefData& rComplexRef = *static_cast< const ScToken* >( pToken )->GetDoubleRef();
                 ScAddress aAbs1 = rComplexRef.Ref1.toAbs(ScAddress());
                 ScAddress aAbs2 = rComplexRef.Ref2.toAbs(ScAddress());
                 for (SCsTAB nScTab = aAbs1.Tab(); nScTab <= aAbs2.Tab(); ++nScTab)
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 1cd20563001e..a64a6354bea3 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1901,7 +1901,7 @@ void XclExpFmlaCompImpl::ProcessCellRef( const XclExpScToken& rTokData )
 {
     // get the Excel address components, adjust internal data in aRefData
     bool bNatLangRef = (meBiff == EXC_BIFF8) && mxData->mpScBasePos && (rTokData.GetOpCode() == ocColRowName);
-    ScSingleRefData aRefData = static_cast< const ScToken* >( rTokData.mpScToken )->GetSingleRef();
+    ScSingleRefData aRefData = *static_cast< const ScToken* >( rTokData.mpScToken )->GetSingleRef();
     XclAddress aXclPos( ScAddress::UNINITIALIZED );
     ConvertRefData( aRefData, aXclPos, bNatLangRef, false, false );
 
@@ -1958,7 +1958,7 @@ void XclExpFmlaCompImpl::ProcessCellRef( const XclExpScToken& rTokData )
 void XclExpFmlaCompImpl::ProcessRangeRef( const XclExpScToken& rTokData )
 {
     // get the Excel address components, adjust internal data in aRefData
-    ScComplexRefData aRefData = static_cast< const ScToken* >( rTokData.mpScToken )->GetDoubleRef();
+    ScComplexRefData aRefData = *static_cast< const ScToken* >( rTokData.mpScToken )->GetDoubleRef();
     XclRange aXclRange( ScAddress::UNINITIALIZED );
     ConvertRefData( aRefData, aXclRange, false );
 
@@ -2005,7 +2005,7 @@ void XclExpFmlaCompImpl::ProcessExternalCellRef( const XclExpScToken& rTokData )
     if( mxData->mpLinkMgr )
     {
         // get the Excel address components, adjust internal data in aRefData
-        ScSingleRefData aRefData = static_cast< const ScToken* >( rTokData.mpScToken )->GetSingleRef();
+        ScSingleRefData aRefData = *static_cast< const ScToken* >( rTokData.mpScToken )->GetSingleRef();
         XclAddress aXclPos( ScAddress::UNINITIALIZED );
         ConvertRefData( aRefData, aXclPos, false, false, false );
 
@@ -2041,7 +2041,7 @@ void XclExpFmlaCompImpl::ProcessExternalRangeRef( const XclExpScToken& rTokData
     if( mxData->mpLinkMgr )
     {
         // get the Excel address components, adjust internal data in aRefData
-        ScComplexRefData aRefData = static_cast< const ScToken* >( rTokData.mpScToken )->GetDoubleRef();
+        ScComplexRefData aRefData = *static_cast< const ScToken* >( rTokData.mpScToken )->GetDoubleRef();
         XclRange aXclRange( ScAddress::UNINITIALIZED );
         ConvertRefData( aRefData, aXclRange, false );
 
@@ -2127,14 +2127,14 @@ void XclExpFmlaCompImpl::ProcessExternalName( const XclExpScToken& rTokData )
                         {
                             case svExternalSingleRef:
                             {
-                                ScSingleRefData aRefData = static_cast< ScToken* >( pScToken )->GetSingleRef();
+                                ScSingleRefData aRefData = *static_cast< ScToken* >( pScToken )->GetSingleRef();
                                 mxData->mpLinkMgr->StoreCell(
                                     nFileId, pScToken->GetString().getString(), aRefData.toAbs(*mxData->mpScBasePos));
                             }
                             break;
                             case svExternalDoubleRef:
                             {
-                                ScComplexRefData aRefData = static_cast< ScToken* >( pScToken )->GetDoubleRef();
+                                ScComplexRefData aRefData = *static_cast< ScToken* >( pScToken )->GetDoubleRef();
                                 mxData->mpLinkMgr->StoreCellRange(
                                     nFileId, pScToken->GetString().getString(), aRefData.toAbs(*mxData->mpScBasePos));
                             }
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 7e7786d063ff..e9ff858420ad 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -977,7 +977,7 @@ void XclExpExtName::WriteAddData( XclExpStream& rStrm )
         {
             case svExternalSingleRef:
             {
-                const ScSingleRefData& rRef = p->GetSingleRef();
+                const ScSingleRefData& rRef = *p->GetSingleRef();
                 if (rRef.IsTabRel())
                     break;
 
@@ -1001,7 +1001,7 @@ void XclExpExtName::WriteAddData( XclExpStream& rStrm )
             }
             case svExternalDoubleRef:
             {
-                const ScComplexRefData& rRef = p->GetDoubleRef();
+                const ScComplexRefData& rRef = *p->GetDoubleRef();
                 const ScSingleRefData& r1 = rRef.Ref1;
                 const ScSingleRefData& r2 = rRef.Ref2;
                 if (r1.IsTabRel() || r2.IsTabRel())
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index ed4b1377c0d8..f9c84583c2bd 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -156,7 +156,7 @@ XclExpArrayRef XclExpArrayBuffer::FindArray( const ScTokenArray& rScTokArr, cons
         // not a matrix reference token.
         return xRec;
 
-    const ScSingleRefData& rRef = static_cast<const ScToken*>(pToken)->GetSingleRef();
+    const ScSingleRefData& rRef = *static_cast<const ScToken*>(pToken)->GetSingleRef();
     ScAddress aAbsPos = rRef.toAbs(rBasePos);
     XclExpArrayMap::const_iterator it = maRecMap.find(aAbsPos);
 
@@ -212,7 +212,7 @@ bool XclExpShrfmlaBuffer::IsValidTokenArray( const ScTokenArray& rArray ) const
         {
             case svSingleRef:
             {
-                const ScSingleRefData& rRefData = static_cast<const ScToken*>(p)->GetSingleRef();
+                const ScSingleRefData& rRefData = *static_cast<const ScToken*>(p)->GetSingleRef();
                 if (!GetFormulaCompiler().IsRef2D(rRefData))
                     // Excel's shared formula cannot include 3D reference.
                     return false;
@@ -220,7 +220,7 @@ bool XclExpShrfmlaBuffer::IsValidTokenArray( const ScTokenArray& rArray ) const
             break;
             case svDoubleRef:
             {
-                const ScComplexRefData& rRefData = static_cast<const ScToken*>(p)->GetDoubleRef();
+                const ScComplexRefData& rRefData = *static_cast<const ScToken*>(p)->GetDoubleRef();
                 if (!GetFormulaCompiler().IsRef2D(rRefData))
                     // Excel's shared formula cannot include 3D reference.
                     return false;
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index c65e558ca946..ad0836f9d4c1 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -780,7 +780,7 @@ sal_uInt16 XclImpChSourceLink::GetCellCount() const
                 case ::formula::svExternalDoubleRef:
                 {
                     // cell range
-                    const ScComplexRefData& rComplexRef = static_cast< const ScToken* >( pToken )->GetDoubleRef();
+                    const ScComplexRefData& rComplexRef = *static_cast< const ScToken* >( pToken )->GetDoubleRef();
                     ScAddress aAbs1 = rComplexRef.Ref1.toAbs(ScAddress());
                     ScAddress aAbs2 = rComplexRef.Ref2.toAbs(ScAddress());
                     sal_uInt32 nTabs = static_cast<sal_uInt32>(aAbs2.Tab() - aAbs1.Tab() + 1);
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index abb9c2d81112..d345fa240683 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -884,7 +884,7 @@ inline bool lclGetAddress( ScAddress& rAddress, const FormulaToken& rToken, cons
     bool bIsSingleRef = (eOpCode == ocPush) && (rToken.GetType() == svSingleRef);
     if( bIsSingleRef )
     {
-        const ScSingleRefData& rRef = static_cast<const ScToken&>(rToken).GetSingleRef();
+        const ScSingleRefData& rRef = *static_cast<const ScToken&>(rToken).GetSingleRef();
         rAddress = rRef.toAbs(rPos);
         bIsSingleRef = !rRef.IsDeleted();
     }