From 2f2c9944102cfff9d7640e94f4a3e8dd482326ce Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Sun, 19 Mar 2017 20:29:55 +0000
Subject: [PATCH] 60823: DGET function, correct behavior with multiple result
 entries but only one non-blank

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1787658 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/poi/ss/formula/functions/DGet.java |  14 +++++++++++---
 test-data/spreadsheet/DGet.xls                | Bin 53760 -> 54272 bytes
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/java/org/apache/poi/ss/formula/functions/DGet.java b/src/java/org/apache/poi/ss/formula/functions/DGet.java
index 0bf9cc2623..5cdc29251d 100644
--- a/src/java/org/apache/poi/ss/formula/functions/DGet.java
+++ b/src/java/org/apache/poi/ss/formula/functions/DGet.java
@@ -36,10 +36,18 @@ public final class DGet implements IDStarAlgorithm {
         {
             result = eval;
         }
-        else // There was a previous match, since there is only exactly one allowed, bail out.
+        else // There was a previous match. Only one non-blank result is allowed. #NUM! on multiple values.
         {
-            result = ErrorEval.NUM_ERROR;
-            return false;
+            if(result instanceof BlankEval) {
+                result = eval;
+            }
+            else {
+                // We have a previous filled result.
+                if(!(eval instanceof BlankEval)) {
+                    result = ErrorEval.NUM_ERROR;
+                    return false;
+                }
+            }
         }
 
         return true;
diff --git a/test-data/spreadsheet/DGet.xls b/test-data/spreadsheet/DGet.xls
index 729e974e4dfd4bf2e06b10c620cbb17b4b6bf719..49514d20f5651aba79c83feb6511d6128e24bf46 100644
GIT binary patch
delta 1064
zcmZ`%T}u>U7(MUIe(O3*nJq2FEMx^~X;cV-X;c!mk|KSWR(?z>t@}BvS%DUL6_NTv
zS3(5_QH&A;b(6K1-DwaMUUU&%)gP!Rr{|rWwup6>d3m05&U4<g4>K_*Pdt{V>e%3P
zeZ(~Y;91)OGcBev7UHTLUE>V%yzD2g&K2gL<ejX7wBbM_rWjdBs30P0gH?RcRa>C>
zyvy%Y%XYP5YkoR>C2w>Gi6_gze!P?%BjLOEukVyw_zI1`s4?HU5ANAeeTF9BMZ4D1
zug0`Vlw<cfzN6u(7nKom%bP0=_t$s1fDY}7z6*%u;`&f3uBpR4df(tsVnEF#N3%6*
zZ%$W}iTD^Dnwm%^YPI2%J{DbjpeG(zZH+m0LJxWloCRKVa)0-%dAGA)sv4nKv5P>2
zitl%Tg$F>VVfwp|y4i?%vX?h&A=HS)0Zf5U3L#D9|5&C3mMwwlC9s^pOm*%WW0pDl
zXuvz3LI8(wgYaKerBH^$xLNFii2cJUPUk^AC1X%XCmzcJ`oOFRs#D03O&K=I=on2>
zn?{g+&0pb_yl{3dZc5YFp<uCs#tW@X?JFKIqT^|zkKq<EO!APh496W!5Un;|m{6#j
zB$bGhvEvBKRyz*GTP+<&$t!t^<Cc6hBnA{F>@pAmUXvZ)Zfx0>DP|~;BEzDSRV-V<
zRv~RRHnj;smfrSa<ZLmrZsQ`P_$zu57fU)~hZlH`@D{vB9s0_FIo@wXTOQ&G@l6P$
zQCf%Ro^JAJqE|d(@3(y+dhOOZ0@zH9oTE+9b!18v<8O?8GxHxj6Q3jPqxZ~@^CPP7
w6!EK;W$~`1u<!hz=K4~YUE<SAmuHs0NnZ^9WBDpO&2w+Z%P)uvLgD~^1ANHaApigX

delta 588
zcmZ{gO-NKx7>3_-&%N_=o53NS>1IfGz=fcJMT9|(8Hj}aU_r%{Mx$men;Bb_kO(e=
zv2W9&C}jw7!fPC;jgs4T{*;13K^wuHyNG7S?@WV1<UO3jci!jy-gE95otC3{nQIk8
z6UUF3_W-=_@q{W1SBL}T%J@F3LyI!Vtkrbrhin!$dmTH0oZtupHiLLYjM07b*dI)@
zX0Tc<RjQ4O=XaIYQNju{=Sce$=8bBQ&OP}zH)rWw?FsIA)EBG$MD+6w?tmXx2k#EJ
zmj=fX!fKM5+6w-BZHUtr)JEIuTJ`l}Hf(*r3EWbblS0O_+_ZBC_%sZ>dIns3!>B-4
zk}s9$n=wUJy-QKY*#KJfuK}V40V9HkT>h)2|D$EJrt<kGLX?#IcF6D7oi%8ry4m>Y
zG<>*#DOM~afHdE}8;3*@HZn{)@v%xWOuG2&b+lm721cmgiywY~Ce$Ng9K;7-H#^Vq
z)L#cpdeP{4H1Ihx1<8^?iieaG={-u@UW|&~rVnSvUaW=Hx4B1dpj0lG^#juFWv8;?
nCjpHtJ3&o~JWCTj{m)l^8e0YWwenb8r{UG7p+0sYq8DHnAT*0P

-- 
2.39.5