strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge

Browse source
This commit is contained in:
Ocke Janssen 2000-12-06 09:24:23 +00:00
parent 931f941cc9
commit cd3aa0771a
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
forms/source/component/ComboBox.cxx
View file

@ -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)

8
forms/source/component/Edit.cxx
View file

@ -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();
}
}

8
forms/source/component/FormattedField.cxx
View file

@ -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();
}
//------------------------------------------------------------------------------

6
forms/source/component/ListBox.cxx
View file

@ -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;