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/ImageControl.cxx | |
| parent | d0f5707a1cd086576fc8a9b364fbd9aa03ae251a (diff) | |
#85582# HelpText property now in the aggregated control models
Diffstat (limited to 'forms/source/component/ImageControl.cxx')
| -rw-r--r-- | forms/source/component/ImageControl.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 8fe6a5b278c9..482534025d9b 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ImageControl.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: fs $ $Date: 2001-03-15 08:44:22 $ + * 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 @@ -357,7 +357,7 @@ void OImageControlModel::fillProperties( Sequence< Property >& _rProps, Sequence< Property >& _rAggregateProps ) const { - FRM_BEGIN_PROP_HELPER(9) + FRM_BEGIN_PROP_HELPER(8) // ModifyPropertyAttributes(_rAggregateProps, PROPERTY_IMAGE_URL, PropertyAttribute::TRANSIENT, 0); DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT); @@ -365,7 +365,6 @@ void OImageControlModel::fillProperties( DECL_PROP1(NAME, ::rtl::OUString, BOUND); DECL_PROP1(TAG, ::rtl::OUString, 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); @@ -393,7 +392,7 @@ void OImageControlModel::write(const Reference<XObjectOutputStream>& _rxOutStrea _rxOutStream->writeShort(0x0003); // Name _rxOutStream->writeBoolean(m_bReadOnly); - _rxOutStream << m_aHelpText; + writeHelpTextCompatibly(_rxOutStream); // from version 0x0003 : common properties writeCommonProperties(_rxOutStream); } @@ -412,11 +411,11 @@ void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream) break; case 0x0002: m_bReadOnly = _rxInStream->readBoolean(); - _rxInStream >> m_aHelpText; + readHelpTextCompatibly(_rxInStream); break; case 0x0003: m_bReadOnly = _rxInStream->readBoolean(); - _rxInStream >> m_aHelpText; + readHelpTextCompatibly(_rxInStream); readCommonProperties(_rxInStream); break; default : |