diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 12:39:16 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-05-10 12:39:16 +0000 |
| commit | dd6fa821ef1dcd81657318be4627405e9e37b64e (patch) | |
| tree | 2f4827cde1c77251b4846883400d314f1af987b8 /forms | |
| parent | 5ef28460101bb45584d434c5f527e67559e26fdc (diff) | |
INTEGRATION: CWS dba09 (1.18.26); FILE MERGED
2004/04/27 06:10:08 fs 1.18.26.2: RESYNC: (1.18-1.19); FILE MERGED
2004/03/17 11:51:04 fs 1.18.26.1: #92831# at runtime, don't use 'stardiv.one.form.control.*' service names - translate when writing old (binary) format
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/component/Edit.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index 4be45f65bdf1..a8b63f464f01 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -2,9 +2,9 @@ * * $RCSfile: Edit.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2004-05-07 16:06:40 $ + * last change: $Author: hr $ $Date: 2004-05-10 13:39:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -644,12 +644,12 @@ void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( { Any aDefaultControl = m_xAggregateSet->getPropertyValue(PROPERTY_DEFAULTCONTROL); if ( (aDefaultControl.getValueType().getTypeClass() == TypeClass_STRING) - && (getString(aDefaultControl).compareTo(FRM_CONTROL_TEXTFIELD) == COMPARE_EQUAL) + && (getString(aDefaultControl).compareTo(STARDIV_ONE_FORM_CONTROL_TEXTFIELD) == COMPARE_EQUAL) ) { - m_xAggregateSet->setPropertyValue(PROPERTY_DEFAULTCONTROL, makeAny(::rtl::OUString(FRM_CONTROL_EDIT))); - // Older as well as current versions should understand this : the former knew only the FRM_CONTROL_EDIT, - // the latter are registered for both FRM_CONTROL_EDIT and FRM_CONTROL_TEXTFIELD. + m_xAggregateSet->setPropertyValue( PROPERTY_DEFAULTCONTROL, makeAny( (::rtl::OUString)STARDIV_ONE_FORM_CONTROL_EDIT ) ); + // Older as well as current versions should understand this : the former knew only the STARDIV_ONE_FORM_CONTROL_EDIT, + // the latter are registered for both STARDIV_ONE_FORM_CONTROL_EDIT and STARDIV_ONE_FORM_CONTROL_TEXTFIELD. } } } |