Kaydet (Commit) b34b0ff2 authored tarafından Eike Rathke's avatar Eike Rathke

another "ScToken::GetDoubleRef: virtual dummy called"

When checking for svSingleRef or svDoubleRef, also check for
svExternalSingleRef or svExternalDoubleRef. Otherwise the dummy reference is
treated.
üst 6f0af3c2
...@@ -455,7 +455,8 @@ class SingleDoubleRefModifier ...@@ -455,7 +455,8 @@ class SingleDoubleRefModifier
public: public:
SingleDoubleRefModifier( ScToken& rT ) SingleDoubleRefModifier( ScToken& rT )
{ {
if ( rT.GetType() == formula::svSingleRef ) formula::StackVar eType = rT.GetType();
if ( eType == formula::svSingleRef || eType == formula::svExternalSingleRef )
{ {
pS = &rT.GetSingleRef(); pS = &rT.GetSingleRef();
aDub.Ref1 = aDub.Ref2 = *pS; aDub.Ref1 = aDub.Ref2 = *pS;
...@@ -490,7 +491,8 @@ public: ...@@ -490,7 +491,8 @@ public:
SingleDoubleRefProvider( const ScToken& r ) SingleDoubleRefProvider( const ScToken& r )
: Ref1( r.GetSingleRef() ), : Ref1( r.GetSingleRef() ),
Ref2( r.GetType() == formula::svDoubleRef ? Ref2( (r.GetType() == formula::svDoubleRef ||
r.GetType() == formula::svExternalDoubleRef) ?
r.GetDoubleRef().Ref2 : Ref1 ) r.GetDoubleRef().Ref2 : Ref1 )
{} {}
SingleDoubleRefProvider( const ScSingleRefData& r ) SingleDoubleRefProvider( const ScSingleRefData& r )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment