[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
Kohei Yoshida
kohei at kemper.freedesktop.org
Wed Dec 7 15:01:13 PST 2011
sc/source/core/tool/interpr1.cxx | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 885b66496c5fdf09aa2402c9e2ec18d46933e5b9
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date: Wed Dec 7 17:56:33 2011 -0500
fdo#43534: Reset tab index for SingleRefToVars() call.
Otherwise that method will set #REF! to the cell when it sees the tab
index being -1. We don't use that index in that code, so it's safe to
do this.
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 2dd5d7a..6f552b7 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2306,7 +2306,13 @@ void ScInterpreter::ScCellExternal()
SCCOL nCol;
SCROW nRow;
SCTAB nTab;
+ aRef.nTab = 0; // -1 for external ref. Plus we don't use this.
SingleRefToVars(aRef, nCol, nRow, nTab);
+ if (nGlobalError)
+ {
+ PushIllegalParameter();
+ return;
+ }
ScCellKeywordTranslator::transKeyword(aInfoType, ScGlobal::GetLocale(), ocCell);
More information about the Libreoffice-commits
mailing list