From c438465b08ccb9905981969af52872ead8de8d28 Mon Sep 17 00:00:00 2001 From: Yegor Kozlov Date: Sat, 9 Feb 2019 13:00:09 +0000 Subject: [PATCH] Bug 62980: Make D* functions ignore case in headings git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1853268 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/ss/formula/functions/DStarRunner.java | 3 ++- test-data/spreadsheet/DGet.xls | Bin 54272 -> 54784 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java b/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java index a1f92e781c..b55ba808b0 100644 --- a/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java +++ b/src/java/org/apache/poi/ss/formula/functions/DStarRunner.java @@ -164,6 +164,7 @@ public final class DStarRunner implements Function3Arg { /** * For a given database returns the column number for a column heading. + * Comparison is case-insensitive. * * @param db Database. * @param name Column heading. @@ -183,7 +184,7 @@ public final class DStarRunner implements Function3Arg { continue; } String columnName = OperandResolver.coerceValueToString(columnNameValueEval); - if(name.equals(columnName)) { + if(name.equalsIgnoreCase(columnName)) { resultColumn = column; break; } diff --git a/test-data/spreadsheet/DGet.xls b/test-data/spreadsheet/DGet.xls index 49514d20f5651aba79c83feb6511d6128e24bf46..b75120cbb02d5d4ed2a360fb48b7d397aee5ab4d 100644 GIT binary patch delta 2710 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