dbaccess/source/core/api/CRowSetColumn.cxx | 42 ++++++++++++-------------
dbaccess/source/core/api/CRowSetDataColumn.cxx | 42 ++++++++++++-------------
dbaccess/source/core/api/definitioncolumn.cxx | 28 ++++++++--------
dbaccess/source/core/api/resultcolumn.cxx | 42 ++++++++++++-------------
dbaccess/source/core/api/resultset.cxx | 12 +++----
dbaccess/source/core/api/statement.cxx | 20 +++++------
dbaccess/source/core/dataaccess/datasource.cxx | 22 ++++++-------
dbaccess/source/inc/apitools.hxx | 15 --------
8 files changed, 104 insertions(+), 119 deletions(-)
New commits:
commit c9c9b8ec542d3c491159f23d0deb5358d4142486
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Nov 10 23:10:01 2021 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Thu Nov 11 08:33:45 2021 +0100
Replace some macros in dbaccess part 4
Remove DECL_PROP0_BOOL + DECL_PROP1_BOOL + DECL_PROP0/1/2
Change-Id: I422d3dc4c09b5f8a88c8992de187458d74dc3d50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125015
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx
b/dbaccess/source/core/api/CRowSetColumn.cxx
index cef90a8e8521..d8e2d18c0ff6 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -44,27 +44,27 @@ ORowSetColumn::ORowSetColumn( const Reference <
XResultSetMetaData >& _xMetaData
{
BEGIN_PROPERTY_SEQUENCE(21)
- DECL_PROP1( CATALOGNAME, OUString, READONLY );
- DECL_PROP1( DISPLAYSIZE, sal_Int32, READONLY );
- DECL_PROP1_BOOL( ISAUTOINCREMENT, READONLY );
- DECL_PROP1_BOOL( ISCASESENSITIVE, READONLY );
- DECL_PROP1_BOOL( ISCURRENCY, READONLY );
- DECL_PROP1_BOOL( ISDEFINITELYWRITABLE, READONLY );
- DECL_PROP1( ISNULLABLE, sal_Int32, READONLY );
- DECL_PROP1_BOOL( ISREADONLY, BOUND );
- DECL_PROP1_BOOL( ISROWVERSION, READONLY );
- DECL_PROP1_BOOL( ISSEARCHABLE, READONLY );
- DECL_PROP1_BOOL( ISSIGNED, READONLY );
- DECL_PROP1_BOOL( ISWRITABLE, READONLY );
- DECL_PROP1( LABEL, OUString, READONLY );
- DECL_PROP1( PRECISION, sal_Int32, READONLY );
- DECL_PROP1( SCALE, sal_Int32, READONLY );
- DECL_PROP1( SCHEMANAME, OUString, READONLY );
- DECL_PROP1( SERVICENAME, OUString, READONLY );
- DECL_PROP1( TABLENAME, OUString, READONLY );
- DECL_PROP1( TYPE, sal_Int32, READONLY );
- DECL_PROP1( TYPENAME, OUString, READONLY );
- DECL_PROP2( VALUE, Any, READONLY,
BOUND );
+ DECL_PROP_IMPL(CATALOGNAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(DISPLAYSIZE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISAUTOINCREMENT, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISCASESENSITIVE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISCURRENCY, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISDEFINITELYWRITABLE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISNULLABLE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISREADONLY, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::BOUND );
+ DECL_PROP_IMPL(ISROWVERSION, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISSEARCHABLE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISSIGNED, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISWRITABLE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(LABEL, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(PRECISION, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(SCALE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(SCHEMANAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(SERVICENAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(TABLENAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(TYPE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(TYPENAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(VALUE, cppu::UnoType<Any>::get())
css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::BOUND);
END_PROPERTY_SEQUENCE()
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx
b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index f1d845e11517..f66f67cd6d55 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -65,27 +65,27 @@ ORowSetDataColumn::~ORowSetDataColumn()
{
BEGIN_PROPERTY_SEQUENCE(21)
- DECL_PROP1( CATALOGNAME, OUString, READONLY );
- DECL_PROP1( DISPLAYSIZE, sal_Int32, READONLY );
- DECL_PROP1_BOOL( ISAUTOINCREMENT, READONLY );
- DECL_PROP1_BOOL( ISCASESENSITIVE, READONLY );
- DECL_PROP1_BOOL( ISCURRENCY, READONLY );
- DECL_PROP1_BOOL( ISDEFINITELYWRITABLE, READONLY );
- DECL_PROP1( ISNULLABLE, sal_Int32, READONLY );
- DECL_PROP1_BOOL( ISREADONLY, BOUND );
- DECL_PROP1_BOOL( ISROWVERSION, READONLY );
- DECL_PROP1_BOOL( ISSEARCHABLE, READONLY );
- DECL_PROP1_BOOL( ISSIGNED, READONLY );
- DECL_PROP1_BOOL( ISWRITABLE, READONLY );
- DECL_PROP1( LABEL, OUString, READONLY );
- DECL_PROP1( PRECISION, sal_Int32, READONLY );
- DECL_PROP1( SCALE, sal_Int32, READONLY );
- DECL_PROP1( SCHEMANAME, OUString, READONLY );
- DECL_PROP1( SERVICENAME, OUString, READONLY );
- DECL_PROP1( TABLENAME, OUString, READONLY );
- DECL_PROP1( TYPE, sal_Int32, READONLY );
- DECL_PROP1( TYPENAME, OUString, READONLY );
- DECL_PROP1( VALUE, Any, BOUND );
+ DECL_PROP_IMPL(CATALOGNAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(DISPLAYSIZE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISAUTOINCREMENT, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISCASESENSITIVE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISCURRENCY, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISDEFINITELYWRITABLE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISNULLABLE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISREADONLY, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::BOUND );
+ DECL_PROP_IMPL(ISROWVERSION, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISSEARCHABLE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISSIGNED, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(ISWRITABLE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(LABEL, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(PRECISION, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(SCALE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(SCHEMANAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(SERVICENAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(TABLENAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(TYPE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(TYPENAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY );
+ DECL_PROP_IMPL(VALUE, cppu::UnoType<Any>::get())
css::beans::PropertyAttribute::BOUND );
END_PROPERTY_SEQUENCE()
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx
b/dbaccess/source/core/api/definitioncolumn.cxx
index beff8adf7f03..bac39fdc4d21 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -446,41 +446,41 @@ Sequence< OUString >
OTableColumnDescriptorWrapper::getSupportedServiceNames( )
BEGIN_PROPERTY_SEQUENCE( nHaveAlways + nHaveOptionally )
- DECL_PROP0_BOOL( ISAUTOINCREMENT );
- DECL_PROP0_BOOL( ISCURRENCY );
- DECL_PROP0( ISNULLABLE, sal_Int32 );
- DECL_PROP0( PRECISION, sal_Int32 );
- DECL_PROP0( SCALE, sal_Int32 );
- DECL_PROP0( TYPE, sal_Int32 );
- DECL_PROP0( TYPENAME, OUString );
+ DECL_PROP_IMPL(ISAUTOINCREMENT, cppu::UnoType<bool>::get()) 0);
+ DECL_PROP_IMPL(ISCURRENCY, cppu::UnoType<bool>::get()) 0);
+ DECL_PROP_IMPL(ISNULLABLE, cppu::UnoType<sal_Int32 >::get()) 0);
+ DECL_PROP_IMPL(PRECISION, cppu::UnoType<sal_Int32 >::get()) 0);
+ DECL_PROP_IMPL(SCALE, cppu::UnoType<sal_Int32 >::get()) 0);
+ DECL_PROP_IMPL(TYPE, cppu::UnoType<sal_Int32 >::get()) 0);
+ DECL_PROP_IMPL(TYPENAME, cppu::UnoType<OUString >::get()) 0);
if ( nId & HAS_AUTOINCREMENT_CREATION )
{
- DECL_PROP1( AUTOINCREMENTCREATION, OUString, MAYBEVOID );
+ DECL_PROP_IMPL(AUTOINCREMENTCREATION, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::MAYBEVOID );
}
if ( nId & HAS_DEFAULTVALUE )
{
- DECL_PROP0( DEFAULTVALUE, OUString );
+ DECL_PROP_IMPL(DEFAULTVALUE, cppu::UnoType<OUString >::get()) 0);
}
if ( nId & HAS_DESCRIPTION )
{
- DECL_PROP0( DESCRIPTION, OUString );
+ DECL_PROP_IMPL(DESCRIPTION, cppu::UnoType<OUString >::get()) 0);
}
if ( nId & HAS_ROWVERSION )
{
- DECL_PROP0_BOOL( ISROWVERSION );
+ DECL_PROP_IMPL(ISROWVERSION, cppu::UnoType<bool>::get()) 0);
}
if ( nId & HAS_CATALOGNAME )
{
- DECL_PROP0( CATALOGNAME, OUString );
+ DECL_PROP_IMPL(CATALOGNAME, cppu::UnoType<OUString >::get()) 0);
}
if ( nId & HAS_SCHEMANAME )
{
- DECL_PROP0( SCHEMANAME, OUString );
+ DECL_PROP_IMPL(SCHEMANAME, cppu::UnoType<OUString >::get()) 0);
}
if ( nId & HAS_TABLENAME )
{
- DECL_PROP0( TABLENAME, OUString );
+ DECL_PROP_IMPL(TABLENAME, cppu::UnoType<OUString >::get()) 0);
}
END_PROPERTY_SEQUENCE()
diff --git a/dbaccess/source/core/api/resultcolumn.cxx
b/dbaccess/source/core/api/resultcolumn.cxx
index afb2e3f574b5..3109861f3db9 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -125,27 +125,27 @@ void OResultColumn::disposing()
::cppu::IPropertyArrayHelper* OResultColumn::createArrayHelper( ) const
{
BEGIN_PROPERTY_HELPER(21)
- DECL_PROP1(CATALOGNAME, OUString, READONLY);
- DECL_PROP1(DISPLAYSIZE, sal_Int32, READONLY);
- DECL_PROP1_BOOL(ISAUTOINCREMENT, READONLY);
- DECL_PROP1_BOOL(ISCASESENSITIVE, READONLY);
- DECL_PROP1_BOOL(ISCURRENCY, READONLY);
- DECL_PROP1_BOOL(ISDEFINITELYWRITABLE, READONLY);
- DECL_PROP1(ISNULLABLE, sal_Int32, READONLY);
- DECL_PROP1_BOOL(ISREADONLY, READONLY);
- DECL_PROP1_BOOL(ISROWVERSION, READONLY);
- DECL_PROP1_BOOL(ISSEARCHABLE, READONLY);
- DECL_PROP1_BOOL(ISSIGNED, READONLY);
- DECL_PROP1_BOOL(ISWRITABLE, READONLY);
- DECL_PROP1(LABEL, OUString, READONLY);
- DECL_PROP1(NAME, OUString, READONLY);
- DECL_PROP1(PRECISION, sal_Int32, READONLY);
- DECL_PROP1(SCALE, sal_Int32, READONLY);
- DECL_PROP1(SCHEMANAME, OUString, READONLY);
- DECL_PROP1(SERVICENAME, OUString, READONLY);
- DECL_PROP1(TABLENAME, OUString, READONLY);
- DECL_PROP1(TYPE, sal_Int32, READONLY);
- DECL_PROP1(TYPENAME, OUString, READONLY);
+ DECL_PROP_IMPL(CATALOGNAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(DISPLAYSIZE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(ISAUTOINCREMENT, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(ISCASESENSITIVE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(ISCURRENCY, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(ISDEFINITELYWRITABLE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(ISNULLABLE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(ISREADONLY, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(ISROWVERSION, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(ISSEARCHABLE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(ISSIGNED, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(ISWRITABLE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(LABEL, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(NAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(PRECISION, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(SCALE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(SCHEMANAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(SERVICENAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(TABLENAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(TYPE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(TYPENAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY);
END_PROPERTY_HELPER();
}
diff --git a/dbaccess/source/core/api/resultset.cxx
b/dbaccess/source/core/api/resultset.cxx
index 922f411d794e..9683b1c6de4b 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -186,12 +186,12 @@ Reference< XPropertySetInfo >
OResultSet::getPropertySetInfo()
::cppu::IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
{
BEGIN_PROPERTY_HELPER(6)
- DECL_PROP1(CURSORNAME, OUString, READONLY);
- DECL_PROP0(FETCHDIRECTION, sal_Int32);
- DECL_PROP0(FETCHSIZE, sal_Int32);
- DECL_PROP1_BOOL(ISBOOKMARKABLE, READONLY);
- DECL_PROP1(RESULTSETCONCURRENCY, sal_Int32, READONLY);
- DECL_PROP1(RESULTSETTYPE, sal_Int32, READONLY);
+ DECL_PROP_IMPL(CURSORNAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(FETCHDIRECTION, cppu::UnoType<sal_Int32>::get()) 0);
+ DECL_PROP_IMPL(FETCHSIZE, cppu::UnoType<sal_Int32>::get()) 0);
+ DECL_PROP_IMPL(ISBOOKMARKABLE, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(RESULTSETTYPE, cppu::UnoType<sal_Int32>::get())
css::beans::PropertyAttribute::READONLY);
END_PROPERTY_HELPER();
}
diff --git a/dbaccess/source/core/api/statement.cxx
b/dbaccess/source/core/api/statement.cxx
index 631f67501142..3eec82b9e1db 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -177,16 +177,16 @@ Reference< XPropertySetInfo >
OStatementBase::getPropertySetInfo()
::cppu::IPropertyArrayHelper* OStatementBase::createArrayHelper( ) const
{
BEGIN_PROPERTY_HELPER(10)
- DECL_PROP0(CURSORNAME, OUString);
- DECL_PROP0_BOOL(ESCAPE_PROCESSING);
- DECL_PROP0(FETCHDIRECTION, sal_Int32);
- DECL_PROP0(FETCHSIZE, sal_Int32);
- DECL_PROP0(MAXFIELDSIZE, sal_Int32);
- DECL_PROP0(MAXROWS, sal_Int32);
- DECL_PROP0(QUERYTIMEOUT, sal_Int32);
- DECL_PROP0(RESULTSETCONCURRENCY, sal_Int32);
- DECL_PROP0(RESULTSETTYPE, sal_Int32);
- DECL_PROP0_BOOL(USEBOOKMARKS);
+ DECL_PROP_IMPL(CURSORNAME, cppu::UnoType<OUString>::get()) 0);
+ DECL_PROP_IMPL(ESCAPE_PROCESSING, cppu::UnoType<bool>::get()) 0);
+ DECL_PROP_IMPL(FETCHDIRECTION, cppu::UnoType<sal_Int32>::get()) 0);
+ DECL_PROP_IMPL(FETCHSIZE, cppu::UnoType<sal_Int32>::get()) 0);
+ DECL_PROP_IMPL(MAXFIELDSIZE, cppu::UnoType<sal_Int32>::get()) 0);
+ DECL_PROP_IMPL(MAXROWS, cppu::UnoType<sal_Int32>::get()) 0);
+ DECL_PROP_IMPL(QUERYTIMEOUT, cppu::UnoType<sal_Int32>::get()) 0);
+ DECL_PROP_IMPL(RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get())
0);
+ DECL_PROP_IMPL(RESULTSETTYPE, cppu::UnoType<sal_Int32>::get()) 0);
+ DECL_PROP_IMPL(USEBOOKMARKS, cppu::UnoType<bool>::get()) 0);
END_PROPERTY_HELPER();
}
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index 76d58dcaac76..22e521053295 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -797,19 +797,19 @@ Reference< XPropertySetInfo >
ODatabaseSource::getPropertySetInfo()
::cppu::IPropertyArrayHelper* ODatabaseSource::createArrayHelper( ) const
{
BEGIN_PROPERTY_HELPER(13)
- DECL_PROP1(INFO, Sequence< PropertyValue >,
BOUND);
- DECL_PROP1_BOOL(ISPASSWORDREQUIRED,
BOUND);
- DECL_PROP1_BOOL(ISREADONLY,
READONLY);
- DECL_PROP1(LAYOUTINFORMATION, Sequence< PropertyValue >,
BOUND);
- DECL_PROP1(NAME, OUString, READONLY);
+ DECL_PROP_IMPL(INFO, cppu::UnoType<Sequence< PropertyValue >>::get())
css::beans::PropertyAttribute::BOUND);
+ DECL_PROP_IMPL(ISPASSWORDREQUIRED, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::BOUND);
+ DECL_PROP_IMPL(ISREADONLY, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::READONLY);
+ DECL_PROP_IMPL(LAYOUTINFORMATION, cppu::UnoType<Sequence<
PropertyValue >>::get()) css::beans::PropertyAttribute::BOUND);
+ DECL_PROP_IMPL(NAME, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::READONLY);
DECL_PROP_IMPL(NUMBERFORMATSSUPPLIER,
cppu::UnoType<XNumberFormatsSupplier>::get())
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
- DECL_PROP1(PASSWORD, OUString,
TRANSIENT);
+ DECL_PROP_IMPL(PASSWORD, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::TRANSIENT);
DECL_PROP_IMPL(SETTINGS, cppu::UnoType<XPropertySet>::get())
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY);
- DECL_PROP1_BOOL(SUPPRESSVERSIONCL,
BOUND);
- DECL_PROP1(TABLEFILTER, Sequence< OUString >,BOUND);
- DECL_PROP1(TABLETYPEFILTER, Sequence< OUString >,BOUND);
- DECL_PROP1(URL, OUString, BOUND);
- DECL_PROP1(USER, OUString, BOUND);
+ DECL_PROP_IMPL(SUPPRESSVERSIONCL, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::BOUND);
+ DECL_PROP_IMPL(TABLEFILTER, cppu::UnoType<Sequence< OUString
>>::get()) css::beans::PropertyAttribute::BOUND);
+ DECL_PROP_IMPL(TABLETYPEFILTER, cppu::UnoType<Sequence< OUString
>>::get()) css::beans::PropertyAttribute::BOUND);
+ DECL_PROP_IMPL(URL, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::BOUND);
+ DECL_PROP_IMPL(USER, cppu::UnoType<OUString>::get())
css::beans::PropertyAttribute::BOUND);
END_PROPERTY_HELPER();
}
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 4e21b43a489d..c1481b6c40a3 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -89,21 +89,6 @@ public:
#define DECL_PROP_IMPL(varname, cpputype) \
pDesc[nPos++] = css::beans::Property(PROPERTY_##varname,
PROPERTY_ID_##varname, cpputype,
-#define DECL_PROP0(varname, type) \
- DECL_PROP_IMPL(varname, cppu::UnoType<type>::get()) 0)
-
-#define DECL_PROP0_BOOL(varname) \
- DECL_PROP_IMPL(varname, cppu::UnoType<bool>::get()) 0)
-
-#define DECL_PROP1(varname, type, attrib1) \
- DECL_PROP_IMPL(varname, cppu::UnoType<type>::get())
css::beans::PropertyAttribute::attrib1)
-
-#define DECL_PROP1_BOOL(varname, attrib1) \
- DECL_PROP_IMPL(varname, cppu::UnoType<bool>::get())
css::beans::PropertyAttribute::attrib1)
-
-#define DECL_PROP2(varname, type, attrib1, attrib2) \
- DECL_PROP_IMPL(varname, cppu::UnoType<type>::get())
css::beans::PropertyAttribute::attrib1 | css::beans::PropertyAttribute::attrib2)
-
#define END_PROPERTY_SEQUENCE() \
OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count
?"); \
