sc/source/core/tool/compiler.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 2883078230239b935e750e5f5b3ce7e174a4fabb
Author: Eike Rathke <er...@redhat.com>
Date: Mon Jan 21 17:56:25 2013 +0100
resolved fdo#59583 prevent inappropriate column/row label detection
If followed by '(' (with or without space inbetween) an identifier can
not be a column/row label. Prevent arbitrary content detection in case a
macro function of the same name is meant (fdo#59583) or if it wouldn't
resolve to a known function name at all, that earlier resulted in #REF!
instead of #NAME? in the case of unknown function but label found.
(cherry picked from commit aa2b8bde171bf9562536dc14b2cf81d81e31b438)
Change-Id: Ib86687bdecfcf5897f4700086fc9969cc3fab0f0
Reviewed-on: https://gerrit.libreoffice.org/1796
Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index b6183ba..74c2be9 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3687,7 +3687,9 @@ bool ScCompiler::NextNewToken( bool bInArray )
return true;
if (IsDBRange( aUpper ))
return true;
- if (IsColRowName( aUpper ))
+ // If followed by '(' (with or without space inbetween) it can not be a
+ // column/row label. Prevent arbitrary content detection.
+ if (!bMayBeFuncName && IsColRowName( aUpper ))
return true;
if (bMayBeFuncName && IsMacro( aUpper ))
return true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
