Replace some macros in forms part 9

Change-Id: I3bd6e118455c8ce86650797e05b7e40ca066eb53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124784
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

25 files changed, 94 insertions, 97 deletions

diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 23b05370c380..dd8344cb9586 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_PROP1( BUTTONTYPE,             FormButtonType,             BOUND );
-        DECL_PROP1( DEFAULT_STATE,          sal_Int16,                  BOUND );
-        DECL_PROP1( DISPATCHURLINTERNAL,    sal_Bool,                   BOUND );
-        DECL_PROP1( TARGET_URL,             OUString,            BOUND );
-        DECL_PROP1( TARGET_FRAME,           OUString,            BOUND );
-        DECL_PROP1( TABINDEX,               sal_Int16,                  BOUND );
+        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);
     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 033f6013d4ab..cc9f618be124 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_PROP1(TABINDEX,        sal_Int16,          BOUND);
+        DECL_PROP_IMPL(TABINDEX, sal_Int16) 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 bdea1e4009ae..cab7d72ff52b 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_PROP1(LABEL,               OUString,    BOUND);
+    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_HIDDEN, PROPERTY_ID_HIDDEN, cppu::UnoType<bool>::get(),
                                           css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT);
-    DECL_PROP1(COLUMNSERVICENAME,   OUString,    READONLY);
+    DECL_PROP_IMPL(COLUMNSERVICENAME, OUString) css::beans::PropertyAttribute::READONLY);
 }
 
 // Reference<XPropertySet>
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 5145fd084e12..a529c88f131c 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_PROP1(TABINDEX,            sal_Int16,                  BOUND);
-        DECL_PROP1(LISTSOURCETYPE,      ListSourceType, BOUND);
-        DECL_PROP1(LISTSOURCE,          OUString,            BOUND);
+        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_EMPTY_IS_NULL, PROPERTY_ID_EMPTY_IS_NULL, cppu::UnoType<bool>::get(),
                                               css::beans::PropertyAttribute::BOUND);
-        DECL_PROP1(DEFAULT_TEXT,        OUString,            BOUND);
-        DECL_PROP1(STRINGITEMLIST,      Sequence< OUString >,BOUND);
-        DECL_PROP1(TYPEDITEMLIST,       Sequence< Any >,        OPTIONAL);
+        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);
     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 4703d57e3220..f89c7a5bca32 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -164,7 +164,7 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co
     // 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_PROP1(TABINDEX,        sal_Int16,              BOUND);
+        DECL_PROP_IMPL(TABINDEX, sal_Int16) 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 9d0570288caa..30bf2538ebec 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1295,16 +1295,16 @@ 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_PROP1      ( NAME,             OUString,                BOUND                          );
-    DECL_PROP1      ( MASTERFIELDS,     Sequence< OUString >,    BOUND                          );
-    DECL_PROP1      ( DETAILFIELDS,     Sequence< OUString >,    BOUND                          );
+    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_INSERTONLY, PROPERTY_ID_INSERTONLY, cppu::UnoType<bool>::get(),
                                           css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT);
-    DECL_PROP1      ( NAVIGATION,       NavigationBarMode,       BOUND                          );
+    DECL_PROP_IMPL(NAVIGATION, NavigationBarMode) 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(),
@@ -1312,10 +1312,10 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
     *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_PROP1      ( TARGET_URL,       OUString,                BOUND                          );
-    DECL_PROP1      ( TARGET_FRAME,     OUString,                BOUND                          );
-    DECL_PROP1      ( SUBMIT_METHOD,    FormSubmitMethod,        BOUND                          );
-    DECL_PROP1      ( SUBMIT_ENCODING,  FormSubmitEncoding,      BOUND                          );
+    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_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);
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index d25ce9486bd6..8a4bbf29d674 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -146,8 +146,8 @@ void ODateModel::describeFixedProperties( Sequence< Property >& _rProps ) const
     _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_PROP1(TABINDEX,                sal_Int16,              BOUND);
-        DECL_PROP1(FORMATKEY,               sal_Int32,              TRANSIENT);
+        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_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 6dceef58b12c..240884bc469d 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_PROP_IMPL(DEFAULT_TEXT, OUString) 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_PROP1(TABINDEX,            sal_Int16,              BOUND);
+        DECL_PROP_IMPL(TABINDEX, sal_Int16) 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 e287a91db3c1..381f9495198b 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_PROP1(DEFAULT_TEXT,    OUString,    BOUND);
-        DECL_PROP1(TABINDEX,        sal_Int16,          BOUND);
+        DECL_PROP_IMPL(DEFAULT_TEXT, OUString) css::beans::PropertyAttribute::BOUND);
+        DECL_PROP_IMPL(TABINDEX, sal_Int16) 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 01bc6a8974a8..93791b3f5beb 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1012,13 +1012,13 @@ 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_PROP1      (NAME,        OUString,  BOUND);
+        DECL_PROP_IMPL(NAME, OUString) 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_PROP1      (TAG,         OUString,  BOUND);
-        DECL_PROP1      (GENERATEVBAEVENTS,         sal_Bool,  TRANSIENT);
-        DECL_PROP1      (CONTROL_TYPE_IN_MSO,sal_Int16,     BOUND);
-        DECL_PROP1      (OBJ_ID_IN_MSO,cppu::UnoUnsignedShortType,      BOUND);
+        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);
     DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), "<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?");
 }
 
@@ -2784,7 +2784,7 @@ void OBoundControlModel::describeFixedProperties( Sequence< Property >& _rProps
     sal_Int32 nOldCount = _rProps.getLength();
     _rProps.realloc( nOldCount + 5);
     css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
-        DECL_PROP1      ( CONTROLSOURCE,           OUString,     BOUND );
+        DECL_PROP_IMPL(CONTROLSOURCE, OUString) 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(),
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 0fb7b8eabbbd..d08b8f5aa021 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_PROP1(TABINDEX,            sal_Int16,              BOUND);
+        DECL_PROP_IMPL(TABINDEX, sal_Int16) 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 494359915cb1..4a5c78169b87 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -376,36 +376,36 @@ void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps )
 {
     _rProps.realloc(37);
     css::beans::Property* pProperties = _rProps.getArray();
-        DECL_PROP1(NAME,                OUString,    BOUND);
+        DECL_PROP_IMPL(NAME, OUString) css::beans::PropertyAttribute::BOUND);
         DECL_PROP_IMPL(CLASSID, sal_Int16) css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT);
-        DECL_PROP1(TAG,                 OUString,    BOUND);
-        DECL_PROP1(TABINDEX,            sal_Int16,          BOUND);
+        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_PROP1(ENABLED,             sal_Bool,           BOUND);
+        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_PROP1(BORDER,              sal_Int16,          BOUND);
+        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_PROP1(DEFAULTCONTROL,      OUString,    BOUND);
+        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_PROP1(HELPTEXT,            OUString,    BOUND);
-        DECL_PROP1(FONT_NAME,           OUString,    MAYBEDEFAULT);
-        DECL_PROP1(FONT_STYLENAME,      OUString,    MAYBEDEFAULT);
-        DECL_PROP1(FONT_FAMILY,         sal_Int16,          MAYBEDEFAULT);
-        DECL_PROP1(FONT_CHARSET,        sal_Int16,          MAYBEDEFAULT);
-        DECL_PROP1(FONT_HEIGHT,         float,              MAYBEDEFAULT);
-        DECL_PROP1(FONT_WEIGHT,         float,              MAYBEDEFAULT);
-        DECL_PROP1(FONT_SLANT,          sal_Int16,          MAYBEDEFAULT);
-        DECL_PROP1(FONT_UNDERLINE,      sal_Int16,          MAYBEDEFAULT);
+        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_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_PROP1(FONT_STRIKEOUT,      sal_Int16,          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 |
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index c337cd3c5009..ecb3c32f7bac 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -109,9 +109,9 @@ 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_PROP1(HIDDEN_VALUE,    OUString,    BOUND);
-        DECL_PROP1(NAME,            OUString,    BOUND);
-        DECL_PROP1(TAG,             OUString,    BOUND);
+        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);
     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 580593b3c601..fb88396d6008 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_PROP1(BUTTONTYPE,          FormButtonType,     BOUND);
-        DECL_PROP1(DISPATCHURLINTERNAL, sal_Bool,           BOUND);
-        DECL_PROP1(TARGET_URL,          OUString,    BOUND);
-        DECL_PROP1(TARGET_FRAME,        OUString,    BOUND);
-        DECL_PROP1(TABINDEX,            sal_Int16,          BOUND);
+        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);
     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 4e7950975894..614f7d576e5b 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_PROP1      ( IMAGE_URL, OUString, BOUND );
+        DECL_PROP_IMPL(IMAGE_URL, OUString) css::beans::PropertyAttribute::BOUND);
     *pProperties++ = css::beans::Property(PROPERTY_READONLY, PROPERTY_ID_READONLY, cppu::UnoType<bool>::get(),
                                           css::beans::PropertyAttribute::BOUND);
-        DECL_PROP1      ( TABINDEX,  sal_Int16,       BOUND );
+        DECL_PROP_IMPL(TABINDEX, sal_Int16) 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 8302ac05e25d..e93f8ffef87e 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_PROP1(TABINDEX,            sal_Int16,                      BOUND);
+            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_PROP1(LISTSOURCETYPE,      ListSourceType,                 BOUND);
-            DECL_PROP1(LISTSOURCE,          css::uno::Sequence<OUString>,                 BOUND);
+            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_PROP1(DEFAULT_SELECT_SEQ,  Sequence<sal_Int16>,            BOUND);
-            DECL_PROP1(STRINGITEMLIST,      Sequence< OUString >,    BOUND);
-            DECL_PROP1(TYPEDITEMLIST,       Sequence< Any >,    OPTIONAL);
+            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);
         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 9041920753d5..c5bebf4c6650 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -115,7 +115,7 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con
     _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_PROP1(TABINDEX,        sal_Int16,          BOUND);
+        DECL_PROP_IMPL(TABINDEX, sal_Int16) 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 61b0249999c5..28ffd891cbd1 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -105,7 +105,7 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con
         DECL_PROP_IMPL(DEFAULT_TEXT, OUString) 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_PROP1(TABINDEX,        sal_Int16,          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);
     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 f07d9894e0aa..ccb541dd1265 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_PROP1(TABINDEX,            sal_Int16,                  BOUND);
+        DECL_PROP_IMPL(TABINDEX, sal_Int16) 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 48bee4fe7804..2c435e09b6be 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -151,8 +151,8 @@ void OTimeModel::describeFixedProperties( Sequence< Property >& _rProps ) const
     _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_PROP1(TABINDEX,                sal_Int16,              BOUND);
-        DECL_PROP1(FORMATKEY,               sal_Int32,              TRANSIENT);
+        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_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 e0d6194792ab..589a77930a75 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -199,22 +199,22 @@ namespace frm
         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);
 
-        DECL_PROP1      ( FONT_CHARWIDTH,     float,            MAYBEDEFAULT );
+        DECL_PROP_IMPL(FONT_CHARWIDTH, float) css::beans::PropertyAttribute::MAYBEDEFAULT);
         *pProperties++ = css::beans::Property(PROPERTY_FONT_KERNING, PROPERTY_ID_FONT_KERNING, cppu::UnoType<bool>::get(),
                                               css::beans::PropertyAttribute::MAYBEDEFAULT);
-        DECL_PROP1      ( FONT_ORIENTATION,   float,            MAYBEDEFAULT );
-        DECL_PROP1      ( FONT_PITCH,         sal_Int16,        MAYBEDEFAULT );
-        DECL_PROP1      ( FONT_TYPE,          sal_Int16,        MAYBEDEFAULT );
-        DECL_PROP1      ( FONT_WIDTH,         sal_Int16,        MAYBEDEFAULT );
-        DECL_PROP1      ( FONT_NAME,          OUString,  MAYBEDEFAULT );
-        DECL_PROP1      ( FONT_STYLENAME,     OUString,  MAYBEDEFAULT );
-        DECL_PROP1      ( FONT_FAMILY,        sal_Int16,        MAYBEDEFAULT );
-        DECL_PROP1      ( FONT_CHARSET,       sal_Int16,        MAYBEDEFAULT );
-        DECL_PROP1      ( FONT_HEIGHT,        float,            MAYBEDEFAULT );
-        DECL_PROP1      ( FONT_WEIGHT,        float,            MAYBEDEFAULT );
-        DECL_PROP1      ( FONT_SLANT,         sal_Int16,        MAYBEDEFAULT );
-        DECL_PROP1      ( FONT_UNDERLINE,     sal_Int16,        MAYBEDEFAULT );
-        DECL_PROP1      ( FONT_STRIKEOUT,     sal_Int16,        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_WORDLINEMODE, PROPERTY_ID_FONT_WORDLINEMODE, cppu::UnoType<bool>::get(),
                                               css::beans::PropertyAttribute::MAYBEDEFAULT);
     }
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index e8177a20fab7..50481b13b722 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_PROP1( REFVALUE,       OUString,    BOUND );
-            DECL_PROP1( DEFAULT_STATE, sal_Int16,          BOUND );
-            DECL_PROP1( UNCHECKED_REFVALUE, OUString,    BOUND );
+            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);
         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 b03e0edecbdd..97df377fd205 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -140,8 +140,8 @@ namespace frm
         sal_Int32 nOldCount = _rProps.getLength();
         _rProps.realloc( nOldCount + 3);
         css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
-            DECL_PROP1( DEFAULT_SCROLL_VALUE, sal_Int32,       BOUND );
-            DECL_PROP1( TABINDEX,             sal_Int16,       BOUND );
+            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);
         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 71ab77f7b474..a237ef7bad83 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -94,8 +94,8 @@ namespace frm
         sal_Int32 nOldCount = _rProps.getLength();
         _rProps.realloc( nOldCount + 3);
         css::beans::Property* pProperties = _rProps.getArray() + nOldCount;
-            DECL_PROP1( DEFAULT_SPIN_VALUE,   sal_Int32,       BOUND );
-            DECL_PROP1( TABINDEX,             sal_Int16,       BOUND );
+            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);
         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 3282b4a01ab7..47f93836352f 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -340,9 +340,6 @@ public:
 #define DECL_PROP_IMPL(varname, type) \
     *pProperties++ = css::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cppu::UnoType<type>::get(),
 
-#define DECL_PROP1(varname, type, attrib1)  \
-        DECL_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1)
-
 }
 //... namespace frm .......................................................