summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-05-02 19:52:23 +0200
committerEike Rathke <erack@redhat.com>2016-05-02 19:56:07 +0200
commit8474c5f14966c9268f92499870feb3c3d21658b3 (patch)
tree1f305ab0f16c8a6587e81f245045bed44d4985ee /sc
parent4f5c97849b8d4aa4a6698e9528e39570a6d47a7a (diff)
silence ScTableRefToken::GetSheet() SAL_WARN about unhandled
Change-Id: I539bad573bfc459103acc0cb0227bad7681b79aa
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/formulacell.cxx14
1 files changed, 13 insertions, 1 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 57a7e647043c..fefde27b1269 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3908,8 +3908,20 @@ ScFormulaCell::CompareState ScFormulaCell::CompareByTokenArray( ScFormulaCell& r
// different OpCode values.
case formula::svIndex:
{
- if (pThisTok->GetIndex() != pOtherTok->GetIndex() || pThisTok->GetSheet() != pOtherTok->GetSheet())
+ if (pThisTok->GetIndex() != pOtherTok->GetIndex())
return NotEqual;
+ switch (pThisTok->GetOpCode())
+ {
+ case ocTableRef:
+ // nothing, sheet value assumed as -1, silence
+ // ScTableRefToken::GetSheet() SAL_WARN about
+ // unhandled
+ ;
+ break;
+ default: // ocName, ocDBArea
+ if (pThisTok->GetSheet() != pOtherTok->GetSheet())
+ return NotEqual;
+ }
}
break;
default: