undo last change due to broken test

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1911233 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/poi/src/main/java/org/apache/poi/ss/format/CellElapsedFormatter.java b/poi/src/main/java/org/apache/poi/ss/format/CellElapsedFormatter.java
index 93fc537d12443bb4d8f0a25c4177ac3fc37bf3df..43069d2eabe61c0d0c959928879a1181beff31fd 100644 (file)
--- a/poi/src/main/java/org/apache/poi/ss/format/CellElapsedFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/format/CellElapsedFormatter.java
@@ -59,7 +59,7 @@ public class CellElapsedFormatter extends CellFormatter {
                 val = elapsed / factor;
             else
                 val = elapsed / factor % modBy;
-            if (type == '0' || type == 's')
+            if (type == '0')
                 return Math.round(val);
             else
                 return (long) val;

diff --git a/test-data/spreadsheet/ElapsedFormatTests.xlsx b/test-data/spreadsheet/ElapsedFormatTests.xlsx
index eacc071a41343d0a0cfa3f29ed6ddcc993837b7f..95a093e8d4655440dba1c384fb12542587ecf7cd 100644 (file)
Binary files a/test-data/spreadsheet/ElapsedFormatTests.xlsx and b/test-data/spreadsheet/ElapsedFormatTests.xlsx differ