summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2017-05-19 22:13:28 +0200
committerEike Rathke <erack@redhat.com>2017-05-22 11:00:56 +0200
commitb45a7ed1e687f7c54f16f6ab65b85ab3d945af68 (patch)
treec755d1b9478171a3e52e15d89784c9d20bfec966
parent27caf863d4dc06dd8cc09f5e4836d40f59ee9faf (diff)
Do not force return value to double in SUBTOTAL and AGGREGATE, tdf#58874
Change-Id: I305adfb97022f353dde6aab4e234faff0fdfb904
-rw-r--r--sc/source/core/tool/interpr1.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 3cca0b101f15..7417e54b8ca3 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6725,9 +6725,9 @@ void ScInterpreter::ScSubTotal()
}
mnSubTotalFlags = SubtotalFlags::NONE;
// Get rid of the 1st (fished) parameter.
- double nVal = GetDouble();
+ FormulaConstTokenRef xRef( PopToken());
Pop();
- PushDouble( nVal );
+ PushTokenRef( xRef);
}
}
@@ -6806,11 +6806,11 @@ void ScInterpreter::ScAggregate()
}
mnSubTotalFlags = SubtotalFlags::NONE;
}
- double nVal = GetDouble();
+ FormulaConstTokenRef xRef( PopToken());
// Get rid of the 1st and 2nd (fished) parameters.
Pop();
Pop();
- PushDouble( nVal );
+ PushTokenRef( xRef);
}
}