forms/source/component/Button.cxx | 12 ++--
forms/source/component/CheckBox.cxx | 2
forms/source/component/Columns.cxx | 8 +-
forms/source/component/ComboBox.cxx | 12 ++--
forms/source/component/Currency.cxx | 4 -
forms/source/component/DatabaseForm.cxx | 32 +++++------
forms/source/component/Date.cxx | 6 +-
forms/source/component/Edit.cxx | 6 +-
forms/source/component/File.cxx | 4 -
forms/source/component/FormComponent.cxx | 16 ++---
forms/source/component/FormattedField.cxx | 2
forms/source/component/Grid.cxx | 74 +++++++++++++--------------
forms/source/component/Hidden.cxx | 8 +-
forms/source/component/ImageButton.cxx | 10 +--
forms/source/component/ImageControl.cxx | 4 -
forms/source/component/ListBox.cxx | 20 +++----
forms/source/component/Numeric.cxx | 4 -
forms/source/component/Pattern.cxx | 6 +-
forms/source/component/RadioButton.cxx | 2
forms/source/component/Time.cxx | 6 +-
forms/source/component/formcontrolfont.cxx | 38 ++++++-------
forms/source/component/navigationbar.cxx | 2
forms/source/component/refvaluecomponent.cxx | 6 +-
forms/source/component/scrollbar.cxx | 6 +-
forms/source/component/spinbutton.cxx | 6 +-
forms/source/inc/property.hxx | 4 -
forms/source/richtext/richtextmodel.cxx | 2
27 files changed, 149 insertions(+), 153 deletions(-)
New commits:
commit 40a5ba66a8b92898d4a933064b9eab4267388f45
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Nov 6 09:02:16 2021 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Nov 6 10:49:45 2021 +0100
Replace some macros in forms part 10
Remove DECL_PROP_IMPL
Change-Id: I4ba5e3252058b137cd314f0aed0caf60bb347852
Change-Id: Icfda67a31f465ebfe0c13761bdbdf9b024605dc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124785
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/forms/source/component/Button.cxx
b/forms/source/component/Button.cxx
index dd8344cb9586..3b58ea317303 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -105,12 +105,12 @@ void OButtonModel::describeFixedProperties( Sequence<
Property >& _rProps ) cons
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 6);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(BUTTONTYPE, FormButtonType)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(DEFAULT_STATE, sal_Int16)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(DISPATCHURLINTERNAL, sal_Bool)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TARGET_URL, OUString)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TARGET_FRAME, OUString)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_BUTTONTYPE,
PROPERTY_ID_BUTTONTYPE, cppu::UnoType<FormButtonType>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_STATE,
PROPERTY_ID_DEFAULT_STATE, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_DISPATCHURLINTERNAL,
PROPERTY_ID_DISPATCHURLINTERNAL, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TARGET_URL,
PROPERTY_ID_TARGET_URL, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TARGET_FRAME,
PROPERTY_ID_TARGET_FRAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/CheckBox.cxx
b/forms/source/component/CheckBox.cxx
index cc9f618be124..8b34ba18af66 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -113,7 +113,7 @@ void OCheckBoxModel::describeFixedProperties( Sequence<
Property >& _rProps ) co
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 1);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/Columns.cxx
b/forms/source/component/Columns.cxx
index cab7d72ff52b..ee1ec4440be3 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -345,12 +345,12 @@ void OGridColumn::setOwnProperties(Sequence<Property>&
aDescriptor)
{
aDescriptor.realloc(5);
Property* pProperties = aDescriptor.getArray();
- DECL_PROP_IMPL(LABEL, OUString) css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(WIDTH, sal_Int32) css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEVOID |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(ALIGN, sal_Int16) css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEVOID |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_LABEL, PROPERTY_ID_LABEL,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_WIDTH, PROPERTY_ID_WIDTH,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEVOID |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_ALIGN, PROPERTY_ID_ALIGN,
cppu::UnoType<sal_Int16>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEVOID |
css::beans::PropertyAttribute::MAYBEDEFAULT);
*pProperties++ = css::beans::Property(PROPERTY_HIDDEN, PROPERTY_ID_HIDDEN,
cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(COLUMNSERVICENAME, OUString)
css::beans::PropertyAttribute::READONLY);
+ *pProperties++ = css::beans::Property(PROPERTY_COLUMNSERVICENAME,
PROPERTY_ID_COLUMNSERVICENAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY);
}
// Reference<XPropertySet>
diff --git a/forms/source/component/ComboBox.cxx
b/forms/source/component/ComboBox.cxx
index a529c88f131c..d6a2ae13ddfd 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -295,14 +295,14 @@ void OComboBoxModel::describeFixedProperties( Sequence<
Property >& _rProps ) co
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 7);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(LISTSOURCETYPE, ListSourceType)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(LISTSOURCE, OUString)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_LISTSOURCETYPE,
PROPERTY_ID_LISTSOURCETYPE, cppu::UnoType<ListSourceType>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_LISTSOURCE,
PROPERTY_ID_LISTSOURCE, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_EMPTY_IS_NULL,
PROPERTY_ID_EMPTY_IS_NULL, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(DEFAULT_TEXT, OUString)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(STRINGITEMLIST, Sequence< OUString >)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TYPEDITEMLIST, Sequence< Any >)
css::beans::PropertyAttribute::OPTIONAL);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_TEXT,
PROPERTY_ID_DEFAULT_TEXT, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_STRINGITEMLIST,
PROPERTY_ID_STRINGITEMLIST, cppu::UnoType<Sequence< OUString >>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TYPEDITEMLIST,
PROPERTY_ID_TYPEDITEMLIST, cppu::UnoType<Sequence< Any >>::get(),
css::beans::PropertyAttribute::OPTIONAL);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/Currency.cxx
b/forms/source/component/Currency.cxx
index f89c7a5bca32..b6c2cb8ff42e 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -163,8 +163,8 @@ void OCurrencyModel::describeFixedProperties( Sequence<
Property >& _rProps ) co
// Set Value to transient
// ModifyPropertyAttributes(_rAggregateProps, PROPERTY_VALUE,
PropertyAttribute::TRANSIENT, 0);
- DECL_PROP_IMPL(DEFAULT_VALUE, double)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_VALUE,
PROPERTY_ID_DEFAULT_VALUE, cppu::UnoType<double>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index 30bf2538ebec..5319b9ef05c0 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1295,32 +1295,32 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
css::beans::PropertyAttribute::MAYBEVOID | PropertyAttribute::CONSTRAINED);
*pProperties++ = css::beans::Property(PROPERTY_APPLYFILTER,
PROPERTY_ID_APPLYFILTER, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(NAME, OUString) css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(MASTERFIELDS, Sequence< OUString >)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(DETAILFIELDS, Sequence< OUString >)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(DATASOURCE, OUString) css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::CONSTRAINED);
- DECL_PROP_IMPL(CYCLE, TabulatorCycle) css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::MAYBEVOID |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FILTER, OUString) css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(HAVINGCLAUSE, OUString)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_NAME, PROPERTY_ID_NAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_MASTERFIELDS,
PROPERTY_ID_MASTERFIELDS, cppu::UnoType<Sequence< OUString >>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_DETAILFIELDS,
PROPERTY_ID_DETAILFIELDS, cppu::UnoType<Sequence< OUString >>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_DATASOURCE,
PROPERTY_ID_DATASOURCE, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::CONSTRAINED);
+ *pProperties++ = css::beans::Property(PROPERTY_CYCLE, PROPERTY_ID_CYCLE,
cppu::UnoType<TabulatorCycle>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEVOID |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FILTER, PROPERTY_ID_FILTER,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_HAVINGCLAUSE,
PROPERTY_ID_HAVINGCLAUSE, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
*pProperties++ = css::beans::Property(PROPERTY_INSERTONLY,
PROPERTY_ID_INSERTONLY, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(NAVIGATION, NavigationBarMode)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_NAVIGATION,
PROPERTY_ID_NAVIGATION, cppu::UnoType<NavigationBarMode>::get(),
css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_ALLOWADDITIONS,
PROPERTY_ID_ALLOWADDITIONS, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_ALLOWEDITS,
PROPERTY_ID_ALLOWEDITS, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_ALLOWDELETIONS,
PROPERTY_ID_ALLOWDELETIONS, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(PRIVILEGES, sal_Int32)
css::beans::PropertyAttribute::TRANSIENT |
css::beans::PropertyAttribute::READONLY);
- DECL_PROP_IMPL(TARGET_URL, OUString) css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TARGET_FRAME, OUString)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(SUBMIT_METHOD, FormSubmitMethod)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(SUBMIT_ENCODING, FormSubmitEncoding)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_PRIVILEGES,
PROPERTY_ID_PRIVILEGES, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::TRANSIENT |
css::beans::PropertyAttribute::READONLY);
+ *pProperties++ = css::beans::Property(PROPERTY_TARGET_URL,
PROPERTY_ID_TARGET_URL, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TARGET_FRAME,
PROPERTY_ID_TARGET_FRAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_SUBMIT_METHOD,
PROPERTY_ID_SUBMIT_METHOD, cppu::UnoType<FormSubmitMethod>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_SUBMIT_ENCODING,
PROPERTY_ID_SUBMIT_ENCODING, cppu::UnoType<FormSubmitEncoding>::get(),
css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_DYNAMIC_CONTROL_BORDER,
PROPERTY_ID_DYNAMIC_CONTROL_BORDER, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::MAYBEVOID |
css::beans::PropertyAttribute::MAYBEDEFAULT );
- DECL_PROP_IMPL(CONTROL_BORDER_COLOR_FOCUS, sal_Int32)
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID
| css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(CONTROL_BORDER_COLOR_MOUSE, sal_Int32)
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID
| css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(CONTROL_BORDER_COLOR_INVALID, sal_Int32)
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID
| css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_CONTROL_BORDER_COLOR_FOCUS,
PROPERTY_ID_CONTROL_BORDER_COLOR_FOCUS, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID
| css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_CONTROL_BORDER_COLOR_MOUSE,
PROPERTY_ID_CONTROL_BORDER_COLOR_MOUSE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID
| css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ =
css::beans::Property(PROPERTY_CONTROL_BORDER_COLOR_INVALID,
PROPERTY_ID_CONTROL_BORDER_COLOR_INVALID, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID
| css::beans::PropertyAttribute::MAYBEDEFAULT);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 8a4bbf29d674..86dd52158b92 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -145,9 +145,9 @@ void ODateModel::describeFixedProperties( Sequence<
Property >& _rProps ) const
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 4);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(DEFAULT_DATE, util::Date)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(FORMATKEY, sal_Int32)
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_DATE,
PROPERTY_ID_DEFAULT_DATE, cppu::UnoType<util::Date>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_FORMATKEY,
PROPERTY_ID_FORMATKEY, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::TRANSIENT);
*pProperties++ = css::beans::Property(PROPERTY_FORMATSSUPPLIER,
PROPERTY_ID_FORMATSSUPPLIER, cppu::UnoType<XNumberFormatsSupplier>::get(),
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 240884bc469d..1d9a1d870e4b 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -353,11 +353,11 @@ void OEditModel::describeFixedProperties( Sequence<
Property >& _rProps ) const
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 5);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(PERSISTENCE_MAXTEXTLENGTH, sal_Int16)
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(DEFAULT_TEXT, OUString)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_PERSISTENCE_MAXTEXTLENGTH,
PROPERTY_ID_PERSISTENCE_MAXTEXTLENGTH, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_TEXT,
PROPERTY_ID_DEFAULT_TEXT, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
*pProperties++ = css::beans::Property(PROPERTY_EMPTY_IS_NULL,
PROPERTY_ID_EMPTY_IS_NULL, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_FILTERPROPOSAL,
PROPERTY_ID_FILTERPROPOSAL, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::MAYBEDEFAULT);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 381f9495198b..076b60f46428 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -174,8 +174,8 @@ void OFileControlModel::describeFixedProperties( Sequence<
Property >& _rProps )
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 2);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(DEFAULT_TEXT, OUString)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_TEXT,
PROPERTY_ID_DEFAULT_TEXT, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/FormComponent.cxx
b/forms/source/component/FormComponent.cxx
index 93791b3f5beb..6ebd8ff6a468 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1011,14 +1011,14 @@ void OControlModel::describeFixedProperties( Sequence<
Property >& _rProps ) con
{
_rProps.realloc(7);
css::beans::Property* pProperties = _rProps.getArray();
- DECL_PROP_IMPL(CLASSID, sal_Int16)
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(NAME, OUString) css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_CLASSID,
PROPERTY_ID_CLASSID, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_NAME, PROPERTY_ID_NAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_NATIVE_LOOK,
PROPERTY_ID_NATIVE_LOOK, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(TAG, OUString) css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(GENERATEVBAEVENTS, sal_Bool)
css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(CONTROL_TYPE_IN_MSO, sal_Int16)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(OBJ_ID_IN_MSO, cppu::UnoUnsignedShortType)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TAG, PROPERTY_ID_TAG,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_GENERATEVBAEVENTS,
PROPERTY_ID_GENERATEVBAEVENTS, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_CONTROL_TYPE_IN_MSO,
PROPERTY_ID_CONTROL_TYPE_IN_MSO, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_OBJ_ID_IN_MSO,
PROPERTY_ID_OBJ_ID_IN_MSO, cppu::UnoType<cppu::UnoUnsignedShortType>::get(),
css::beans::PropertyAttribute::BOUND);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
@@ -2784,12 +2784,12 @@ void OBoundControlModel::describeFixedProperties(
Sequence< Property >& _rProps
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 5);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(CONTROLSOURCE, OUString)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_CONTROLSOURCE,
PROPERTY_ID_CONTROLSOURCE, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_BOUNDFIELD,
PROPERTY_ID_BOUNDFIELD, cppu::UnoType<XPropertySet>::get(),
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY
| css::beans::PropertyAttribute::TRANSIENT);
*pProperties++ = css::beans::Property(PROPERTY_CONTROLLABEL,
PROPERTY_ID_CONTROLLABEL, cppu::UnoType<XPropertySet>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(CONTROLSOURCEPROPERTY, OUString)
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_CONTROLSOURCEPROPERTY,
PROPERTY_ID_CONTROLSOURCEPROPERTY, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
*pProperties++ = css::beans::Property(PROPERTY_INPUT_REQUIRED,
PROPERTY_ID_INPUT_REQUIRED, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
diff --git a/forms/source/component/FormattedField.cxx
b/forms/source/component/FormattedField.cxx
index d08b8f5aa021..6d826aaab861 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -345,7 +345,7 @@ void OFormattedModel::describeFixedProperties( Sequence<
Property >& _rProps ) c
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
*pProperties++ = css::beans::Property(PROPERTY_EMPTY_IS_NULL,
PROPERTY_ID_EMPTY_IS_NULL, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_FILTERPROPOSAL,
PROPERTY_ID_FILTERPROPOSAL, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::MAYBEDEFAULT);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 4a5c78169b87..df6e90140886 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -376,45 +376,45 @@ void OGridControlModel::describeFixedProperties(
Sequence< Property >& _rProps )
{
_rProps.realloc(37);
css::beans::Property* pProperties = _rProps.getArray();
- DECL_PROP_IMPL(NAME, OUString) css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(CLASSID, sal_Int16)
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(TAG, OUString) css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TABSTOP, sal_Bool) css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(HASNAVIGATION, sal_Bool)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(ENABLED, sal_Bool)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(ENABLEVISIBLE, sal_Bool)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(BORDER, sal_Int16)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(BORDERCOLOR, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(DEFAULTCONTROL, OUString)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TEXTCOLOR, sal_Int32)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(BACKGROUNDCOLOR, sal_Int32)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(FONT, FontDescriptor)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(ROWHEIGHT, sal_Int32)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(HELPTEXT, OUString)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(FONT_NAME, OUString)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_STYLENAME, OUString)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_FAMILY, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_CHARSET, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_HEIGHT, float)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_WEIGHT, float)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_SLANT, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_UNDERLINE, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_NAME, PROPERTY_ID_NAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_CLASSID,
PROPERTY_ID_CLASSID, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_TAG, PROPERTY_ID_TAG,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABSTOP,
PROPERTY_ID_TABSTOP, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_HASNAVIGATION,
PROPERTY_ID_HASNAVIGATION, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_ENABLED,
PROPERTY_ID_ENABLED, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_ENABLEVISIBLE,
PROPERTY_ID_ENABLEVISIBLE, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_BORDER, PROPERTY_ID_BORDER,
cppu::UnoType<sal_Int16>::get(), css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_BORDERCOLOR,
PROPERTY_ID_BORDERCOLOR, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULTCONTROL,
PROPERTY_ID_DEFAULTCONTROL, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TEXTCOLOR,
PROPERTY_ID_TEXTCOLOR, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_BACKGROUNDCOLOR,
PROPERTY_ID_BACKGROUNDCOLOR, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT, PROPERTY_ID_FONT,
cppu::UnoType<FontDescriptor>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_ROWHEIGHT,
PROPERTY_ID_ROWHEIGHT, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_HELPTEXT,
PROPERTY_ID_HELPTEXT, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_NAME,
PROPERTY_ID_FONT_NAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_STYLENAME,
PROPERTY_ID_FONT_STYLENAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_FAMILY,
PROPERTY_ID_FONT_FAMILY, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_CHARSET,
PROPERTY_ID_FONT_CHARSET, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_HEIGHT,
PROPERTY_ID_FONT_HEIGHT, cppu::UnoType<float>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_WEIGHT,
PROPERTY_ID_FONT_WEIGHT, cppu::UnoType<float>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_SLANT,
PROPERTY_ID_FONT_SLANT, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_UNDERLINE,
PROPERTY_ID_FONT_UNDERLINE, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
*pProperties++ = css::beans::Property(PROPERTY_FONT_WORDLINEMODE,
PROPERTY_ID_FONT_WORDLINEMODE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(TEXTLINECOLOR, sal_Int32)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(FONTEMPHASISMARK, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONTRELIEF, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_STRIKEOUT, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(RECORDMARKER, sal_Bool)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(PRINTABLE, sal_Bool)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(CURSORCOLOR, sal_Int32)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
- css::beans::PropertyAttribute::MAYBEVOID |
css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(ALWAYSSHOWCURSOR, sal_Bool)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(DISPLAYSYNCHRON, sal_Bool)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(HELPURL, OUString) css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(WRITING_MODE, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(CONTEXT_WRITING_MODE, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_TEXTLINECOLOR,
PROPERTY_ID_TEXTLINECOLOR, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_FONTEMPHASISMARK,
PROPERTY_ID_FONTEMPHASISMARK, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONTRELIEF,
PROPERTY_ID_FONTRELIEF, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_STRIKEOUT,
PROPERTY_ID_FONT_STRIKEOUT, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_RECORDMARKER,
PROPERTY_ID_RECORDMARKER, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_PRINTABLE,
PROPERTY_ID_PRINTABLE, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_CURSORCOLOR,
PROPERTY_ID_CURSORCOLOR, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
+
css::beans::PropertyAttribute::MAYBEVOID |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_ALWAYSSHOWCURSOR,
PROPERTY_ID_ALWAYSSHOWCURSOR, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_DISPLAYSYNCHRON,
PROPERTY_ID_DISPLAYSYNCHRON, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_HELPURL,
PROPERTY_ID_HELPURL, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_WRITING_MODE,
PROPERTY_ID_WRITING_MODE, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_CONTEXT_WRITING_MODE,
PROPERTY_ID_CONTEXT_WRITING_MODE, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::TRANSIENT);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
void OGridControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle )
const
diff --git a/forms/source/component/Hidden.cxx
b/forms/source/component/Hidden.cxx
index ecb3c32f7bac..49a3a5c40f54 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -108,10 +108,10 @@ void OHiddenModel::describeFixedProperties( Sequence<
Property >& _rProps ) cons
{
_rProps.realloc(4);
css::beans::Property* pProperties = _rProps.getArray();
- DECL_PROP_IMPL(CLASSID, sal_Int16)
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(HIDDEN_VALUE, OUString)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(NAME, OUString) css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TAG, OUString) css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_CLASSID,
PROPERTY_ID_CLASSID, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_HIDDEN_VALUE,
PROPERTY_ID_HIDDEN_VALUE, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_NAME, PROPERTY_ID_NAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TAG, PROPERTY_ID_TAG,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/ImageButton.cxx
b/forms/source/component/ImageButton.cxx
index fb88396d6008..a5676c499263 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -79,11 +79,11 @@ void OImageButtonModel::describeFixedProperties( Sequence<
Property >& _rProps )
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 5);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(BUTTONTYPE, FormButtonType)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(DISPATCHURLINTERNAL, sal_Bool)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TARGET_URL, OUString)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TARGET_FRAME, OUString)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_BUTTONTYPE,
PROPERTY_ID_BUTTONTYPE, cppu::UnoType<FormButtonType>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_DISPATCHURLINTERNAL,
PROPERTY_ID_DISPATCHURLINTERNAL, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TARGET_URL,
PROPERTY_ID_TARGET_URL, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TARGET_FRAME,
PROPERTY_ID_TARGET_FRAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/ImageControl.cxx
b/forms/source/component/ImageControl.cxx
index 614f7d576e5b..122f878490eb 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -316,10 +316,10 @@ void OImageControlModel::describeFixedProperties(
Sequence< Property >& _rProps
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
*pProperties++ = css::beans::Property(PROPERTY_GRAPHIC,
PROPERTY_ID_GRAPHIC, cppu::UnoType<XGraphic>::get(),
css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(IMAGE_URL, OUString)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_IMAGE_URL,
PROPERTY_ID_IMAGE_URL, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
*pProperties++ = css::beans::Property(PROPERTY_READONLY,
PROPERTY_ID_READONLY, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index e93f8ffef87e..854c8261763c 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -491,16 +491,16 @@ namespace frm
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 10);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(BOUNDCOLUMN, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(LISTSOURCETYPE, ListSourceType)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(LISTSOURCE, css::uno::Sequence<OUString>)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(VALUE_SEQ, css::uno::Sequence<OUString>)
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY
| css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(SELECT_VALUE_SEQ, Sequence< Any >)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(SELECT_VALUE, Any)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP_IMPL(DEFAULT_SELECT_SEQ, Sequence<sal_Int16>)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(STRINGITEMLIST, Sequence< OUString >)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TYPEDITEMLIST, Sequence< Any >)
css::beans::PropertyAttribute::OPTIONAL);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_BOUNDCOLUMN,
PROPERTY_ID_BOUNDCOLUMN, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_LISTSOURCETYPE,
PROPERTY_ID_LISTSOURCETYPE, cppu::UnoType<ListSourceType>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_LISTSOURCE,
PROPERTY_ID_LISTSOURCE, cppu::UnoType<css::uno::Sequence<OUString>>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_VALUE_SEQ,
PROPERTY_ID_VALUE_SEQ, cppu::UnoType<css::uno::Sequence<OUString>>::get(),
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY
| css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_SELECT_VALUE_SEQ,
PROPERTY_ID_SELECT_VALUE_SEQ, cppu::UnoType<Sequence< Any >>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_SELECT_VALUE,
PROPERTY_ID_SELECT_VALUE, cppu::UnoType<Any>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_SELECT_SEQ,
PROPERTY_ID_DEFAULT_SELECT_SEQ, cppu::UnoType<Sequence<sal_Int16>>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_STRINGITEMLIST,
PROPERTY_ID_STRINGITEMLIST, cppu::UnoType<Sequence< OUString >>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TYPEDITEMLIST,
PROPERTY_ID_TYPEDITEMLIST, cppu::UnoType<Sequence< Any >>::get(),
css::beans::PropertyAttribute::OPTIONAL);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/Numeric.cxx
b/forms/source/component/Numeric.cxx
index c5bebf4c6650..feafca722cdf 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -114,8 +114,8 @@ void ONumericModel::describeFixedProperties( Sequence<
Property >& _rProps ) con
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 2);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(DEFAULT_VALUE, double)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_VALUE,
PROPERTY_ID_DEFAULT_VALUE, cppu::UnoType<double>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/Pattern.cxx
b/forms/source/component/Pattern.cxx
index 28ffd891cbd1..95f6da4161fe 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -102,11 +102,11 @@ void OPatternModel::describeFixedProperties( Sequence<
Property >& _rProps ) con
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 4);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(DEFAULT_TEXT, OUString)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_TEXT,
PROPERTY_ID_DEFAULT_TEXT, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
*pProperties++ = css::beans::Property(PROPERTY_EMPTY_IS_NULL,
PROPERTY_ID_EMPTY_IS_NULL, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(FILTERPROPOSAL, sal_Bool)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_FILTERPROPOSAL,
PROPERTY_ID_FILTERPROPOSAL, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/RadioButton.cxx
b/forms/source/component/RadioButton.cxx
index ccb541dd1265..84a5b74cdcd8 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -242,7 +242,7 @@ void ORadioButtonModel::describeFixedProperties( Sequence<
Property >& _rProps )
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 1);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index 2c435e09b6be..88350ca7f9a0 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -150,9 +150,9 @@ void OTimeModel::describeFixedProperties( Sequence<
Property >& _rProps ) const
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 4);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(DEFAULT_TIME, util::Time)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(FORMATKEY, sal_Int32)
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_TIME,
PROPERTY_ID_DEFAULT_TIME, cppu::UnoType<util::Time>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_FORMATKEY,
PROPERTY_ID_FORMATKEY, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::TRANSIENT);
*pProperties++ = css::beans::Property(PROPERTY_FORMATSSUPPLIER,
PROPERTY_ID_FORMATSSUPPLIER, cppu::UnoType<XNumberFormatsSupplier>::get(),
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
diff --git a/forms/source/component/formcontrolfont.cxx
b/forms/source/component/formcontrolfont.cxx
index 589a77930a75..13abbf286423 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -193,28 +193,28 @@ namespace frm
_rProps.realloc( nPos + 21 );
Property* pProperties = _rProps.getArray();
- DECL_PROP_IMPL(FONT, FontDescriptor)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONTEMPHASISMARK, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONTRELIEF, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(TEXTCOLOR, sal_Int32)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(TEXTLINECOLOR, sal_Int32)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT, PROPERTY_ID_FONT,
cppu::UnoType<FontDescriptor>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONTEMPHASISMARK,
PROPERTY_ID_FONTEMPHASISMARK, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONTRELIEF,
PROPERTY_ID_FONTRELIEF, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_TEXTCOLOR,
PROPERTY_ID_TEXTCOLOR, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
+ *pProperties++ = css::beans::Property(PROPERTY_TEXTLINECOLOR,
PROPERTY_ID_TEXTLINECOLOR, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
- DECL_PROP_IMPL(FONT_CHARWIDTH, float)
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_CHARWIDTH,
PROPERTY_ID_FONT_CHARWIDTH, cppu::UnoType<float>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
*pProperties++ = css::beans::Property(PROPERTY_FONT_KERNING,
PROPERTY_ID_FONT_KERNING, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_ORIENTATION, float)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_PITCH, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_TYPE, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_WIDTH, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_NAME, OUString)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_STYLENAME, OUString)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_FAMILY, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_CHARSET, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_HEIGHT, float)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_WEIGHT, float)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_SLANT, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_UNDERLINE, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP_IMPL(FONT_STRIKEOUT, sal_Int16)
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_ORIENTATION,
PROPERTY_ID_FONT_ORIENTATION, cppu::UnoType<float>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_PITCH,
PROPERTY_ID_FONT_PITCH, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_TYPE,
PROPERTY_ID_FONT_TYPE, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_WIDTH,
PROPERTY_ID_FONT_WIDTH, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_NAME,
PROPERTY_ID_FONT_NAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_STYLENAME,
PROPERTY_ID_FONT_STYLENAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_FAMILY,
PROPERTY_ID_FONT_FAMILY, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_CHARSET,
PROPERTY_ID_FONT_CHARSET, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_HEIGHT,
PROPERTY_ID_FONT_HEIGHT, cppu::UnoType<float>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_WEIGHT,
PROPERTY_ID_FONT_WEIGHT, cppu::UnoType<float>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_SLANT,
PROPERTY_ID_FONT_SLANT, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_UNDERLINE,
PROPERTY_ID_FONT_UNDERLINE, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_FONT_STRIKEOUT,
PROPERTY_ID_FONT_STRIKEOUT, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
*pProperties++ = css::beans::Property(PROPERTY_FONT_WORDLINEMODE,
PROPERTY_ID_FONT_WORDLINEMODE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::MAYBEDEFAULT);
}
diff --git a/forms/source/component/navigationbar.cxx
b/forms/source/component/navigationbar.cxx
index c79c4b0a58eb..788bd1223425 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -451,7 +451,7 @@ namespace frm
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 1);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
// properties which the OPropertyContainerHelper is responsible for
diff --git a/forms/source/component/refvaluecomponent.cxx
b/forms/source/component/refvaluecomponent.cxx
index 50481b13b722..afca400a78e3 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -158,9 +158,9 @@ namespace frm
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 3);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(REFVALUE, OUString)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(DEFAULT_STATE, sal_Int16)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(UNCHECKED_REFVALUE, OUString)
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_REFVALUE,
PROPERTY_ID_REFVALUE, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_STATE,
PROPERTY_ID_DEFAULT_STATE, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_UNCHECKED_REFVALUE,
PROPERTY_ID_UNCHECKED_REFVALUE, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/scrollbar.cxx
b/forms/source/component/scrollbar.cxx
index 97df377fd205..e2b740183c57 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -140,9 +140,9 @@ namespace frm
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 3);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(DEFAULT_SCROLL_VALUE, sal_Int32)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(CONTROLSOURCEPROPERTY, OUString)
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_SCROLL_VALUE,
PROPERTY_ID_DEFAULT_SCROLL_VALUE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_CONTROLSOURCEPROPERTY,
PROPERTY_ID_CONTROLSOURCEPROPERTY, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/spinbutton.cxx
b/forms/source/component/spinbutton.cxx
index a237ef7bad83..772b364db504 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -94,9 +94,9 @@ namespace frm
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 3);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(DEFAULT_SPIN_VALUE, sal_Int32)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND);
- DECL_PROP_IMPL(CONTROLSOURCEPROPERTY, OUString)
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
+ *pProperties++ = css::beans::Property(PROPERTY_DEFAULT_SPIN_VALUE,
PROPERTY_ID_DEFAULT_SPIN_VALUE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND);
+ *pProperties++ = css::beans::Property(PROPERTY_CONTROLSOURCEPROPERTY,
PROPERTY_ID_CONTROLSOURCEPROPERTY, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index 47f93836352f..b99e4715c51d 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -336,10 +336,6 @@ public:
virtual sal_Int32 getPreferredPropertyId(const OUString& _rName) override;
};
-
-#define DECL_PROP_IMPL(varname, type) \
- *pProperties++ = css::beans::Property(PROPERTY_##varname,
PROPERTY_ID_##varname, cppu::UnoType<type>::get(),
-
}
//... namespace frm .......................................................
diff --git a/forms/source/richtext/richtextmodel.cxx
b/forms/source/richtext/richtextmodel.cxx
index 59474333d80f..1029ce9a7352 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -314,7 +314,7 @@ namespace frm
sal_Int32 nOldCount = _rProps.getLength();
_rProps.realloc( nOldCount + 1);
css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
- DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
+ *pProperties++ = css::beans::Property(PROPERTY_TABINDEX,
PROPERTY_ID_TABINDEX, cppu::UnoType<sal_Int16>::get(),
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
// properties which the OPropertyContainerHelper is responsible for
