sc/inc/token.hxx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit b34b0ff236618ec026e96c8bc90c6354a51c8045
Author: Eike Rathke <er...@redhat.com>
Date: Tue Dec 20 15:59:34 2011 +0100
another "ScToken::GetDoubleRef: virtual dummy called"
When checking for svSingleRef or svDoubleRef, also check for
svExternalSingleRef or svExternalDoubleRef. Otherwise the dummy reference is
treated.
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index 90c9dfb..fc65823 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -455,7 +455,8 @@ class SingleDoubleRefModifier
public:
SingleDoubleRefModifier( ScToken& rT )
{
- if ( rT.GetType() == formula::svSingleRef )
+ formula::StackVar eType = rT.GetType();
+ if ( eType == formula::svSingleRef || eType ==
formula::svExternalSingleRef )
{
pS = &rT.GetSingleRef();
aDub.Ref1 = aDub.Ref2 = *pS;
@@ -490,8 +491,9 @@ public:
SingleDoubleRefProvider( const ScToken& r )
: Ref1( r.GetSingleRef() ),
- Ref2( r.GetType() == formula::svDoubleRef ?
- r.GetDoubleRef().Ref2 : Ref1 )
+ Ref2( (r.GetType() == formula::svDoubleRef ||
+ r.GetType() ==
formula::svExternalDoubleRef) ?
+ r.GetDoubleRef().Ref2 : Ref1 )
{}
SingleDoubleRefProvider( const ScSingleRefData& r )
: Ref1( r ), Ref2( r )
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
