Kaydet (Commit) aa214079 authored tarafından Julien Nabet's avatar Julien Nabet

Kill DECL_PROP1IMPL and related

See http://nabble.documentfoundation.org/About-removing-macros-td4106620.html

Change-Id: Ib934eb3f27b656b5b2f8488c2103e8eee73f9623
üst 21236b98
...@@ -130,21 +130,6 @@ enum ...@@ -130,21 +130,6 @@ enum
}/* mysqlc */ }/* mysqlc */
}/* connectivity */ }/* connectivity */
#define DECL_PROP1IMPL(varname, type) \
pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(0)),
#define DECL_PROP0(varname, type) \
DECL_PROP1IMPL(varname, type) 0)
#define DECL_BOOL_PROP1IMPL(varname) \
pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getBooleanCppuType(),
#define DECL_BOOL_PROP0(varname) \
DECL_BOOL_PROP1IMPL(varname) 0)
#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_PROPERTYIDS_HXX #endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_PROPERTYIDS_HXX
......
...@@ -1269,11 +1269,14 @@ IPropertyArrayHelper * OResultSet::createArrayHelper() const ...@@ -1269,11 +1269,14 @@ IPropertyArrayHelper * OResultSet::createArrayHelper() const
Sequence< Property > aProps(5); Sequence< Property > aProps(5);
Property* pProperties = aProps.getArray(); Property* pProperties = aProps.getArray();
sal_Int32 nPos = 0; sal_Int32 nPos = 0;
DECL_PROP0(FETCHDIRECTION, sal_Int32); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0);
DECL_PROP0(FETCHSIZE, sal_Int32); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0);
DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),
DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY); PROPERTY_ID_ISBOOKMARKABLE, ::getBooleanCppuType(), PropertyAttribute::READONLY);
DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),
PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY);
pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE),
PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), PropertyAttribute::READONLY);
return new OPropertyArrayHelper(aProps); return new OPropertyArrayHelper(aProps);
} }
......
...@@ -369,16 +369,16 @@ void SAL_CALL OCommonStatement::clearWarnings() ...@@ -369,16 +369,16 @@ void SAL_CALL OCommonStatement::clearWarnings()
Sequence< Property > aProps(10); Sequence< Property > aProps(10);
Property* pProperties = aProps.getArray(); Property* pProperties = aProps.getArray();
sal_Int32 nPos = 0; sal_Int32 nPos = 0;
DECL_PROP0(CURSORNAME, OUString); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME), PROPERTY_ID_CURSORNAME, cppu::UnoType<OUString>::get(), 0);
DECL_BOOL_PROP0(ESCAPEPROCESSING); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_ESCAPEPROCESSING), PROPERTY_ID_ESCAPEPROCESSING, ::getBooleanCppuType(), 0);
DECL_PROP0(FETCHDIRECTION,sal_Int32); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHDIRECTION), PROPERTY_ID_FETCHDIRECTION, cppu::UnoType<sal_Int32>::get(), 0);
DECL_PROP0(FETCHSIZE, sal_Int32); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_FETCHSIZE), PROPERTY_ID_FETCHSIZE, cppu::UnoType<sal_Int32>::get(), 0);
DECL_PROP0(MAXFIELDSIZE,sal_Int32); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE), PROPERTY_ID_MAXFIELDSIZE, cppu::UnoType<sal_Int32>::get(), 0);
DECL_PROP0(MAXROWS, sal_Int32); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS), PROPERTY_ID_MAXROWS, cppu::UnoType<sal_Int32>::get(), 0);
DECL_PROP0(QUERYTIMEOUT,sal_Int32); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT), PROPERTY_ID_QUERYTIMEOUT, cppu::UnoType<sal_Int32>::get(), 0);
DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY), PROPERTY_ID_RESULTSETCONCURRENCY, cppu::UnoType<sal_Int32>::get(), 0);
DECL_PROP0(RESULTSETTYPE,sal_Int32); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETTYPE), PROPERTY_ID_RESULTSETTYPE, cppu::UnoType<sal_Int32>::get(), 0);
DECL_BOOL_PROP0(USEBOOKMARKS); pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_USEBOOKMARKS), PROPERTY_ID_USEBOOKMARKS, ::getBooleanCppuType(), 0);
return new ::cppu::OPropertyArrayHelper(aProps); return new ::cppu::OPropertyArrayHelper(aProps);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment