Replace REGISTER_PROP in connectivity/evoab2

Change-Id: Icdadadcaa4c6ee9bdaeb6105a33cf1891279781f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125107
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

2 files changed, 90 insertions, 30 deletions

diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 9c9e1f302a05..c0b31cc100e4 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -618,19 +618,34 @@ OEvoabResultSet::OEvoabResultSet( OCommonStatement* pStmt, OEvoabConnection *pCo
     else
         m_pVersionHelper  = std::make_unique<OEvoabVersion35Helper>();
 
-    #define REGISTER_PROP( id, member ) \
-        registerProperty( \
-            OMetaConnection::getPropMap().getNameByIndex( id ), \
-            id, \
-            PropertyAttribute::READONLY, \
-            &member, \
-            cppu::UnoType<decltype(member)>::get() \
-        );
-
-    REGISTER_PROP( PROPERTY_ID_FETCHSIZE, m_nFetchSize );
-    REGISTER_PROP( PROPERTY_ID_RESULTSETTYPE, m_nResultSetType );
-    REGISTER_PROP( PROPERTY_ID_FETCHDIRECTION, m_nFetchDirection );
-    REGISTER_PROP( PROPERTY_ID_RESULTSETCONCURRENCY, m_nResultSetConcurrency );
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
+        PROPERTY_ID_FETCHSIZE,
+        PropertyAttribute::READONLY,
+        &m_nFetchSize,
+        cppu::UnoType<decltype(m_nFetchSize)>::get()
+    );
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
+        PROPERTY_ID_RESULTSETTYPE,
+        PropertyAttribute::READONLY,
+        &m_nResultSetType,
+        cppu::UnoType<decltype(m_nResultSetType)>::get()
+    );
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
+        PROPERTY_ID_FETCHDIRECTION,
+        PropertyAttribute::READONLY,
+        &m_nFetchDirection,
+        cppu::UnoType<decltype(m_nFetchDirection)>::get()
+    );
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
+        PROPERTY_ID_RESULTSETCONCURRENCY,
+        PropertyAttribute::READONLY,
+        &m_nResultSetConcurrency,
+        cppu::UnoType<decltype(m_nResultSetConcurrency)>::get()
+    );
 }
 
 OEvoabResultSet::~OEvoabResultSet()
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index f41487951659..542ee1de8d45 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -89,24 +89,69 @@ OCommonStatement::OCommonStatement(OEvoabConnection* _pConnection)
     , m_nResultSetConcurrency(ResultSetConcurrency::UPDATABLE)
     , m_bEscapeProcessing(true)
 {
-#define REGISTER_PROP( id, member ) \
-    registerProperty( \
-        OMetaConnection::getPropMap().getNameByIndex( id ), \
-        id, \
-        0, \
-        &member, \
-        cppu::UnoType<decltype(member)>::get() \
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME),
+        PROPERTY_ID_CURSORNAME,
+        0,
+        &m_aCursorName,
+        cppu::UnoType<decltype(m_aCursorName)>::get()
+    );
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE),
+        PROPERTY_ID_MAXFIELDSIZE,
+        0,
+        &m_nMaxFieldSize,
+        cppu::UnoType<decltype(m_nMaxFieldSize)>::get()
+    );
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS),
+        PROPERTY_ID_MAXROWS,
+        0,
+        &m_nMaxRows,
+        cppu::UnoType<decltype(m_nMaxRows)>::get()
+    );
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT),
+        PROPERTY_ID_QUERYTIMEOUT,
+        0,
+        &m_nQueryTimeOut,
+        cppu::UnoType<decltype(m_nQueryTimeOut)>::get()
+    );
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE),
+        PROPERTY_ID_FETCHSIZE,
+        0,
+        &m_nFetchSize,
+        cppu::UnoType<decltype(m_nFetchSize)>::get()
+    );
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
+        PROPERTY_ID_RESULTSETTYPE,
+        0,
+        &m_nResultSetType,
+        cppu::UnoType<decltype(m_nResultSetType)>::get()
+    );
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION),
+        PROPERTY_ID_FETCHDIRECTION,
+        0,
+        &m_nFetchDirection,
+        cppu::UnoType<decltype(m_nFetchDirection)>::get()
+    );
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING),
+        PROPERTY_ID_ESCAPEPROCESSING,
+        0,
+        &m_bEscapeProcessing,
+        cppu::UnoType<decltype(m_bEscapeProcessing)>::get()
+    );
+    registerProperty(
+        OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
+        PROPERTY_ID_RESULTSETCONCURRENCY,
+        0,
+        &m_nResultSetConcurrency,
+        cppu::UnoType<decltype(m_nResultSetConcurrency)>::get()
     );
-
-    REGISTER_PROP( PROPERTY_ID_CURSORNAME, m_aCursorName );
-    REGISTER_PROP( PROPERTY_ID_MAXFIELDSIZE, m_nMaxFieldSize );
-    REGISTER_PROP( PROPERTY_ID_MAXROWS, m_nMaxRows );
-    REGISTER_PROP( PROPERTY_ID_QUERYTIMEOUT, m_nQueryTimeOut );
-    REGISTER_PROP( PROPERTY_ID_FETCHSIZE, m_nFetchSize );
-    REGISTER_PROP( PROPERTY_ID_RESULTSETTYPE, m_nResultSetType );
-    REGISTER_PROP( PROPERTY_ID_FETCHDIRECTION, m_nFetchDirection );
-    REGISTER_PROP( PROPERTY_ID_ESCAPEPROCESSING, m_bEscapeProcessing );
-    REGISTER_PROP( PROPERTY_ID_RESULTSETCONCURRENCY, m_nResultSetConcurrency );
 }
 
 OCommonStatement::~OCommonStatement()