diff options
| author | Frank Schönheit <fs@openoffice.org> | 2001-04-02 09:28:06 +0000 |
|---|---|---|
| committer | Frank Schönheit <fs@openoffice.org> | 2001-04-02 09:28:06 +0000 |
| commit | fb3f0c63ca7ad405321339af696b0f9fa78c3e74 (patch) | |
| tree | 51cdeed9530b7df646e9c9d95309f452bd6ccc6d /forms/source/component/CheckBox.cxx | |
| parent | Merge SRC627: 03/31/01 - 09:12:13 (NoBranch) (diff) | |
| download | core-fb3f0c63ca7ad405321339af696b0f9fa78c3e74.tar.gz core-fb3f0c63ca7ad405321339af696b0f9fa78c3e74.zip | |
#85582# HelpText property now in the aggregated control models
Diffstat (limited to 'forms/source/component/CheckBox.cxx')
| -rw-r--r-- | forms/source/component/CheckBox.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx index 984f506fa0e9..50b7d49238d4 100644 --- a/forms/source/component/CheckBox.cxx +++ b/forms/source/component/CheckBox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: CheckBox.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: oj $ $Date: 2000-11-23 08:48:15 $ + * last change: $Author: fs $ $Date: 2001-04-02 10:28:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -260,7 +260,7 @@ void OCheckBoxModel::fillProperties( Sequence< Property >& _rProps, Sequence< Property >& _rAggregateProps ) const { - FRM_BEGIN_PROP_HELPER(11) + FRM_BEGIN_PROP_HELPER(10) // the "State" property is transient, so change this // ModifyPropertyAttributes(_rAggregateProps, PROPERTY_STATE, PropertyAttribute::TRANSIENT, 0); @@ -271,7 +271,6 @@ void OCheckBoxModel::fillProperties( DECL_PROP1(TAG, rtl::OUString, BOUND); DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP1(CONTROLSOURCE, rtl::OUString, BOUND); - DECL_PROP1(HELPTEXT, rtl::OUString, BOUND); DECL_IFACE_PROP2(BOUNDFIELD, XPropertySet, READONLY, TRANSIENT); DECL_IFACE_PROP2(CONTROLLABEL, XPropertySet, BOUND, MAYBEVOID); DECL_PROP2(CONTROLSOURCEPROPERTY, rtl::OUString, READONLY, TRANSIENT); @@ -295,7 +294,7 @@ void SAL_CALL OCheckBoxModel::write(const Reference<stario::XObjectOutputStream> // Properties _rxOutStream << m_sReferenceValue; _rxOutStream << (sal_Int16)m_nDefaultChecked; - _rxOutStream << m_aHelpText; + writeHelpTextCompatibly(_rxOutStream); // from version 0x0003 : common properties writeCommonProperties(_rxOutStream); } @@ -315,12 +314,12 @@ void SAL_CALL OCheckBoxModel::read(const Reference<stario::XObjectInputStream>& case 0x0002 : _rxInStream >> m_sReferenceValue; _rxInStream >> (sal_Int16)m_nDefaultChecked; - _rxInStream >> m_aHelpText; + readHelpTextCompatibly(_rxInStream); break; case 0x0003 : _rxInStream >> m_sReferenceValue; _rxInStream >> (sal_Int16)m_nDefaultChecked; - _rxInStream >> m_aHelpText; + readHelpTextCompatibly(_rxInStream); readCommonProperties(_rxInStream); break; default : |