[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - wizards/com

[Julien Nabet]

 wizards/com/sun/star/wizards/db/RecordParser.java |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f46d8fd4862bd1a2872f02f132c2267d08a1526c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Tue Sep 1 07:27:05 2015 +0200

    tdf#91022: Incorrect Dates in Report created with legacy report wizard
    
    Regression from http://cgit.freedesktop.org/libreoffice/core/commit/?id=5d8ecad569fd7a254902da154ed8057ec61f3a83
    Thank you Matthew Francis for having found the root cause!
    
    Change-Id: I4128368a5f5df6a9fc5f7668fb1f8f330b5795b9
    Reviewed-on: https://gerrit.libreoffice.org/18210
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>
    (cherry picked from commit ed33646cdecac866ab480bf5770726b4a5bfa6c9)
    Reviewed-on: https://gerrit.libreoffice.org/18224
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java
index b71ae99..21be84a 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -131,12 +131,14 @@ public class RecordParser extends QueryMetaData
             case DataType.FLOAT: // ==   6;
             case DataType.REAL: // ==   7;
             case DataType.DOUBLE: // ==   8;
-            case DataType.DATE: // ==  91;
             case DataType.TIME: // ==  92;
-            case DataType.TIMESTAMP: // ==  93;
                 oAny = getColumnDoubleValue(ColIndex, false);
                 break;
 
+            case DataType.DATE: // ==  91;
+            case DataType.TIMESTAMP: // ==  93;
+                oAny = getColumnDoubleValue(ColIndex, true);
+                break;
             case DataType.CHAR: // ==   1;
             case DataType.VARCHAR: // ==  12;
             case DataType.LONGVARCHAR: // ==  -1;