forms/source/component/Button.cxx | 2 +-
forms/source/component/CheckBox.cxx | 2 +-
forms/source/component/ComboBox.cxx | 2 +-
forms/source/component/Currency.cxx | 2 +-
forms/source/component/DatabaseForm.cxx | 2 +-
forms/source/component/Date.cxx | 2 +-
forms/source/component/Edit.cxx | 2 +-
forms/source/component/File.cxx | 2 +-
forms/source/component/FormComponent.cxx | 4 ++--
forms/source/component/FormattedField.cxx | 2 +-
forms/source/component/Grid.cxx | 2 +-
forms/source/component/Hidden.cxx | 2 +-
forms/source/component/ImageButton.cxx | 2 +-
forms/source/component/ImageControl.cxx | 2 +-
forms/source/component/ListBox.cxx | 2 +-
forms/source/component/Numeric.cxx | 2 +-
forms/source/component/Pattern.cxx | 2 +-
forms/source/component/RadioButton.cxx | 2 +-
forms/source/component/Time.cxx | 2 +-
forms/source/component/navigationbar.cxx | 2 +-
forms/source/component/refvaluecomponent.cxx | 2 +-
forms/source/component/scrollbar.cxx | 2 +-
forms/source/component/spinbutton.cxx | 2 +-
forms/source/inc/property.hxx | 3 ---
forms/source/richtext/richtextmodel.cxx | 2 +-
25 files changed, 25 insertions(+), 28 deletions(-)
New commits:
commit 642a03393580f142ef4b703b0164b8142c780129
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Nov 5 22:43:14 2021 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Fri Nov 5 23:34:46 2021 +0100
Replace some macros in forms part 8
Remove END_DESCRIBE_PROPERTIES
Change-Id: I844b71cd74f2b2c5306d0ad979ed56480892268c
Change-Id: Ia0aa75a3042ecc47bf434afb0de971d35ab78dfa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124783
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 a52a423398cf..b63ba6752192 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -108,7 +108,7 @@ void OButtonModel::describeFixedProperties( Sequence<
Property >& _rProps ) cons
DECL_PROP1( TARGET_URL, OUString, BOUND );
DECL_PROP1( TARGET_FRAME, OUString, BOUND );
DECL_PROP1( TABINDEX, sal_Int16, BOUND
);
- END_DESCRIBE_PROPERTIES();
+ 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 c91c903e0df5..f1ab6469d5e9 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -111,7 +111,7 @@ void OCheckBoxModel::describeFixedProperties( Sequence<
Property >& _rProps ) co
{
BEGIN_DESCRIBE_PROPERTIES( 1, OReferenceValueComponent )
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
- END_DESCRIBE_PROPERTIES();
+ DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/ComboBox.cxx
b/forms/source/component/ComboBox.cxx
index e63997e16294..1b50e28ceb02 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -300,7 +300,7 @@ void OComboBoxModel::describeFixedProperties( Sequence<
Property >& _rProps ) co
DECL_PROP1(DEFAULT_TEXT, OUString, BOUND);
DECL_PROP1(STRINGITEMLIST, Sequence< OUString >,BOUND);
DECL_PROP1(TYPEDITEMLIST, Sequence< Any >, OPTIONAL);
- END_DESCRIBE_PROPERTIES();
+ 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 b95d0ad9f74b..4ef9f5a379ff 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -162,7 +162,7 @@ void OCurrencyModel::describeFixedProperties( Sequence<
Property >& _rProps ) co
DECL_PROP_IMPL(DEFAULT_VALUE, double)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
- END_DESCRIBE_PROPERTIES();
+ 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 62a95776492b..9d0570288caa 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1321,7 +1321,7 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
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);
- END_DESCRIBE_PROPERTIES();
+ 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 6222ad392e2c..287d0912585d 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -147,7 +147,7 @@ void ODateModel::describeFixedProperties( Sequence<
Property >& _rProps ) const
DECL_PROP1(FORMATKEY, sal_Int32, TRANSIENT);
*pProperties++ = css::beans::Property(PROPERTY_FORMATSSUPPLIER,
PROPERTY_ID_FORMATSSUPPLIER, cppu::UnoType<XNumberFormatsSupplier>::get(),
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
- END_DESCRIBE_PROPERTIES();
+ 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 c47d50a2e983..ed6f331b9f02 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -357,7 +357,7 @@ void OEditModel::describeFixedProperties( Sequence<
Property >& _rProps ) const
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
*pProperties++ = css::beans::Property(PROPERTY_FILTERPROPOSAL,
PROPERTY_ID_FILTERPROPOSAL, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::MAYBEDEFAULT);
- END_DESCRIBE_PROPERTIES();
+ 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 e92f168d3de3..7332f048c4cd 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -173,7 +173,7 @@ void OFileControlModel::describeFixedProperties( Sequence<
Property >& _rProps )
BEGIN_DESCRIBE_PROPERTIES( 2, OControlModel )
DECL_PROP1(DEFAULT_TEXT, OUString, BOUND);
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
- END_DESCRIBE_PROPERTIES();
+ 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 6912724a6efe..764eb349baa9 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1019,7 +1019,7 @@ void OControlModel::describeFixedProperties( Sequence<
Property >& _rProps ) con
DECL_PROP1 (GENERATEVBAEVENTS, sal_Bool, TRANSIENT);
DECL_PROP1 (CONTROL_TYPE_IN_MSO,sal_Int16, BOUND);
DECL_PROP1 (OBJ_ID_IN_MSO,cppu::UnoUnsignedShortType, BOUND);
- END_DESCRIBE_PROPERTIES()
+ DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
void OControlModel::describeAggregateProperties( Sequence< Property >& /*
[out] */ _rAggregateProps ) const
@@ -2789,7 +2789,7 @@ void OBoundControlModel::describeFixedProperties(
Sequence< Property >& _rProps
DECL_PROP_IMPL(CONTROLSOURCEPROPERTY, OUString)
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);
- END_DESCRIBE_PROPERTIES()
+ 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 2a2ee176fa54..a09fce0a81bf 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -345,7 +345,7 @@ void OFormattedModel::describeFixedProperties( Sequence<
Property >& _rProps ) c
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
*pProperties++ = css::beans::Property(PROPERTY_FILTERPROPOSAL,
PROPERTY_ID_FILTERPROPOSAL, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND
| css::beans::PropertyAttribute::MAYBEDEFAULT);
- END_DESCRIBE_PROPERTIES();
+ DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
void OFormattedModel::describeAggregateProperties( Sequence< Property >&
_rAggregateProps ) const
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 0f6748c0daee..494359915cb1 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -415,7 +415,7 @@ void OGridControlModel::describeFixedProperties( Sequence<
Property >& _rProps )
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);
- END_DESCRIBE_PROPERTIES();
+ 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 8e31aa57b1b7..c337cd3c5009 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -112,7 +112,7 @@ void OHiddenModel::describeFixedProperties( Sequence<
Property >& _rProps ) cons
DECL_PROP1(HIDDEN_VALUE, OUString, BOUND);
DECL_PROP1(NAME, OUString, BOUND);
DECL_PROP1(TAG, OUString, BOUND);
- END_DESCRIBE_PROPERTIES();
+ DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
// XServiceInfo
diff --git a/forms/source/component/ImageButton.cxx
b/forms/source/component/ImageButton.cxx
index ef3fda257123..bb0cab6bb7db 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -81,7 +81,7 @@ void OImageButtonModel::describeFixedProperties( Sequence<
Property >& _rProps )
DECL_PROP1(TARGET_URL, OUString, BOUND);
DECL_PROP1(TARGET_FRAME, OUString, BOUND);
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
- END_DESCRIBE_PROPERTIES();
+ DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
OUString OImageButtonModel::getServiceName()
diff --git a/forms/source/component/ImageControl.cxx
b/forms/source/component/ImageControl.cxx
index 575509f04b74..da46a5de75fb 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -317,7 +317,7 @@ void OImageControlModel::describeFixedProperties( Sequence<
Property >& _rProps
*pProperties++ = css::beans::Property(PROPERTY_READONLY,
PROPERTY_ID_READONLY, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND);
DECL_PROP1 ( TABINDEX, sal_Int16, BOUND );
- END_DESCRIBE_PROPERTIES();
+ 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 db545eb949b1..8e2b5cb50027 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -498,7 +498,7 @@ namespace frm
DECL_PROP1(DEFAULT_SELECT_SEQ, Sequence<sal_Int16>,
BOUND);
DECL_PROP1(STRINGITEMLIST, Sequence< OUString >, BOUND);
DECL_PROP1(TYPEDITEMLIST, Sequence< Any >, OPTIONAL);
- END_DESCRIBE_PROPERTIES();
+ 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 a9e75c4afdb3..3b14db388bdc 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -113,7 +113,7 @@ void ONumericModel::describeFixedProperties( Sequence<
Property >& _rProps ) con
BEGIN_DESCRIBE_PROPERTIES( 2, OEditBaseModel )
DECL_PROP_IMPL(DEFAULT_VALUE, double)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID);
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
- END_DESCRIBE_PROPERTIES();
+ 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 78746ab1d683..8832a11e9abf 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -104,7 +104,7 @@ void OPatternModel::describeFixedProperties( Sequence<
Property >& _rProps ) con
css::beans::PropertyAttribute::BOUND);
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
DECL_PROP_IMPL(FILTERPROPOSAL, sal_Bool)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- END_DESCRIBE_PROPERTIES();
+ 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 d066e26a6e7e..43fe2d96e777 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -240,7 +240,7 @@ void ORadioButtonModel::describeFixedProperties( Sequence<
Property >& _rProps )
{
BEGIN_DESCRIBE_PROPERTIES( 1, OReferenceValueComponent )
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
- END_DESCRIBE_PROPERTIES();
+ 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 920aa145c17d..0248200ee5c7 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -152,7 +152,7 @@ void OTimeModel::describeFixedProperties( Sequence<
Property >& _rProps ) const
DECL_PROP1(FORMATKEY, sal_Int32, TRANSIENT);
*pProperties++ = css::beans::Property(PROPERTY_FORMATSSUPPLIER,
PROPERTY_ID_FORMATSSUPPLIER, cppu::UnoType<XNumberFormatsSupplier>::get(),
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
- END_DESCRIBE_PROPERTIES();
+ DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
}
diff --git a/forms/source/component/navigationbar.cxx
b/forms/source/component/navigationbar.cxx
index c66d7647e16d..fbbe8ffe4d17 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -449,7 +449,7 @@ namespace frm
{
BEGIN_DESCRIBE_PROPERTIES( 1, OControlModel )
DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- END_DESCRIBE_PROPERTIES();
+ DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
// properties which the OPropertyContainerHelper is responsible for
Sequence< Property > aContainedProperties;
diff --git a/forms/source/component/refvaluecomponent.cxx
b/forms/source/component/refvaluecomponent.cxx
index 559d3bd86543..00d204d0de31 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -158,7 +158,7 @@ namespace frm
DECL_PROP1( REFVALUE, OUString, BOUND );
DECL_PROP1( DEFAULT_STATE, sal_Int16, BOUND );
DECL_PROP1( UNCHECKED_REFVALUE, OUString, BOUND );
- END_DESCRIBE_PROPERTIES();
+ 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 5bdae537b4ab..19bf772d0e76 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -140,7 +140,7 @@ namespace frm
DECL_PROP1( DEFAULT_SCROLL_VALUE, sal_Int32, BOUND );
DECL_PROP1( TABINDEX, sal_Int16, BOUND );
DECL_PROP_IMPL(CONTROLSOURCEPROPERTY, OUString)
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
- END_DESCRIBE_PROPERTIES();
+ 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 bf8834b813ba..dad2cd94ace3 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -94,7 +94,7 @@ namespace frm
DECL_PROP1( DEFAULT_SPIN_VALUE, sal_Int32, BOUND );
DECL_PROP1( TABINDEX, sal_Int16, BOUND );
DECL_PROP_IMPL(CONTROLSOURCEPROPERTY, OUString)
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
- END_DESCRIBE_PROPERTIES();
+ 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 23154da5f054..37fca9e7dabb 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -351,9 +351,6 @@ public:
#define DECL_PROP1(varname, type, attrib1) \
DECL_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1)
-#define END_DESCRIBE_PROPERTIES() \
- DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?"); \
-
}
//... namespace frm .......................................................
diff --git a/forms/source/richtext/richtextmodel.cxx
b/forms/source/richtext/richtextmodel.cxx
index 23ad66f5ff64..ce61725a5cd4 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -312,7 +312,7 @@ namespace frm
{
BEGIN_DESCRIBE_PROPERTIES( 1, OControlModel )
DECL_PROP_IMPL(TABINDEX, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
- END_DESCRIBE_PROPERTIES();
+ DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
// properties which the OPropertyContainerHelper is responsible for
Sequence< Property > aContainedProperties;
