summaryrefslogtreecommitdiff
path: root/forms/source/component
diff options
context:
space:
mode:
Diffstat (limited to 'forms/source/component')
-rw-r--r--forms/source/component/Button.cxx11
-rw-r--r--forms/source/component/CheckBox.cxx13
-rw-r--r--forms/source/component/ComboBox.cxx15
-rw-r--r--forms/source/component/Currency.cxx7
-rw-r--r--forms/source/component/Date.cxx7
-rw-r--r--forms/source/component/Edit.cxx7
-rw-r--r--forms/source/component/EditBase.cxx8
-rw-r--r--forms/source/component/File.cxx11
-rw-r--r--forms/source/component/FixedText.cxx11
-rw-r--r--forms/source/component/FormComponent.cxx54
-rw-r--r--forms/source/component/FormattedField.cxx7
-rw-r--r--forms/source/component/Grid.cxx8
-rw-r--r--forms/source/component/Grid.hxx5
-rw-r--r--forms/source/component/GroupBox.cxx11
-rw-r--r--forms/source/component/ImageButton.cxx11
-rw-r--r--forms/source/component/ImageControl.cxx13
-rw-r--r--forms/source/component/ListBox.cxx11
-rw-r--r--forms/source/component/Numeric.cxx7
-rw-r--r--forms/source/component/Pattern.cxx7
-rw-r--r--forms/source/component/RadioButton.cxx13
-rw-r--r--forms/source/component/Time.cxx7
21 files changed, 125 insertions, 119 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index ca7ad0b98898..924aa0848fce 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Button.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
@@ -126,7 +126,7 @@ void OButtonModel::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);
@@ -134,7 +134,6 @@ void OButtonModel::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();
}
@@ -173,7 +172,7 @@ void OButtonModel::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);
}
//------------------------------------------------------------------------------
@@ -202,7 +201,7 @@ void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream)
_rxInStream >> sTmp;
m_sTargetURL = INetURLObject::RelToAbs( sTmp );
_rxInStream >> m_sTargetFrame;
- _rxInStream >> m_aHelpText;
+ readHelpTextCompatibly(_rxInStream);
}
break;
default :
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 :
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 4bb467c11c61..d544c2f999c2 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ComboBox.cxx,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: fs $ $Date: 2001-02-27 17:03:58 $
+ * 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
@@ -344,7 +344,7 @@ void OComboBoxModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
{
- FRM_BEGIN_PROP_HELPER(13)
+ FRM_BEGIN_PROP_HELPER(12)
// Text auf transient setzen
ModifyPropertyAttributes(_rAggregateProps, PROPERTY_TEXT, PropertyAttribute::TRANSIENT, 0);
@@ -357,9 +357,8 @@ void OComboBoxModel::fillProperties(
DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND);
DECL_PROP1(DEFAULT_TEXT, ::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_IFACE_PROP2(BOUNDFIELD, XPropertySet, READONLY, TRANSIENT);
+ DECL_IFACE_PROP2(CONTROLLABEL, XPropertySet, BOUND, MAYBEVOID);
DECL_PROP2(CONTROLSOURCEPROPERTY, rtl::OUString, READONLY, TRANSIENT);
FRM_END_PROP_HELPER();
}
@@ -402,7 +401,7 @@ void SAL_CALL OComboBoxModel::write(const Reference<stario::XObjectOutputStream>
_rxOutStream << (sal_Bool)m_bEmptyIsNull;
_rxOutStream << m_aDefaultText;
- _rxOutStream << m_aHelpText;
+ writeHelpTextCompatibly(_rxOutStream);
// from version 0x0006 : common properties
writeCommonProperties(_rxOutStream);
@@ -481,7 +480,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>&
}
if (nVersion > 0x0004)
- _rxInStream >> m_aHelpText;
+ readHelpTextCompatibly(_rxInStream);
if (nVersion > 0x0005)
readCommonProperties(_rxInStream);
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index e4d3cc5fb198..8f55ba6c099a 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Currency.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
@@ -214,7 +214,7 @@ void OCurrencyModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
{
- FRM_BEGIN_PROP_HELPER(10)
+ FRM_BEGIN_PROP_HELPER(9)
// Value auf transient setzen
// ModifyPropertyAttributes(_rAggregateProps, PROPERTY_VALUE, PropertyAttribute::TRANSIENT, 0);
@@ -224,7 +224,6 @@ void OCurrencyModel::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);
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 61c10caff6e2..ccce79e5bc78 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Date.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: fs $ $Date: 2001-01-04 16:27:28 $
+ * 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
@@ -183,7 +183,7 @@ void ODateModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
{
- FRM_BEGIN_PROP_HELPER(10)
+ FRM_BEGIN_PROP_HELPER(9)
// Date auf transient setzen
// ModifyPropertyAttributes(_rAggregateProps, PROPERTY_DATE, PropertyAttribute::TRANSIENT, 0);
@@ -193,7 +193,6 @@ void ODateModel::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);
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 3611a63045e2..e729ee9600c0 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Edit.cxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: jl $ $Date: 2001-03-22 16:48:06 $
+ * 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
@@ -425,7 +425,7 @@ void OEditModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
{
- FRM_BEGIN_PROP_HELPER(12)
+ FRM_BEGIN_PROP_HELPER(11)
// Text auf transient setzen
// ModifyPropertyAttributes(_rAggregateProps, PROPERTY_TEXT, PropertyAttribute::TRANSIENT, 0);
@@ -436,7 +436,6 @@ void OEditModel::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_BOOL_PROP2(FILTERPROPOSAL, BOUND, MAYBEDEFAULT);
DECL_IFACE_PROP2(CONTROLLABEL, XPropertySet,BOUND, MAYBEVOID);
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index ca21734d2986..3981d4a8ee92 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: EditBase.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
@@ -153,7 +153,7 @@ void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
_rxOutStream->writeDouble(getDouble(m_aDefault));
// since version 5 we write the help text
- _rxOutStream << m_aHelpText;
+ writeHelpTextCompatibly(_rxOutStream);
// (that's potentially bad : at the time I added the above line we had two derived classes : OEditModel and
// OFormattedModel. The first one does not have an own version handling, so it can't write the help text itself,
// the second one does it's own writing (reading) after calling our method, so normally we shouldn't write any
@@ -211,7 +211,7 @@ void OEditBaseModel::read(const Reference<XObjectInputStream>& _rxInStream)
}
if (nVersion > 4)
- _rxInStream >> m_aHelpText;
+ readHelpTextCompatibly(_rxInStream);
if (bHandleCommonProps)
readCommonEditProperties(_rxInStream);
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 4dc4ac2c8c59..9e4abcda62e8 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: File.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * 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
@@ -223,13 +223,12 @@ void OFileControlModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
{
- FRM_BEGIN_PROP_HELPER(6)
+ FRM_BEGIN_PROP_HELPER(5)
DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT);
DECL_PROP1(DEFAULT_TEXT, ::rtl::OUString, BOUND);
DECL_PROP1(NAME, ::rtl::OUString, BOUND);
DECL_PROP1(TAG, ::rtl::OUString, BOUND);
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
- DECL_PROP1(HELPTEXT, ::rtl::OUString, BOUND);
// in den agregierten Properties muss ich noch PROPERTY_ID_TEXT auf transient setzen ...
// ModifyPropertyAttributes(_rAggregateProps, PROPERTY_TEXT, PropertyAttribute::TRANSIENT, 0);
@@ -259,7 +258,7 @@ void OFileControlModel::write(const Reference<stario::XObjectOutputStream>& _rxO
_rxOutStream->writeShort(0x0002);
// Default-Wert
_rxOutStream << m_sDefaultValue;
- _rxOutStream << m_aHelpText;
+ writeHelpTextCompatibly(_rxOutStream);
}
//------------------------------------------------------------------------------
@@ -277,7 +276,7 @@ void OFileControlModel::read(const Reference<stario::XObjectInputStream>& _rxInS
_rxInStream >> m_sDefaultValue; break;
case 2:
_rxInStream >> m_sDefaultValue;
- _rxInStream >> m_aHelpText;
+ readHelpTextCompatibly(_rxInStream);
break;
default:
DBG_ERROR("OFileControlModel::read : unknown version !");
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index de8240b95d3f..b3335da3717f 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FixedText.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
@@ -141,13 +141,12 @@ void OFixedTextModel::fillProperties(
Sequence< starbeans::Property >& _rProps,
Sequence< starbeans::Property >& _rAggregateProps ) const
{
- FRM_BEGIN_PROP_HELPER(4)
+ FRM_BEGIN_PROP_HELPER(3)
RemoveProperty(_rAggregateProps, PROPERTY_TABSTOP);
DECL_PROP1(NAME, rtl::OUString, BOUND);
DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT);
DECL_PROP1(TAG, rtl::OUString, BOUND);
- DECL_PROP1(HELPTEXT,rtl::OUString, BOUND);
FRM_END_PROP_HELPER();
}
@@ -165,7 +164,7 @@ void SAL_CALL OFixedTextModel::write(const Reference<XObjectOutputStream>& _rxOu
// Version
_rxOutStream->writeShort(0x0002);
- _rxOutStream << m_aHelpText;
+ writeHelpTextCompatibly(_rxOutStream);
}
//------------------------------------------------------------------------------
@@ -176,7 +175,7 @@ void SAL_CALL OFixedTextModel::read(const Reference<XObjectInputStream>& _rxInSt
// Version
sal_Int16 nVersion = _rxInStream->readShort();
if (nVersion > 1)
- _rxInStream >> m_aHelpText;
+ readHelpTextCompatibly(_rxInStream);
}
//.........................................................................
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 765dda7f4b4e..dfa7e987519a 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FormComponent.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: fs $ $Date: 2001-03-13 10:34:43 $
+ * 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
@@ -106,8 +106,6 @@
#include "services.hxx"
#endif
-using namespace dbtools;
-
//... namespace frm .......................................................
namespace frm
{
@@ -123,6 +121,9 @@ using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
+using namespace ::dbtools;
+using namespace ::comphelper;
+
//=========================================================================
//= base class for form layer controls
//=========================================================================
@@ -455,6 +456,38 @@ Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeE
return aReturn;
}
+//------------------------------------------------------------------------------
+void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XObjectInputStream >& _rxInStream)
+{
+ ::rtl::OUString sHelpText;
+ _rxInStream >> sHelpText;
+ try
+ {
+ if (m_xAggregateSet.is())
+ m_xAggregateSet->setPropertyValue(PROPERTY_HELPTEXT, makeAny(sHelpText));
+ }
+ catch(const Exception&)
+ {
+ OSL_ENSURE(sal_False, "OControlModel::readHelpTextCompatibly: could not forward the property value to the aggregate!");
+ }
+}
+
+//------------------------------------------------------------------------------
+void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XObjectOutputStream >& _rxOutStream)
+{
+ ::rtl::OUString sHelpText;
+ try
+ {
+ if (m_xAggregateSet.is())
+ m_xAggregateSet->getPropertyValue(PROPERTY_HELPTEXT) >>= sHelpText;
+ }
+ catch(const Exception&)
+ {
+ OSL_ENSURE(sal_False, "OControlModel::writeHelpTextCompatibly: could not retrieve the property value from the aggregate!");
+ }
+ _rxOutStream << sHelpText;
+}
+
//------------------------------------------------------------------
OControlModel::OControlModel(
const Reference<com::sun::star::lang::XMultiServiceFactory>& _rxFactory,
@@ -669,7 +702,7 @@ void OControlModel::read(const Reference<stario::XObjectInputStream>& InStream)
// we had a version where we wrote the help text
if (nVersion == 0x0004)
- InStream >> m_aHelpText;
+ readHelpTextCompatibly(InStream);
DBG_ASSERT(nVersion < 5, "OControlModel::read : suspicious version number !");
// 4 was the version where we wrote the help text
@@ -693,9 +726,6 @@ void OControlModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
case PROPERTY_ID_TABINDEX:
rValue <<= m_nTabIndex;
break;
- case PROPERTY_ID_HELPTEXT:
- rValue <<= m_aHelpText;
- break;
default:
OPropertySetAggregationHelper::getFastPropertyValue(rValue, nHandle);
}
@@ -715,9 +745,6 @@ sal_Bool OControlModel::convertFastPropertyValue(
case PROPERTY_ID_TAG:
bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aTag);
break;
- case PROPERTY_ID_HELPTEXT:
- bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aHelpText);
- break;
case PROPERTY_ID_TABINDEX:
bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_nTabIndex);
break;
@@ -746,11 +773,6 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A
"OControlModel::setFastPropertyValue_NoBroadcast : invalid type" );
_rValue >>= m_nTabIndex;
break;
- case PROPERTY_ID_HELPTEXT:
- DBG_ASSERT(_rValue.getValueType() == getCppuType((const ::rtl::OUString*)NULL),
- "OControlModel::setFastPropertyValue_NoBroadcast : invalid type" );
- _rValue >>= m_aHelpText;
- break;
}
}
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 3b0e576991f8..ad8cc4ab0ae8 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: FormattedField.cxx,v $
*
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
*
- * last change: $Author: fs $ $Date: 2001-02-21 11:10:53 $
+ * 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
@@ -518,14 +518,13 @@ void OFormattedModel::fillProperties(
Sequence< com::sun::star::beans::Property >& _rProps,
Sequence< com::sun::star::beans::Property >& _rAggregateProps ) const
{
- FRM_BEGIN_PROP_HELPER(11)
+ FRM_BEGIN_PROP_HELPER(10)
DECL_PROP1(NAME, ::rtl::OUString, BOUND);
DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT);
DECL_BOOL_PROP1(EMPTY_IS_NULL, BOUND);
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, com::sun::star::beans::XPropertySet,READONLY, TRANSIENT);
DECL_BOOL_PROP2(FILTERPROPOSAL, BOUND, MAYBEDEFAULT);
DECL_IFACE_PROP2(CONTROLLABEL, com::sun::star::beans::XPropertySet,BOUND, MAYBEVOID);
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index f28ee5f42a78..72c19744cfd2 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Grid.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: jl $ $Date: 2001-03-22 16:47:19 $
+ * 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
@@ -1156,7 +1156,7 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream
_rxOutStream->writeLong(getINT32(m_aTextColor));
// neu ab Version 6
- _rxOutStream << m_aHelpText;
+ _rxOutStream << m_sHelpText;
if (nAnyMask & FONTDESCRIPTOR)
_rxOutStream << m_aFont;
@@ -1299,7 +1299,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream)
// neu ab Version 6
if (nVersion > 5)
- _rxInStream >> m_aHelpText;
+ _rxInStream >> m_sHelpText;
if (nAnyMask & FONTDESCRIPTOR)
{
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index f33b53ff9c3b..45459651bd88 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Grid.hxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: fs $ $Date: 2001-01-08 08:15:57 $
+ * 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
@@ -123,6 +123,7 @@ class OGridControlModel :public OControlModel
::com::sun::star::awt::FontDescriptor m_aFont;
::com::sun::star::awt::FontDescriptor m_aOldFont;
::rtl::OUString m_aDefaultControl;
+ ::rtl::OUString m_sHelpText;
// [properties]
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xSelection;
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 300d32bb99fb..5b0391786584 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: GroupBox.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
@@ -142,14 +142,13 @@ void OGroupBoxModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
{
- FRM_BEGIN_PROP_HELPER(4)
+ FRM_BEGIN_PROP_HELPER(3)
// don't want to have the TabStop property
RemoveProperty(_rAggregateProps, PROPERTY_TABSTOP);
DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT);
DECL_PROP1(NAME, ::rtl::OUString, BOUND);
DECL_PROP1(TAG, ::rtl::OUString, BOUND);
- DECL_PROP1(HELPTEXT, ::rtl::OUString, BOUND);
FRM_END_PROP_HELPER();
}
@@ -167,7 +166,7 @@ void SAL_CALL OGroupBoxModel::write(const Reference<stario::XObjectOutputStream>
// Version
_rxOutStream->writeShort(0x0002);
- _rxOutStream << m_aHelpText;
+ writeHelpTextCompatibly(_rxOutStream);
}
//------------------------------------------------------------------------------
@@ -181,7 +180,7 @@ void SAL_CALL OGroupBoxModel::read(const Reference<stario::XObjectInputStream>&
// ups, ist das Englisch richtig ? ;)
if (nVersion == 2)
- _rxInStream >> m_aHelpText;
+ readHelpTextCompatibly(_rxInStream);
if (nVersion > 0x0002)
{
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;
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 :
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 26465bec91f5..1877e9f39b38 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: ListBox.cxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: oj $ $Date: 2001-03-22 08:08:36 $
+ * 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
@@ -412,7 +412,7 @@ void OListBoxModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
{
- FRM_BEGIN_PROP_HELPER(14)
+ FRM_BEGIN_PROP_HELPER(13)
// die SelectSequence-Property soll transient sein ....
ModifyPropertyAttributes(_rAggregateProps, PROPERTY_SELECT_SEQ, PropertyAttribute::TRANSIENT, 0);
@@ -426,7 +426,6 @@ void OListBoxModel::fillProperties(
DECL_PROP3(VALUE_SEQ, StringSequence, BOUND, READONLY, TRANSIENT);
DECL_PROP1(DEFAULT_SELECT_SEQ, Sequence<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);
@@ -470,7 +469,7 @@ void SAL_CALL OListBoxModel::write(const Reference<stario::XObjectOutputStream>&
m_aBoundColumn >>= nBoundColumn;
_rxOutStream << nBoundColumn;
}
- _rxOutStream << m_aHelpText;
+ writeHelpTextCompatibly(_rxOutStream);
// from version 0x0004 : common properties
writeCommonProperties(_rxOutStream);
@@ -548,7 +547,7 @@ void SAL_CALL OListBoxModel::read(const Reference<stario::XObjectInputStream>& _
}
if (nVersion > 2)
- _rxInStream >> m_aHelpText;
+ readHelpTextCompatibly(_rxInStream);
// Stringliste mu gelehrt werden, wenn nicht ueber WerteListe gefuellt wird
// dieses kann der Fall sein wenn im alive modus gespeichert wird
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index 2937c5a755ca..c507ae6fab25 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Numeric.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: fs $ $Date: 2001-01-04 16:27:28 $
+ * 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
@@ -174,7 +174,7 @@ void ONumericModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
{
- FRM_BEGIN_PROP_HELPER(10)
+ FRM_BEGIN_PROP_HELPER(9)
// Value auf transient setzen
// ModifyPropertyAttributes(_rAggregateProps, PROPERTY_VALUE, PropertyAttribute::TRANSIENT, 0);
@@ -184,7 +184,6 @@ void ONumericModel::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);
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index cbdca7e266a4..98b0b26b877e 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Pattern.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
@@ -174,7 +174,7 @@ void OPatternModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
{
- FRM_BEGIN_PROP_HELPER(12)
+ FRM_BEGIN_PROP_HELPER(11)
// Text auf transient setzen
// ModifyPropertyAttributes(_rAggregateProps, PROPERTY_TEXT, PropertyAttribute::TRANSIENT, 0);
DECL_PROP1(NAME, ::rtl::OUString, BOUND);
@@ -184,7 +184,6 @@ void OPatternModel::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_PROP2(FILTERPROPOSAL, sal_Bool, BOUND, MAYBEDEFAULT);
DECL_IFACE_PROP2(CONTROLLABEL, XPropertySet, BOUND, MAYBEVOID);
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 2fe2895c1c04..cfd83b1448a0 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: RadioButton.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * 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
@@ -353,7 +353,7 @@ void ORadioButtonModel::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);
@@ -364,7 +364,6 @@ void ORadioButtonModel::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);
@@ -389,7 +388,7 @@ void SAL_CALL ORadioButtonModel::write(const Reference<XObjectOutputStream>& _rx
// Properties
_rxOutStream << m_sReferenceValue;
_rxOutStream << (sal_Int16)m_nDefaultChecked;
- _rxOutStream << m_aHelpText;
+ writeHelpTextCompatibly(_rxOutStream);
// from version 0x0003 : common properties
writeCommonProperties(_rxOutStream);
@@ -410,12 +409,12 @@ void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxIn
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 :
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index a2a7535d1d84..8fa321cc9862 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: Time.cxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: fs $ $Date: 2001-01-04 16:27:28 $
+ * 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
@@ -189,7 +189,7 @@ void OTimeModel::fillProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
{
- FRM_BEGIN_PROP_HELPER(10)
+ FRM_BEGIN_PROP_HELPER(9)
// starutil::Time auf transient setzen
// ModifyPropertyAttributes(_rAggregateProps, PROPERTY_TIME, PropertyAttribute::TRANSIENT, 0);
@@ -199,7 +199,6 @@ void OTimeModel::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);
generated by cgit (git 2.34.1) at 2025-05-04 17:53:44 +0000