From dce73f2fb56d123f19d01c93e2582ce36310add3 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Thu, 13 Jul 2006 14:18:17 +0000
Subject: INTEGRATION: CWS dba204a (1.20.32); FILE MERGED 2006/07/05 07:53:16
 oj 1.20.32.2: RESYNC: (1.20-1.21); FILE MERGED 2006/06/02 14:16:29 fs
 1.20.32.1: #i6544# no 'today' / 'now' default value

---
 forms/source/component/Date.cxx | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'forms')

diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 9375de236be0..655435afed60 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: Date.cxx,v $
  *
- *  $Revision: 1.21 $
+ *  $Revision: 1.22 $
  *
- *  last change: $Author: hr $ $Date: 2006-06-19 12:47:22 $
+ *  last change: $Author: obo $ $Date: 2006-07-13 15:18:17 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -381,16 +381,7 @@ Any ODateModel::translateDbColumnToControlValue()
 //------------------------------------------------------------------------------
 Any ODateModel::getDefaultForReset() const
 {
-    Any aValue;
-    if (m_aDefault.getValueType().getTypeClass() == TypeClass_LONG)
-        aValue = m_aDefault;
-    else
-    {   // aktuelles Datum einstellen
-        ::Date aCurrentDate;
-        aValue <<= (sal_Int32)aCurrentDate.GetDate();
-    }
-
-    return aValue;
+    return m_aDefault;
 }
 
 //------------------------------------------------------------------------------
-- 
cgit v1.2.3