From 5bfbaf3c80987d1f7e6b3d7ffe6896b9bc3687e6 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Fri, 5 Nov 2021 17:47:23 +0100 Subject: Replace some macros in forms part 5 Remove DECL_IFACE_PROP_IMPL + DECL_PROP0 + DECL_PROP2 Change-Id: I8bd0222244a4cb0db33fa890056bf00e240fb4fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124769 Tested-by: Jenkins Reviewed-by: Julien Nabet --- forms/source/component/DatabaseForm.cxx | 11 ++++++----- forms/source/component/Date.cxx | 3 ++- forms/source/component/Edit.cxx | 4 ++-- forms/source/component/FormComponent.cxx | 10 ++++++---- forms/source/component/Grid.cxx | 22 +++++++++++----------- forms/source/component/Hidden.cxx | 2 +- forms/source/component/ImageControl.cxx | 3 ++- forms/source/component/ListBox.cxx | 6 +++--- forms/source/component/Pattern.cxx | 4 ++-- forms/source/component/Time.cxx | 3 ++- forms/source/component/formcontrolfont.cxx | 6 +++--- forms/source/component/navigationbar.cxx | 2 +- forms/source/component/scrollbar.cxx | 2 +- forms/source/component/spinbutton.cxx | 2 +- forms/source/inc/property.hxx | 13 ------------- forms/source/richtext/richtextmodel.cxx | 2 +- 16 files changed, 44 insertions(+), 51 deletions(-) diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 814760174d0c..0604103f4322 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -1290,22 +1290,23 @@ void ODatabaseForm::describeFixedAndAggregateProperties( RemoveProperty( _rAggregateProps, PROPERTY_HAVINGCLAUSE ); RemoveProperty( _rAggregateProps, PROPERTY_APPLYFILTER ); - DECL_IFACE_PROP_IMPL(ACTIVE_CONNECTION, XConnection) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::TRANSIENT | + *pProperties++ = css::beans::Property(PROPERTY_ACTIVE_CONNECTION, PROPERTY_ID_ACTIVE_CONNECTION, cppu::UnoType::get(), + css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::TRANSIENT | css::beans::PropertyAttribute::MAYBEVOID | PropertyAttribute::CONSTRAINED); DECL_BOOL_PROP_IMPL(APPLYFILTER) 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_PROP2 ( DATASOURCE, OUString, BOUND, CONSTRAINED ); + 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_PROP2 ( FILTER, OUString, BOUND, MAYBEDEFAULT ); - DECL_PROP2 ( HAVINGCLAUSE, OUString, BOUND, 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); DECL_BOOL_PROP_IMPL(INSERTONLY) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); DECL_PROP1 ( NAVIGATION, NavigationBarMode, BOUND ); DECL_BOOL_PROP_IMPL(ALLOWADDITIONS) css::beans::PropertyAttribute::BOUND); DECL_BOOL_PROP_IMPL(ALLOWEDITS) css::beans::PropertyAttribute::BOUND); DECL_BOOL_PROP_IMPL(ALLOWDELETIONS) css::beans::PropertyAttribute::BOUND); - DECL_PROP2 ( PRIVILEGES, sal_Int32, TRANSIENT, READONLY ); + 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 ); diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx index 503a2e22d17a..6222ad392e2c 100644 --- a/forms/source/component/Date.cxx +++ b/forms/source/component/Date.cxx @@ -145,7 +145,8 @@ void ODateModel::describeFixedProperties( Sequence< Property >& _rProps ) const 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_IFACE_PROP_IMPL(FORMATSSUPPLIER, XNumberFormatsSupplier) css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); + *pProperties++ = css::beans::Property(PROPERTY_FORMATSSUPPLIER, PROPERTY_ID_FORMATSSUPPLIER, cppu::UnoType::get(), + css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); END_DESCRIBE_PROPERTIES(); } diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index b8119211b08e..d723ca4ebfaa 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -350,8 +350,8 @@ void SAL_CALL OEditModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) void OEditModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 5, OEditBaseModel ) - DECL_PROP2(PERSISTENCE_MAXTEXTLENGTH,sal_Int16, READONLY, TRANSIENT); - DECL_PROP2(DEFAULT_TEXT, OUString, BOUND, MAYBEDEFAULT); + 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); DECL_BOOL_PROP_IMPL(EMPTY_IS_NULL) css::beans::PropertyAttribute::BOUND); DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_BOOL_PROP_IMPL(FILTERPROPOSAL) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 98ceef3d467c..fe2b55e73149 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -1010,7 +1010,7 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A void OControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_BASE_PROPERTIES( 7 ) - DECL_PROP2 (CLASSID, sal_Int16, READONLY, TRANSIENT); + DECL_PROP_IMPL(CLASSID, sal_Int16) css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); DECL_PROP1 (NAME, OUString, BOUND); DECL_BOOL_PROP_IMPL(NATIVE_LOOK) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::TRANSIENT); DECL_PROP1 (TAG, OUString, BOUND); @@ -2780,9 +2780,11 @@ void OBoundControlModel::describeFixedProperties( Sequence< Property >& _rProps { BEGIN_DESCRIBE_PROPERTIES( 5, OControlModel ) DECL_PROP1 ( CONTROLSOURCE, OUString, BOUND ); - DECL_IFACE_PROP_IMPL(BOUNDFIELD, XPropertySet) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); - DECL_IFACE_PROP_IMPL(CONTROLLABEL, XPropertySet) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID); - DECL_PROP2 ( CONTROLSOURCEPROPERTY, OUString, READONLY, TRANSIENT ); + *pProperties++ = css::beans::Property(PROPERTY_BOUNDFIELD, PROPERTY_ID_BOUNDFIELD, cppu::UnoType::get(), + css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); + *pProperties++ = css::beans::Property(PROPERTY_CONTROLLABEL, PROPERTY_ID_CONTROLLABEL, cppu::UnoType::get(), + css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID); + DECL_PROP_IMPL(CONTROLSOURCEPROPERTY, OUString) css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); DECL_BOOL_PROP_IMPL(INPUT_REQUIRED) css::beans::PropertyAttribute::BOUND); END_DESCRIBE_PROPERTIES() } diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index bf1b26634bb0..a23a73b20ad1 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -376,19 +376,19 @@ void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) { BEGIN_DESCRIBE_BASE_PROPERTIES( 37 ) DECL_PROP1(NAME, OUString, BOUND); - DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT); + 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(TABSTOP, sal_Bool) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT | css::beans::PropertyAttribute::MAYBEVOID); - DECL_PROP2(HASNAVIGATION, sal_Bool, BOUND, MAYBEDEFAULT); + DECL_PROP_IMPL(HASNAVIGATION, sal_Bool) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); DECL_PROP1(ENABLED, sal_Bool, BOUND); - DECL_PROP2(ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT); + DECL_PROP_IMPL(ENABLEVISIBLE, sal_Bool) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); DECL_PROP1(BORDER, sal_Int16, BOUND); - DECL_PROP2(BORDERCOLOR, sal_Int16, BOUND, MAYBEVOID); + DECL_PROP_IMPL(BORDERCOLOR, sal_Int16) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID); DECL_PROP1(DEFAULTCONTROL, OUString, 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_PROP2(FONT, FontDescriptor, BOUND, MAYBEDEFAULT); + 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); @@ -401,17 +401,17 @@ void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) DECL_PROP1(FONT_UNDERLINE, sal_Int16, MAYBEDEFAULT); DECL_BOOL_PROP_IMPL(FONT_WORDLINEMODE) css::beans::PropertyAttribute::MAYBEDEFAULT); DECL_PROP_IMPL(TEXTLINECOLOR, sal_Int32) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT | css::beans::PropertyAttribute::MAYBEVOID); - DECL_PROP2(FONTEMPHASISMARK, sal_Int16, BOUND, MAYBEDEFAULT); - DECL_PROP2(FONTRELIEF, sal_Int16, BOUND, 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_PROP1(FONT_STRIKEOUT, sal_Int16, MAYBEDEFAULT); - DECL_PROP2(RECORDMARKER, sal_Bool, BOUND, MAYBEDEFAULT ); - DECL_PROP2(PRINTABLE, sal_Bool, BOUND, 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_PROP2(HELPURL, OUString, BOUND, MAYBEDEFAULT); - DECL_PROP2(WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT); + 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(); } diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index ff19660cda3c..328a6bf24711 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -107,7 +107,7 @@ sal_Bool OHiddenModel::convertFastPropertyValue( void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_BASE_PROPERTIES(4) - DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT); + 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); diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 5077fbf58626..d5d17b4f8e6d 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -311,7 +311,8 @@ sal_Bool OImageControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& void OImageControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 4, OBoundControlModel ) - DECL_IFACE_PROP_IMPL(GRAPHIC, XGraphic) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::TRANSIENT); + *pProperties++ = css::beans::Property(PROPERTY_GRAPHIC, PROPERTY_ID_GRAPHIC, cppu::UnoType::get(), + css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::TRANSIENT); DECL_PROP1 ( IMAGE_URL, OUString, BOUND ); DECL_BOOL_PROP_IMPL(READONLY) css::beans::PropertyAttribute::BOUND); DECL_PROP1 ( TABINDEX, sal_Int16, BOUND ); diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 6c8f6fa7243d..db545eb949b1 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -489,12 +489,12 @@ namespace frm { BEGIN_DESCRIBE_PROPERTIES( 10, OBoundControlModel ) DECL_PROP1(TABINDEX, sal_Int16, BOUND); - DECL_PROP2(BOUNDCOLUMN, sal_Int16, BOUND, MAYBEVOID); + 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, BOUND); DECL_PROP_IMPL(VALUE_SEQ, css::uno::Sequence) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); - DECL_PROP2(SELECT_VALUE_SEQ, Sequence< Any >, BOUND, TRANSIENT); - DECL_PROP2(SELECT_VALUE, Any, BOUND, 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, BOUND); DECL_PROP1(STRINGITEMLIST, Sequence< OUString >, BOUND); DECL_PROP1(TYPEDITEMLIST, Sequence< Any >, OPTIONAL); diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index d6a3171e082d..f9a845bc7be9 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -99,10 +99,10 @@ css::uno::Sequence SAL_CALL OPatternModel::getSupportedServiceNames() void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel ) - DECL_PROP2(DEFAULT_TEXT, OUString, BOUND, MAYBEDEFAULT); + DECL_PROP_IMPL(DEFAULT_TEXT, OUString) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); DECL_BOOL_PROP_IMPL(EMPTY_IS_NULL) css::beans::PropertyAttribute::BOUND); DECL_PROP1(TABINDEX, sal_Int16, BOUND); - DECL_PROP2(FILTERPROPOSAL, sal_Bool, BOUND, MAYBEDEFAULT); + DECL_PROP_IMPL(FILTERPROPOSAL, sal_Bool) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); END_DESCRIBE_PROPERTIES(); } diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx index 6fc7b934d1b7..920aa145c17d 100644 --- a/forms/source/component/Time.cxx +++ b/forms/source/component/Time.cxx @@ -150,7 +150,8 @@ void OTimeModel::describeFixedProperties( Sequence< Property >& _rProps ) const 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_IFACE_PROP_IMPL(FORMATSSUPPLIER, XNumberFormatsSupplier) css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); + *pProperties++ = css::beans::Property(PROPERTY_FORMATSSUPPLIER, PROPERTY_ID_FORMATSSUPPLIER, cppu::UnoType::get(), + css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); END_DESCRIBE_PROPERTIES(); } diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index 3545e159a476..b6bba2e86fd6 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -193,9 +193,9 @@ namespace frm _rProps.realloc( nPos + 21 ); Property* pProperties = _rProps.getArray(); - DECL_PROP2 ( FONT, FontDescriptor, BOUND, MAYBEDEFAULT ); - DECL_PROP2 ( FONTEMPHASISMARK, sal_Int16, BOUND, MAYBEDEFAULT ); - DECL_PROP2 ( FONTRELIEF, sal_Int16, BOUND, MAYBEDEFAULT ); + 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); diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx index b3b386d2aefc..c66d7647e16d 100644 --- a/forms/source/component/navigationbar.cxx +++ b/forms/source/component/navigationbar.cxx @@ -448,7 +448,7 @@ namespace frm void ONavigationBarModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 1, OControlModel ) - DECL_PROP2( TABINDEX, sal_Int16, BOUND, MAYBEDEFAULT ); + DECL_PROP_IMPL(TABINDEX, sal_Int16) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); END_DESCRIBE_PROPERTIES(); // properties which the OPropertyContainerHelper is responsible for diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx index 4e18dd69ec56..5bdae537b4ab 100644 --- a/forms/source/component/scrollbar.cxx +++ b/forms/source/component/scrollbar.cxx @@ -139,7 +139,7 @@ namespace frm BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel ) DECL_PROP1( DEFAULT_SCROLL_VALUE, sal_Int32, BOUND ); DECL_PROP1( TABINDEX, sal_Int16, BOUND ); - DECL_PROP2( CONTROLSOURCEPROPERTY,OUString, READONLY, TRANSIENT ); + DECL_PROP_IMPL(CONTROLSOURCEPROPERTY, OUString) css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); END_DESCRIBE_PROPERTIES(); } diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx index db45651ab8a9..bf8834b813ba 100644 --- a/forms/source/component/spinbutton.cxx +++ b/forms/source/component/spinbutton.cxx @@ -93,7 +93,7 @@ namespace frm BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel ) DECL_PROP1( DEFAULT_SPIN_VALUE, sal_Int32, BOUND ); DECL_PROP1( TABINDEX, sal_Int16, BOUND ); - DECL_PROP2( CONTROLSOURCEPROPERTY,OUString, READONLY, TRANSIENT ); + DECL_PROP_IMPL(CONTROLSOURCEPROPERTY, OUString) css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); END_DESCRIBE_PROPERTIES(); } diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index 086428391c5a..de1a09861b34 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -345,10 +345,6 @@ public: *pProperties++ = css::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cppu::UnoType::get(), -#define DECL_IFACE_PROP_IMPL(varname, type) \ - *pProperties++ = css::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cppu::UnoType::get(), - - #define BEGIN_DESCRIBE_PROPERTIES( count, baseclass ) \ baseclass::describeFixedProperties( _rProps ); \ sal_Int32 nOldCount = _rProps.getLength(); \ @@ -361,18 +357,9 @@ public: css::beans::Property* pProperties = _rProps.getArray(); \ -#define DECL_PROP0(varname, type) \ - DECL_PROP_IMPL(varname, type) 0) - - #define DECL_PROP1(varname, type, attrib1) \ DECL_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1) - -#define DECL_PROP2(varname, type, attrib1, attrib2) \ - DECL_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2) - - #define END_DESCRIBE_PROPERTIES() \ DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(), "<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?"); \ diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index edd2e3ff6ab7..23ad66f5ff64 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -311,7 +311,7 @@ namespace frm void ORichTextModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 1, OControlModel ) - DECL_PROP2( TABINDEX, sal_Int16, BOUND, MAYBEDEFAULT ); + DECL_PROP_IMPL(TABINDEX, sal_Int16) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); END_DESCRIBE_PROPERTIES(); // properties which the OPropertyContainerHelper is responsible for -- cgit