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/ImageButton.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/ImageButton.cxx')
| -rw-r--r-- | forms/source/component/ImageButton.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 8dfa668350dc..1779ef480725 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ImageButton.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 @@ -139,7 +139,7 @@ void OImageButtonModel::fillProperties( Sequence< Property >& _rProps, Sequence< Property >& _rAggregateProps ) const { - FRM_BEGIN_PROP_HELPER(8) + FRM_BEGIN_PROP_HELPER(7) DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT); DECL_PROP1(BUTTONTYPE, FormButtonType, BOUND); DECL_PROP1(TARGET_URL, ::rtl::OUString, BOUND); @@ -147,7 +147,6 @@ void OImageButtonModel::fillProperties( DECL_PROP1(NAME, ::rtl::OUString, BOUND); DECL_PROP1(TAG, ::rtl::OUString, BOUND); DECL_PROP1(TABINDEX, sal_Int16, BOUND); - DECL_PROP1(HELPTEXT, ::rtl::OUString, BOUND); FRM_END_PROP_HELPER(); } @@ -175,7 +174,7 @@ void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream ::rtl::OUString sTmp(INetURLObject::decode(INetURLObject::AbsToRel(m_sTargetURL), '%', INetURLObject::DECODE_UNAMBIGUOUS)); _rxOutStream << sTmp; _rxOutStream << m_sTargetFrame; - _rxOutStream << m_aHelpText; + writeHelpTextCompatibly(_rxOutStream); } //------------------------------------------------------------------------------ @@ -209,7 +208,7 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) _rxInStream >> sTmp; m_sTargetURL = INetURLObject::RelToAbs( sTmp ); _rxInStream >> m_sTargetFrame; - _rxInStream >> m_aHelpText; + readHelpTextCompatibly(_rxInStream); } break; |