dbaccess/source/core/api/CRowSetColumn.cxx | 51 +++++++++++-------------
dbaccess/source/core/api/CRowSetDataColumn.cxx | 50 +++++++++++-------------
dbaccess/source/core/api/resultcolumn.cxx | 52 ++++++++++++-------------
dbaccess/source/core/api/resultset.cxx | 22 +++++-----
dbaccess/source/core/api/statement.cxx | 30 +++++++-------
dbaccess/source/core/dataaccess/datasource.cxx | 38 +++++++++---------
6 files changed, 119 insertions(+), 124 deletions(-)
New commits:
commit ec41dcdddb47f39ede581ce00dc20ecd4fe3458b
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Feb 19 11:00:59 2022 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Feb 19 11:51:59 2022 +0100
Simplify sequence of Property in dbaccess
Change-Id: I270702ad4b4878ee5c1942be3c45eae370f37f8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130189
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 56328bd18009..98435b7c4498 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -44,33 +44,30 @@ ORowSetColumn::ORowSetColumn( const Reference <
XResultSetMetaData >& _xMetaData
::cppu::IPropertyArrayHelper* ORowSetColumn::createArrayHelper( ) const
{
- css::uno::Sequence< css::beans::Property> aDescriptor(21);
- css::beans::Property* pDesc = aDescriptor.getArray();
- sal_Int32 nPos = 0;
-
- pDesc[nPos++] = css::beans::Property(PROPERTY_CATALOGNAME,
PROPERTY_ID_CATALOGNAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_DISPLAYSIZE,
PROPERTY_ID_DISPLAYSIZE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISAUTOINCREMENT,
PROPERTY_ID_ISAUTOINCREMENT, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISCASESENSITIVE,
PROPERTY_ID_ISCASESENSITIVE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISCURRENCY,
PROPERTY_ID_ISCURRENCY, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISDEFINITELYWRITABLE,
PROPERTY_ID_ISDEFINITELYWRITABLE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISNULLABLE,
PROPERTY_ID_ISNULLABLE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISREADONLY,
PROPERTY_ID_ISREADONLY, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISROWVERSION,
PROPERTY_ID_ISROWVERSION, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISSEARCHABLE,
PROPERTY_ID_ISSEARCHABLE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISSIGNED,
PROPERTY_ID_ISSIGNED, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISWRITABLE,
PROPERTY_ID_ISWRITABLE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_LABEL, PROPERTY_ID_LABEL,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_PRECISION,
PROPERTY_ID_PRECISION, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_SCALE, PROPERTY_ID_SCALE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_SCHEMANAME,
PROPERTY_ID_SCHEMANAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_SERVICENAME,
PROPERTY_ID_SERVICENAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_TABLENAME,
PROPERTY_ID_TABLENAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_TYPE, PROPERTY_ID_TYPE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_TYPENAME,
PROPERTY_ID_TYPENAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_VALUE, PROPERTY_ID_VALUE,
cppu::UnoType<Any>::get(), css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::BOUND);
-
- OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count
?");
+ css::uno::Sequence< css::beans::Property> aDescriptor
+ {
+ { PROPERTY_CATALOGNAME, PROPERTY_ID_CATALOGNAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_DISPLAYSIZE, PROPERTY_ID_DISPLAYSIZE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISAUTOINCREMENT, PROPERTY_ID_ISAUTOINCREMENT,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISCASESENSITIVE, PROPERTY_ID_ISCASESENSITIVE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISCURRENCY, PROPERTY_ID_ISCURRENCY,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISDEFINITELYWRITABLE, PROPERTY_ID_ISDEFINITELYWRITABLE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISNULLABLE, PROPERTY_ID_ISNULLABLE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISREADONLY, PROPERTY_ID_ISREADONLY,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND },
+ { PROPERTY_ISROWVERSION, PROPERTY_ID_ISROWVERSION,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISSEARCHABLE, PROPERTY_ID_ISSEARCHABLE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISSIGNED, PROPERTY_ID_ISSIGNED, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISWRITABLE, PROPERTY_ID_ISWRITABLE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_LABEL, PROPERTY_ID_LABEL, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_PRECISION, PROPERTY_ID_PRECISION,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_SCALE, PROPERTY_ID_SCALE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_SCHEMANAME, PROPERTY_ID_SCHEMANAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_SERVICENAME, PROPERTY_ID_SERVICENAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_TABLENAME, PROPERTY_ID_TABLENAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_TYPE, PROPERTY_ID_TYPE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_TYPENAME, PROPERTY_ID_TYPENAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_VALUE, PROPERTY_ID_VALUE, cppu::UnoType<Any>::get(),
css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::BOUND}
+ };
Sequence< Property > aRegisteredProperties;
describeProperties( aRegisteredProperties );
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx
b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index c3628d887ac7..0dce91848aae 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -63,32 +63,30 @@ ORowSetDataColumn::~ORowSetDataColumn()
// comphelper::OPropertyArrayUsageHelper
::cppu::IPropertyArrayHelper* ORowSetDataColumn::createArrayHelper( ) const
{
- css::uno::Sequence< css::beans::Property> aDescriptor(21);
- css::beans::Property* pDesc = aDescriptor.getArray();
- sal_Int32 nPos = 0;
- pDesc[nPos++] = css::beans::Property(PROPERTY_CATALOGNAME,
PROPERTY_ID_CATALOGNAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_DISPLAYSIZE,
PROPERTY_ID_DISPLAYSIZE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISAUTOINCREMENT,
PROPERTY_ID_ISAUTOINCREMENT, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISCASESENSITIVE,
PROPERTY_ID_ISCASESENSITIVE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISCURRENCY,
PROPERTY_ID_ISCURRENCY, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISDEFINITELYWRITABLE,
PROPERTY_ID_ISDEFINITELYWRITABLE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISNULLABLE,
PROPERTY_ID_ISNULLABLE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISREADONLY,
PROPERTY_ID_ISREADONLY, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISROWVERSION,
PROPERTY_ID_ISROWVERSION, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISSEARCHABLE,
PROPERTY_ID_ISSEARCHABLE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISSIGNED,
PROPERTY_ID_ISSIGNED, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISWRITABLE,
PROPERTY_ID_ISWRITABLE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_LABEL, PROPERTY_ID_LABEL,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_PRECISION,
PROPERTY_ID_PRECISION, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_SCALE, PROPERTY_ID_SCALE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_SCHEMANAME,
PROPERTY_ID_SCHEMANAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_SERVICENAME,
PROPERTY_ID_SERVICENAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_TABLENAME,
PROPERTY_ID_TABLENAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_TYPE, PROPERTY_ID_TYPE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_TYPENAME,
PROPERTY_ID_TYPENAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY );
- pDesc[nPos++] = css::beans::Property(PROPERTY_VALUE, PROPERTY_ID_VALUE,
cppu::UnoType<Any>::get(), css::beans::PropertyAttribute::BOUND );
-
- OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count
?");
+ css::uno::Sequence< css::beans::Property> aDescriptor
+ {
+ { PROPERTY_CATALOGNAME, PROPERTY_ID_CATALOGNAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_DISPLAYSIZE, PROPERTY_ID_DISPLAYSIZE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISAUTOINCREMENT, PROPERTY_ID_ISAUTOINCREMENT,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISCASESENSITIVE, PROPERTY_ID_ISCASESENSITIVE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISCURRENCY, PROPERTY_ID_ISCURRENCY,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISDEFINITELYWRITABLE, PROPERTY_ID_ISDEFINITELYWRITABLE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISNULLABLE, PROPERTY_ID_ISNULLABLE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISREADONLY, PROPERTY_ID_ISREADONLY,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND },
+ { PROPERTY_ISROWVERSION, PROPERTY_ID_ISROWVERSION,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISSEARCHABLE, PROPERTY_ID_ISSEARCHABLE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISSIGNED, PROPERTY_ID_ISSIGNED, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISWRITABLE, PROPERTY_ID_ISWRITABLE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_LABEL, PROPERTY_ID_LABEL, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_PRECISION, PROPERTY_ID_PRECISION,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_SCALE, PROPERTY_ID_SCALE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_SCHEMANAME, PROPERTY_ID_SCHEMANAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_SERVICENAME, PROPERTY_ID_SERVICENAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_TABLENAME, PROPERTY_ID_TABLENAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_TYPE, PROPERTY_ID_TYPE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_TYPENAME, PROPERTY_ID_TYPENAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_VALUE, PROPERTY_ID_VALUE, cppu::UnoType<Any>::get(),
css::beans::PropertyAttribute::BOUND }
+ };
Sequence< Property > aRegisteredProperties;
describeProperties( aRegisteredProperties );
diff --git a/dbaccess/source/core/api/resultcolumn.cxx
b/dbaccess/source/core/api/resultcolumn.cxx
index 4e467a305852..ed49f52afbca 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -125,32 +125,32 @@ void OResultColumn::disposing()
// comphelper::OPropertyArrayUsageHelper
::cppu::IPropertyArrayHelper* OResultColumn::createArrayHelper( ) const
{
- css::uno::Sequence< css::beans::Property> aDescriptor(21);
- css::beans::Property* pDesc = aDescriptor.getArray();
- sal_Int32 nPos = 0;
- pDesc[nPos++] = css::beans::Property(PROPERTY_CATALOGNAME,
PROPERTY_ID_CATALOGNAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_DISPLAYSIZE,
PROPERTY_ID_DISPLAYSIZE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISAUTOINCREMENT,
PROPERTY_ID_ISAUTOINCREMENT, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISCASESENSITIVE,
PROPERTY_ID_ISCASESENSITIVE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISCURRENCY,
PROPERTY_ID_ISCURRENCY, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISDEFINITELYWRITABLE,
PROPERTY_ID_ISDEFINITELYWRITABLE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISNULLABLE,
PROPERTY_ID_ISNULLABLE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISREADONLY,
PROPERTY_ID_ISREADONLY, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISROWVERSION,
PROPERTY_ID_ISROWVERSION, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISSEARCHABLE,
PROPERTY_ID_ISSEARCHABLE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISSIGNED,
PROPERTY_ID_ISSIGNED, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISWRITABLE,
PROPERTY_ID_ISWRITABLE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_LABEL, PROPERTY_ID_LABEL,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_NAME, PROPERTY_ID_NAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_PRECISION,
PROPERTY_ID_PRECISION, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_SCALE, PROPERTY_ID_SCALE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_SCHEMANAME,
PROPERTY_ID_SCHEMANAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_SERVICENAME,
PROPERTY_ID_SERVICENAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_TABLENAME,
PROPERTY_ID_TABLENAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_TYPE, PROPERTY_ID_TYPE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_TYPENAME,
PROPERTY_ID_TYPENAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY);
- OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count
?");
- return new ::cppu::OPropertyArrayHelper(aDescriptor);
+ return new ::cppu::OPropertyArrayHelper
+ {
+ {
+ { PROPERTY_CATALOGNAME, PROPERTY_ID_CATALOGNAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_DISPLAYSIZE, PROPERTY_ID_DISPLAYSIZE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISAUTOINCREMENT, PROPERTY_ID_ISAUTOINCREMENT,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISCASESENSITIVE, PROPERTY_ID_ISCASESENSITIVE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISCURRENCY, PROPERTY_ID_ISCURRENCY,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISDEFINITELYWRITABLE, PROPERTY_ID_ISDEFINITELYWRITABLE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISNULLABLE, PROPERTY_ID_ISNULLABLE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISREADONLY, PROPERTY_ID_ISREADONLY,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISROWVERSION, PROPERTY_ID_ISROWVERSION,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISSEARCHABLE, PROPERTY_ID_ISSEARCHABLE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISSIGNED, PROPERTY_ID_ISSIGNED,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_ISWRITABLE, PROPERTY_ID_ISWRITABLE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_LABEL, PROPERTY_ID_LABEL,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_NAME, PROPERTY_ID_NAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_PRECISION, PROPERTY_ID_PRECISION,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_SCALE, PROPERTY_ID_SCALE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_SCHEMANAME, PROPERTY_ID_SCHEMANAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_SERVICENAME, PROPERTY_ID_SERVICENAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_TABLENAME, PROPERTY_ID_TABLENAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_TYPE, PROPERTY_ID_TYPE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_TYPENAME, PROPERTY_ID_TYPENAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY }
+ }
+ };
}
// cppu::OPropertySetHelper
diff --git a/dbaccess/source/core/api/resultset.cxx
b/dbaccess/source/core/api/resultset.cxx
index dd5833fcd523..2fe6cf35504c 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -186,17 +186,17 @@ Reference< XPropertySetInfo >
OResultSet::getPropertySetInfo()
// comphelper::OPropertyArrayUsageHelper
::cppu::IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
{
- css::uno::Sequence< css::beans::Property> aDescriptor(6);
- css::beans::Property* pDesc = aDescriptor.getArray();
- sal_Int32 nPos = 0;
- pDesc[nPos++] = css::beans::Property(PROPERTY_CURSORNAME,
PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_FETCHDIRECTION,
PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0);
- pDesc[nPos++] = css::beans::Property(PROPERTY_FETCHSIZE,
PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISBOOKMARKABLE,
PROPERTY_ID_ISBOOKMARKABLE, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_RESULTSETCONCURRENCY,
PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_RESULTSETTYPE,
PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(),
css::beans::PropertyAttribute::READONLY);
- OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count
?");
- return new ::cppu::OPropertyArrayHelper(aDescriptor);
+ return new ::cppu::OPropertyArrayHelper
+ {
+ {
+ { PROPERTY_CURSORNAME, PROPERTY_ID_CURSORNAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION,
cppu::UnoType<sal_Int32>::get(), 0 },
+ { PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE,
cppu::UnoType<sal_Int32>::get(), 0 },
+ { PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE,
cppu::UnoType<sal_Int32>::get(), css::beans::PropertyAttribute::READONLY }
+ }
+ };
}
// cppu::OPropertySetHelper
diff --git a/dbaccess/source/core/api/statement.cxx
b/dbaccess/source/core/api/statement.cxx
index 290eac540099..3a466cff7d5f 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -178,21 +178,21 @@ Reference< XPropertySetInfo >
OStatementBase::getPropertySetInfo()
// comphelper::OPropertyArrayUsageHelper
::cppu::IPropertyArrayHelper* OStatementBase::createArrayHelper( ) const
{
- css::uno::Sequence< css::beans::Property> aDescriptor(10);
- css::beans::Property* pDesc = aDescriptor.getArray();
- sal_Int32 nPos = 0;
- pDesc[nPos++] = css::beans::Property(PROPERTY_CURSORNAME,
PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ESCAPE_PROCESSING,
PROPERTY_ID_ESCAPE_PROCESSING, cppu::UnoType<bool>::get(), 0);
- pDesc[nPos++] = css::beans::Property(PROPERTY_FETCHDIRECTION,
PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0);
- pDesc[nPos++] = css::beans::Property(PROPERTY_FETCHSIZE,
PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0);
- pDesc[nPos++] = css::beans::Property(PROPERTY_MAXFIELDSIZE,
PROPERTY_ID_MAXFIELDSIZE, cppu::UnoType<sal_Int32>::get(), 0);
- pDesc[nPos++] = css::beans::Property(PROPERTY_MAXROWS,
PROPERTY_ID_MAXROWS, cppu::UnoType<sal_Int32>::get(), 0);
- pDesc[nPos++] = css::beans::Property(PROPERTY_QUERYTIMEOUT,
PROPERTY_ID_QUERYTIMEOUT, cppu::UnoType<sal_Int32>::get(), 0);
- pDesc[nPos++] = css::beans::Property(PROPERTY_RESULTSETCONCURRENCY,
PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0);
- pDesc[nPos++] = css::beans::Property(PROPERTY_RESULTSETTYPE,
PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0);
- pDesc[nPos++] = css::beans::Property(PROPERTY_USEBOOKMARKS,
PROPERTY_ID_USEBOOKMARKS, cppu::UnoType<bool>::get(), 0);
- OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count
?");
- return new ::cppu::OPropertyArrayHelper(aDescriptor);
+ return new ::cppu::OPropertyArrayHelper
+ {
+ {
+ { PROPERTY_CURSORNAME, PROPERTY_ID_CURSORNAME,
cppu::UnoType<OUString>::get(), 0 },
+ { PROPERTY_ESCAPE_PROCESSING, PROPERTY_ID_ESCAPE_PROCESSING,
cppu::UnoType<bool>::get(), 0 },
+ { PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION,
cppu::UnoType<sal_Int32>::get(), 0 },
+ { PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE,
cppu::UnoType<sal_Int32>::get(), 0 },
+ { PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE,
cppu::UnoType<sal_Int32>::get(), 0 },
+ { PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS,
cppu::UnoType<sal_Int32>::get(), 0 },
+ { PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT,
cppu::UnoType<sal_Int32>::get(), 0 },
+ { PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY,
cppu::UnoType<sal_Int32>::get(), 0 },
+ { PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE,
cppu::UnoType<sal_Int32>::get(), 0 },
+ { PROPERTY_USEBOOKMARKS, PROPERTY_ID_USEBOOKMARKS,
cppu::UnoType<bool>::get(), 0 }
+ }
+ };
}
// cppu::OPropertySetHelper
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index dc304d7e3e11..61d24d89ce2e 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -797,25 +797,25 @@ Reference< XPropertySetInfo >
ODatabaseSource::getPropertySetInfo()
// comphelper::OPropertyArrayUsageHelper
::cppu::IPropertyArrayHelper* ODatabaseSource::createArrayHelper( ) const
{
- css::uno::Sequence< css::beans::Property> aDescriptor(13);
- css::beans::Property* pDesc = aDescriptor.getArray();
- sal_Int32 nPos = 0;
- pDesc[nPos++] = css::beans::Property(PROPERTY_INFO, PROPERTY_ID_INFO,
cppu::UnoType<Sequence< PropertyValue >>::get(),
css::beans::PropertyAttribute::BOUND);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISPASSWORDREQUIRED,
PROPERTY_ID_ISPASSWORDREQUIRED, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND);
- pDesc[nPos++] = css::beans::Property(PROPERTY_ISREADONLY,
PROPERTY_ID_ISREADONLY, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_LAYOUTINFORMATION,
PROPERTY_ID_LAYOUTINFORMATION, cppu::UnoType<Sequence< PropertyValue >>::get(),
css::beans::PropertyAttribute::BOUND);
- pDesc[nPos++] = css::beans::Property(PROPERTY_NAME, PROPERTY_ID_NAME,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_NUMBERFORMATSSUPPLIER,
PROPERTY_ID_NUMBERFORMATSSUPPLIER,
- cppu::UnoType<XNumberFormatsSupplier>::get(),
css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT);
- pDesc[nPos++] = css::beans::Property(PROPERTY_PASSWORD,
PROPERTY_ID_PASSWORD, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::TRANSIENT);
- pDesc[nPos++] = css::beans::Property(PROPERTY_SETTINGS,
PROPERTY_ID_SETTINGS, cppu::UnoType<XPropertySet>::get(),
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY);
- pDesc[nPos++] = css::beans::Property(PROPERTY_SUPPRESSVERSIONCL,
PROPERTY_ID_SUPPRESSVERSIONCL, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND);
- pDesc[nPos++] = css::beans::Property(PROPERTY_TABLEFILTER,
PROPERTY_ID_TABLEFILTER, cppu::UnoType<Sequence< OUString >>::get(),
css::beans::PropertyAttribute::BOUND);
- pDesc[nPos++] = css::beans::Property(PROPERTY_TABLETYPEFILTER,
PROPERTY_ID_TABLETYPEFILTER, cppu::UnoType<Sequence< OUString >>::get(),
css::beans::PropertyAttribute::BOUND);
- pDesc[nPos++] = css::beans::Property(PROPERTY_URL, PROPERTY_ID_URL,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND);
- pDesc[nPos++] = css::beans::Property(PROPERTY_USER, PROPERTY_ID_USER,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND);
- OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count
?");
- return new ::cppu::OPropertyArrayHelper(aDescriptor);
+ return new ::cppu::OPropertyArrayHelper
+ {
+ {
+ { PROPERTY_INFO, PROPERTY_ID_INFO, cppu::UnoType<Sequence<
PropertyValue >>::get(), css::beans::PropertyAttribute::BOUND },
+ { PROPERTY_ISPASSWORDREQUIRED, PROPERTY_ID_ISPASSWORDREQUIRED,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND },
+ { PROPERTY_ISREADONLY, PROPERTY_ID_ISREADONLY,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_LAYOUTINFORMATION, PROPERTY_ID_LAYOUTINFORMATION,
cppu::UnoType<Sequence< PropertyValue >>::get(),
css::beans::PropertyAttribute::BOUND },
+ { PROPERTY_NAME, PROPERTY_ID_NAME, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_NUMBERFORMATSSUPPLIER,
PROPERTY_ID_NUMBERFORMATSSUPPLIER, cppu::UnoType<XNumberFormatsSupplier>::get(),
+ css::beans::PropertyAttribute::READONLY |
css::beans::PropertyAttribute::TRANSIENT },
+ { PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::TRANSIENT },
+ { PROPERTY_SETTINGS, PROPERTY_ID_SETTINGS,
cppu::UnoType<XPropertySet>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::READONLY },
+ { PROPERTY_SUPPRESSVERSIONCL, PROPERTY_ID_SUPPRESSVERSIONCL,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND },
+ { PROPERTY_TABLEFILTER, PROPERTY_ID_TABLEFILTER,
cppu::UnoType<Sequence< OUString >>::get(),
css::beans::PropertyAttribute::BOUND },
+ { PROPERTY_TABLETYPEFILTER, PROPERTY_ID_TABLETYPEFILTER,
cppu::UnoType<Sequence< OUString >>::get(),
css::beans::PropertyAttribute::BOUND },
+ { PROPERTY_URL, PROPERTY_ID_URL, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND },
+ { PROPERTY_USER, PROPERTY_ID_USER, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND }
+ }
+ };
}
// cppu::OPropertySetHelper
