diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2021-11-05 19:12:25 +0100 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2021-11-05 20:09:24 +0100 |
commit | 7b6554851fb4cc620f4720f6ad3f394fa0a8995f (patch) | |
tree | efda17b6ee4552f845b028fbac9eeae85503a91b /forms | |
parent | 5bfbaf3c80987d1f7e6b3d7ffe6896b9bc3687e6 (diff) |
Replace some macros in forms part 6
Remove DECL_BOOL_PROP_IMPL + BEGIN_DESCRIBE_BASE_PROPERTIES
Change-Id: I1a55c9de46ae741045002241a2b0f5dfa32db8c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124777
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/component/Columns.cxx | 3 | ||||
-rw-r--r-- | forms/source/component/ComboBox.cxx | 3 | ||||
-rw-r--r-- | forms/source/component/DatabaseForm.cxx | 18 | ||||
-rw-r--r-- | forms/source/component/Edit.cxx | 6 | ||||
-rw-r--r-- | forms/source/component/FormComponent.cxx | 9 | ||||
-rw-r--r-- | forms/source/component/FormattedField.cxx | 6 | ||||
-rw-r--r-- | forms/source/component/Grid.cxx | 6 | ||||
-rw-r--r-- | forms/source/component/Hidden.cxx | 3 | ||||
-rw-r--r-- | forms/source/component/ImageControl.cxx | 3 | ||||
-rw-r--r-- | forms/source/component/Pattern.cxx | 3 | ||||
-rw-r--r-- | forms/source/component/formcontrolfont.cxx | 6 | ||||
-rw-r--r-- | forms/source/inc/property.hxx | 9 |
12 files changed, 44 insertions, 31 deletions
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx index 9d44851e6037..bdea1e4009ae 100644 --- a/forms/source/component/Columns.cxx +++ b/forms/source/component/Columns.cxx @@ -348,7 +348,8 @@ void OGridColumn::setOwnProperties(Sequence<Property>& aDescriptor) DECL_PROP1(LABEL, OUString, 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); - DECL_BOOL_PROP_IMPL(HIDDEN) css::beans::PropertyAttribute::BOUND | 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); } diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx index ce61560f1c70..e63997e16294 100644 --- a/forms/source/component/ComboBox.cxx +++ b/forms/source/component/ComboBox.cxx @@ -295,7 +295,8 @@ void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co DECL_PROP1(TABINDEX, sal_Int16, BOUND); DECL_PROP1(LISTSOURCETYPE, ListSourceType, BOUND); DECL_PROP1(LISTSOURCE, OUString, BOUND); - DECL_BOOL_PROP_IMPL(EMPTY_IS_NULL) 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); diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 0604103f4322..62a95776492b 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -1293,7 +1293,8 @@ void ODatabaseForm::describeFixedAndAggregateProperties( *pProperties++ = css::beans::Property(PROPERTY_ACTIVE_CONNECTION, PROPERTY_ID_ACTIVE_CONNECTION, cppu::UnoType<XConnection>::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); + *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 ); @@ -1301,17 +1302,22 @@ void ODatabaseForm::describeFixedAndAggregateProperties( 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); - DECL_BOOL_PROP_IMPL(INSERTONLY) 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_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); + *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_PROP1 ( TARGET_URL, OUString, BOUND ); DECL_PROP1 ( TARGET_FRAME, OUString, BOUND ); DECL_PROP1 ( SUBMIT_METHOD, FormSubmitMethod, BOUND ); DECL_PROP1 ( SUBMIT_ENCODING, FormSubmitEncoding, BOUND ); - DECL_BOOL_PROP_IMPL(DYNAMIC_CONTROL_BORDER) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEVOID | css::beans::PropertyAttribute::MAYBEDEFAULT ); + *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); diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx index d723ca4ebfaa..c47d50a2e983 100644 --- a/forms/source/component/Edit.cxx +++ b/forms/source/component/Edit.cxx @@ -352,9 +352,11 @@ void OEditModel::describeFixedProperties( Sequence< Property >& _rProps ) const BEGIN_DESCRIBE_PROPERTIES( 5, OEditBaseModel ) 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); + *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_BOOL_PROP_IMPL(FILTERPROPOSAL) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); + *pProperties++ = css::beans::Property(PROPERTY_FILTERPROPOSAL, PROPERTY_ID_FILTERPROPOSAL, cppu::UnoType<bool>::get(), + css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); END_DESCRIBE_PROPERTIES(); } diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index fe2b55e73149..6912724a6efe 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -1009,10 +1009,12 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A void OControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const { - BEGIN_DESCRIBE_BASE_PROPERTIES( 7 ) + _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_BOOL_PROP_IMPL(NATIVE_LOOK) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::TRANSIENT); + *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); @@ -2785,7 +2787,8 @@ void OBoundControlModel::describeFixedProperties( Sequence< Property >& _rProps *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); - DECL_BOOL_PROP_IMPL(INPUT_REQUIRED) css::beans::PropertyAttribute::BOUND); + *pProperties++ = css::beans::Property(PROPERTY_INPUT_REQUIRED, PROPERTY_ID_INPUT_REQUIRED, cppu::UnoType<bool>::get(), + css::beans::PropertyAttribute::BOUND); END_DESCRIBE_PROPERTIES() } } diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 62d472d898ff..2a2ee176fa54 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -340,9 +340,11 @@ OUString SAL_CALL OFormattedModel::getServiceName() void OFormattedModel::describeFixedProperties( Sequence< Property >& _rProps ) const { BEGIN_DESCRIBE_PROPERTIES( 3, OEditBaseModel ) - DECL_BOOL_PROP_IMPL(EMPTY_IS_NULL) 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(TABINDEX, sal_Int16, BOUND); - DECL_BOOL_PROP_IMPL(FILTERPROPOSAL) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); + *pProperties++ = css::beans::Property(PROPERTY_FILTERPROPOSAL, PROPERTY_ID_FILTERPROPOSAL, cppu::UnoType<bool>::get(), + css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); END_DESCRIBE_PROPERTIES(); } diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx index a23a73b20ad1..0f6748c0daee 100644 --- a/forms/source/component/Grid.cxx +++ b/forms/source/component/Grid.cxx @@ -374,7 +374,8 @@ void OGridControlModel::_reset() // XPropertySet void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const { - BEGIN_DESCRIBE_BASE_PROPERTIES( 37 ) + _rProps.realloc(37); + css::beans::Property* pProperties = _rProps.getArray(); DECL_PROP1(NAME, OUString, BOUND); DECL_PROP_IMPL(CLASSID, sal_Int16) css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); DECL_PROP1(TAG, OUString, BOUND); @@ -399,7 +400,8 @@ void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) DECL_PROP1(FONT_WEIGHT, float, MAYBEDEFAULT); DECL_PROP1(FONT_SLANT, sal_Int16, MAYBEDEFAULT); DECL_PROP1(FONT_UNDERLINE, sal_Int16, MAYBEDEFAULT); - DECL_BOOL_PROP_IMPL(FONT_WORDLINEMODE) 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); diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 328a6bf24711..8e31aa57b1b7 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -106,7 +106,8 @@ sal_Bool OHiddenModel::convertFastPropertyValue( void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) const { - BEGIN_DESCRIBE_BASE_PROPERTIES(4) + _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); diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index d5d17b4f8e6d..575509f04b74 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -314,7 +314,8 @@ void OImageControlModel::describeFixedProperties( Sequence< Property >& _rProps *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_BOOL_PROP_IMPL(READONLY) 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 ); END_DESCRIBE_PROPERTIES(); } diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx index f9a845bc7be9..78746ab1d683 100644 --- a/forms/source/component/Pattern.cxx +++ b/forms/source/component/Pattern.cxx @@ -100,7 +100,8 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con { BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel ) 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); + *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(FILTERPROPOSAL, sal_Bool) css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::MAYBEDEFAULT); END_DESCRIBE_PROPERTIES(); diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx index b6bba2e86fd6..e0d6194792ab 100644 --- a/forms/source/component/formcontrolfont.cxx +++ b/forms/source/component/formcontrolfont.cxx @@ -200,7 +200,8 @@ namespace frm 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_BOOL_PROP_IMPL(FONT_KERNING) 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 ); @@ -214,7 +215,8 @@ namespace frm DECL_PROP1 ( FONT_SLANT, sal_Int16, MAYBEDEFAULT ); DECL_PROP1 ( FONT_UNDERLINE, sal_Int16, MAYBEDEFAULT ); DECL_PROP1 ( FONT_STRIKEOUT, sal_Int16, MAYBEDEFAULT ); - DECL_BOOL_PROP_IMPL(FONT_WORDLINEMODE) 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/inc/property.hxx b/forms/source/inc/property.hxx index de1a09861b34..23154da5f054 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -341,10 +341,6 @@ public: *pProperties++ = css::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cppu::UnoType<type>::get(), -#define DECL_BOOL_PROP_IMPL(varname) \ - *pProperties++ = css::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cppu::UnoType<bool>::get(), - - #define BEGIN_DESCRIBE_PROPERTIES( count, baseclass ) \ baseclass::describeFixedProperties( _rProps ); \ sal_Int32 nOldCount = _rProps.getLength(); \ @@ -352,11 +348,6 @@ public: css::beans::Property* pProperties = _rProps.getArray() + nOldCount; \ -#define BEGIN_DESCRIBE_BASE_PROPERTIES( count ) \ - _rProps.realloc( count ); \ - css::beans::Property* pProperties = _rProps.getArray(); \ - - #define DECL_PROP1(varname, type, attrib1) \ DECL_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1) |