From cd3aa0771ac828a516450340d23c8228634e9966 Mon Sep 17 00:00:00 2001
From: Ocke Janssen <oj@openoffice.org>
Date: Wed, 6 Dec 2000 09:24:23 +0000
Subject: merge

---
 forms/source/component/ComboBox.cxx       | 8 ++++----
 forms/source/component/Edit.cxx           | 8 ++++----
 forms/source/component/FormattedField.cxx | 8 ++++----
 forms/source/component/ListBox.cxx        | 6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'forms/source')

diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index fd63d0e213a8..2fa8a72bef3c 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ComboBox.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-23 08:48:15 $
+ *  last change: $Author: oj $ $Date: 2000-12-06 10:19:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -209,7 +209,7 @@ OComboBoxModel::OComboBoxModel(const Reference<XMultiServiceFactory>& _rxFactory
                                     // use the old control name for compytibility reasons
                  ,m_eListSourceType(ListSourceType_TABLE)
                  ,m_bEmptyIsNull(sal_True)
-                 ,m_aNullDate(DBTypeConversion::STANDARD_DB_DATE)
+                 ,m_aNullDate(DBTypeConversion::getStandardDate())
                  ,m_nKeyType(NumberFormat::UNDEFINED)
                  ,m_nFormatKey(0)
                  ,m_nFieldType(DataType::OTHER)
@@ -754,7 +754,7 @@ void OComboBoxModel::_unloaded()
         m_nFieldType = DataType::OTHER;
         m_nFormatKey = 0;
         m_nKeyType   = NumberFormat::UNDEFINED;
-        m_aNullDate  = DBTypeConversion::STANDARD_DB_DATE;
+        m_aNullDate  = DBTypeConversion::getStandardDate();
     }
 
     // Zuruecksetzen der Inhalte (s.o)
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 96e4c24a9b7a..dc6b174b6762 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Edit.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-23 08:48:15 $
+ *  last change: $Author: oj $ $Date: 2000-12-06 10:24:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -358,8 +358,8 @@ OEditModel::OEditModel(const Reference<XMultiServiceFactory>& _rxFactory)
              :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_EDIT, FRM_CONTROL_EDIT )
                                     // use the old control name for compytibility reasons
              ,m_nMaxLen(0)
-             ,m_aNullDate(DBTypeConversion::STANDARD_DB_DATE)
              ,m_nKeyType(NumberFormat::UNDEFINED)
+             ,m_aNullDate(DBTypeConversion::getStandardDate())
              ,m_nFormatKey(0)
              ,m_nFieldType(DataType::OTHER)
              ,m_bWritingFormattedFake(sal_False)
@@ -578,7 +578,7 @@ void OEditModel::_unloaded()
         m_nFieldType = DataType::OTHER;
         m_nFormatKey = 0;
         m_nKeyType   = NumberFormat::UNDEFINED;
-        m_aNullDate  = DBTypeConversion::STANDARD_DB_DATE;
+        m_aNullDate  = DBTypeConversion::getStandardDate();
     }
 }
 
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index ff2aff0edf92..c95a1021502d 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FormattedField.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-23 08:48:15 $
+ *  last change: $Author: oj $ $Date: 2000-12-06 10:21:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -456,8 +456,8 @@ OFormattedModel::OFormattedModel(const Reference<XMultiServiceFactory>& _rxFacto
             ,m_bOriginalNumeric(sal_False)
             ,m_bNumeric(sal_False)
             ,m_xOriginalFormatter(NULL)
-            ,m_aNullDate(DBTypeConversion::STANDARD_DB_DATE)
             ,m_nKeyType(NumberFormat::UNDEFINED)
+            ,m_aNullDate(DBTypeConversion::getStandardDate())
 {
     m_nClassId = FormComponentType::TEXTFIELD;
 
@@ -858,7 +858,7 @@ void OFormattedModel::_unloaded()
     }
 
     m_nKeyType   = NumberFormat::UNDEFINED;
-    m_aNullDate  = DBTypeConversion::STANDARD_DB_DATE;
+    m_aNullDate  = DBTypeConversion::getStandardDate();
 }
 
 //------------------------------------------------------------------------------
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index c1bee7e74a0d..b62cfe2dc3af 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ListBox.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: oj $ $Date: 2000-11-23 08:48:15 $
+ *  last change: $Author: oj $ $Date: 2000-12-06 10:17:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -770,7 +770,7 @@ void OListBoxModel::loadData()
                     return;
                 }
 
-                ::com::sun::star::util::Date aNullDate(DBTypeConversion::STANDARD_DB_DATE);
+                ::com::sun::star::util::Date aNullDate(DBTypeConversion::getStandardDate());
                 sal_Int32 nFormatKey = 0;
                 sal_Int32 nFieldType = DataType::OTHER;
                 sal_Int16 nKeyType   = NumberFormat::UNDEFINED;
-- 
cgit v1.2.3