forms/source/component/Columns.cxx | 4 ++--
forms/source/component/Currency.cxx | 2 +-
forms/source/component/DatabaseForm.cxx | 8 ++++----
forms/source/component/Date.cxx | 2 +-
forms/source/component/Grid.cxx | 16 ++++++++--------
forms/source/component/ListBox.cxx | 2 +-
forms/source/component/Numeric.cxx | 2 +-
forms/source/component/Time.cxx | 2 +-
forms/source/component/formcontrolfont.cxx | 4 ++--
forms/source/inc/property.hxx | 3 ---
10 files changed, 21 insertions(+), 24 deletions(-)
New commits:
commit 9776087faf8ea0107481dbd32ec74058301280fe
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Thu Nov 4 23:09:43 2021 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Fri Nov 5 07:05:13 2021 +0100
Replace some macros in forms part 4
Change-Id: Ic9310fcfa4fb3b1b7e64eaa2be3839ba89949a3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124723
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/forms/source/component/Columns.cxx
b/forms/source/component/Columns.cxx
index 92733ad47c20..9d44851e6037 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -346,8 +346,8 @@ void OGridColumn::setOwnProperties(Sequence<Property>&
aDescriptor)
aDescriptor.realloc(5);
Property* pProperties = aDescriptor.getArray();
DECL_PROP1(LABEL, OUString, BOUND);
- DECL_PROP3(WIDTH, sal_Int32, BOUND, MAYBEVOID,
MAYBEDEFAULT);
- DECL_PROP3(ALIGN, sal_Int16, BOUND, MAYBEVOID,
MAYBEDEFAULT);
+ 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);
DECL_PROP1(COLUMNSERVICENAME, OUString, READONLY);
}
diff --git a/forms/source/component/Currency.cxx
b/forms/source/component/Currency.cxx
index 925e23cde6fa..b95d0ad9f74b 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -160,7 +160,7 @@ void OCurrencyModel::describeFixedProperties( Sequence<
Property >& _rProps ) co
// Set Value to transient
// ModifyPropertyAttributes(_rAggregateProps, PROPERTY_VALUE,
PropertyAttribute::TRANSIENT, 0);
- DECL_PROP3(DEFAULT_VALUE, double, BOUND,
MAYBEDEFAULT, MAYBEVOID);
+ 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();
}
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index 8e04ff613619..814760174d0c 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1297,7 +1297,7 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
DECL_PROP1 ( MASTERFIELDS, Sequence< OUString >, BOUND
);
DECL_PROP1 ( DETAILFIELDS, Sequence< OUString >, BOUND
);
DECL_PROP2 ( DATASOURCE, OUString, BOUND,
CONSTRAINED );
- DECL_PROP3 ( CYCLE, TabulatorCycle, BOUND,
MAYBEVOID, MAYBEDEFAULT );
+ 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_BOOL_PROP_IMPL(INSERTONLY) css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT);
@@ -1311,9 +1311,9 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
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 );
- DECL_PROP3 ( CONTROL_BORDER_COLOR_FOCUS, sal_Int32, BOUND,
MAYBEVOID, MAYBEDEFAULT );
- DECL_PROP3 ( CONTROL_BORDER_COLOR_MOUSE, sal_Int32, BOUND,
MAYBEVOID, MAYBEDEFAULT );
- DECL_PROP3 ( CONTROL_BORDER_COLOR_INVALID, sal_Int32, BOUND,
MAYBEVOID, 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);
END_DESCRIBE_PROPERTIES();
}
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 90a348482540..503a2e22d17a 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -142,7 +142,7 @@ OUString SAL_CALL ODateModel::getServiceName()
void ODateModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel )
- DECL_PROP3(DEFAULT_DATE, util::Date, BOUND,
MAYBEDEFAULT, MAYBEVOID);
+ 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);
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index 8027c2912015..bf1b26634bb0 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -379,17 +379,17 @@ void OGridControlModel::describeFixedProperties(
Sequence< Property >& _rProps )
DECL_PROP2(CLASSID, sal_Int16, READONLY,
TRANSIENT);
DECL_PROP1(TAG, OUString, BOUND);
DECL_PROP1(TABINDEX, sal_Int16, BOUND);
- DECL_PROP3(TABSTOP, sal_Bool, BOUND,
MAYBEDEFAULT, MAYBEVOID);
+ 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_PROP1(ENABLED, sal_Bool, BOUND);
DECL_PROP2(ENABLEVISIBLE, sal_Bool, BOUND,
MAYBEDEFAULT);
DECL_PROP1(BORDER, sal_Int16, BOUND);
DECL_PROP2(BORDERCOLOR, sal_Int16, BOUND, MAYBEVOID);
DECL_PROP1(DEFAULTCONTROL, OUString, BOUND);
- DECL_PROP3(TEXTCOLOR, sal_Int32, BOUND,
MAYBEDEFAULT, MAYBEVOID);
- DECL_PROP3(BACKGROUNDCOLOR, sal_Int32, BOUND,
MAYBEDEFAULT, MAYBEVOID);
+ 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_PROP3(ROWHEIGHT, sal_Int32, BOUND,
MAYBEDEFAULT, MAYBEVOID);
+ 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);
@@ -400,7 +400,7 @@ void OGridControlModel::describeFixedProperties( Sequence<
Property >& _rProps )
DECL_PROP1(FONT_SLANT, sal_Int16, MAYBEDEFAULT);
DECL_PROP1(FONT_UNDERLINE, sal_Int16, MAYBEDEFAULT);
DECL_BOOL_PROP_IMPL(FONT_WORDLINEMODE)
css::beans::PropertyAttribute::MAYBEDEFAULT);
- DECL_PROP3(TEXTLINECOLOR, sal_Int32, BOUND,
MAYBEDEFAULT, MAYBEVOID);
+ 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_PROP1(FONT_STRIKEOUT, sal_Int16, MAYBEDEFAULT);
@@ -408,11 +408,11 @@ void OGridControlModel::describeFixedProperties(
Sequence< Property >& _rProps )
DECL_PROP2(PRINTABLE, sal_Bool, BOUND,
MAYBEDEFAULT );
DECL_PROP_IMPL(CURSORCOLOR, sal_Int32)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::MAYBEVOID |
css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP3(ALWAYSSHOWCURSOR, sal_Bool, BOUND,
MAYBEDEFAULT, TRANSIENT);
- DECL_PROP3(DISPLAYSYNCHRON, sal_Bool, BOUND,
MAYBEDEFAULT, 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_PROP3(CONTEXT_WRITING_MODE,sal_Int16, BOUND,
MAYBEDEFAULT, TRANSIENT);
+ DECL_PROP_IMPL(CONTEXT_WRITING_MODE, sal_Int16)
css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::MAYBEDEFAULT |
css::beans::PropertyAttribute::TRANSIENT);
END_DESCRIBE_PROPERTIES();
}
void OGridControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle )
const
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index 4e632d60a07e..6c8f6fa7243d 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -492,7 +492,7 @@ namespace frm
DECL_PROP2(BOUNDCOLUMN, sal_Int16,
BOUND, MAYBEVOID);
DECL_PROP1(LISTSOURCETYPE, ListSourceType,
BOUND);
DECL_PROP1(LISTSOURCE, css::uno::Sequence<OUString>,
BOUND);
- DECL_PROP3(VALUE_SEQ, css::uno::Sequence<OUString>,
BOUND, READONLY, TRANSIENT);
+ DECL_PROP_IMPL(VALUE_SEQ, css::uno::Sequence<OUString>)
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_PROP1(DEFAULT_SELECT_SEQ, Sequence<sal_Int16>,
BOUND);
diff --git a/forms/source/component/Numeric.cxx
b/forms/source/component/Numeric.cxx
index 9fb87e0b4695..a9e75c4afdb3 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -111,7 +111,7 @@ css::uno::Sequence<OUString>
ONumericModel::getSupportedServiceNames()
void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps )
const
{
BEGIN_DESCRIBE_PROPERTIES( 2, OEditBaseModel )
- DECL_PROP3(DEFAULT_VALUE, double, BOUND, MAYBEDEFAULT,
MAYBEVOID);
+ 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();
}
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index 5e6fb79edc60..6fc7b934d1b7 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -147,7 +147,7 @@ OUString SAL_CALL OTimeModel::getServiceName()
void OTimeModel::describeFixedProperties( Sequence< Property >& _rProps ) const
{
BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel )
- DECL_PROP3(DEFAULT_TIME, util::Time, BOUND,
MAYBEDEFAULT, MAYBEVOID);
+ 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);
diff --git a/forms/source/component/formcontrolfont.cxx
b/forms/source/component/formcontrolfont.cxx
index 3fed287d9976..3545e159a476 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -196,8 +196,8 @@ namespace frm
DECL_PROP2 ( FONT, FontDescriptor, BOUND,
MAYBEDEFAULT );
DECL_PROP2 ( FONTEMPHASISMARK, sal_Int16, BOUND,
MAYBEDEFAULT );
DECL_PROP2 ( FONTRELIEF, sal_Int16, BOUND,
MAYBEDEFAULT );
- DECL_PROP3 ( TEXTCOLOR, sal_Int32, BOUND,
MAYBEDEFAULT, MAYBEVOID );
- DECL_PROP3 ( TEXTLINECOLOR, sal_Int32, BOUND,
MAYBEDEFAULT, MAYBEVOID );
+ 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_BOOL_PROP_IMPL(FONT_KERNING)
css::beans::PropertyAttribute::MAYBEDEFAULT);
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index a99ae179fef9..086428391c5a 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -373,9 +373,6 @@ public:
DECL_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1 |
css::beans::PropertyAttribute::attrib2)
-#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \
- DECL_PROP_IMPL(varname, type) css::beans::PropertyAttribute::attrib1 |
css::beans::PropertyAttribute::attrib2 | css::beans::PropertyAttribute::attrib3)
-
#define END_DESCRIBE_PROPERTIES() \
DBG_ASSERT( pProperties == _rProps.getArray() + _rProps.getLength(),
"<...>::describeFixedProperties/getInfoHelper: forgot to adjust the count ?"); \
