diff options
Diffstat (limited to 'dbaccess/source/core/dataaccess')
4 files changed, 41 insertions, 5 deletions
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 32c89c877f39..afa2771310df 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -86,7 +86,13 @@ void SAL_CALL OContentHelper::disposing() m_xParentContainer = nullptr; } -IMPLEMENT_SERVICE_INFO1(OContentHelper,"com.sun.star.comp.sdb.Content","com.sun.star.ucb.Content"); +IMPLEMENT_SERVICE_INFO_IMPLNAME(OContentHelper, "com.sun.star.comp.sdb.Content") +IMPLEMENT_SERVICE_INFO_SUPPORTS(OContentHelper) +css::uno::Sequence< OUString > SAL_CALL OContentHelper::getSupportedServiceNames() +{ + return { "com.sun.star.ucb.Content" }; +} + css::uno::Sequence<sal_Int8> OContentHelper::getUnoTunnelId() { diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index 2a5397018b0e..f460911f3392 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -89,7 +89,22 @@ css::uno::Sequence< css::uno::Type > OCommandDefinition::getTypes() ); } IMPLEMENT_FORWARD_XINTERFACE2( OCommandDefinition,OComponentDefinition,OCommandDefinition_Base) -IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2(OCommandDefinition,OCommandDefinition_PROP) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OCommandDefinition::getPropertySetInfo() +{ + Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); + return xInfo; +} +::cppu::IPropertyArrayHelper& OCommandDefinition::getInfoHelper() +{ + return *OCommandDefinition_PROP::getArrayHelper(); +} +::cppu::IPropertyArrayHelper* OCommandDefinition::createArrayHelper( ) const +{ + css::uno::Sequence< css::beans::Property > aProps; + describeProperties(aProps); + return new ::cppu::OPropertyArrayHelper(aProps); +} + OUString SAL_CALL OCommandDefinition::getImplementationName() { diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 5239e19b8bc4..76d58dcaac76 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -802,9 +802,9 @@ Reference< XPropertySetInfo > ODatabaseSource::getPropertySetInfo() DECL_PROP1_BOOL(ISREADONLY, READONLY); DECL_PROP1(LAYOUTINFORMATION, Sequence< PropertyValue >, BOUND); DECL_PROP1(NAME, OUString, READONLY); - DECL_PROP2_IFACE(NUMBERFORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT); + DECL_PROP_IMPL(NUMBERFORMATSSUPPLIER, cppu::UnoType<XNumberFormatsSupplier>::get()) css::beans::PropertyAttribute::READONLY | css::beans::PropertyAttribute::TRANSIENT); DECL_PROP1(PASSWORD, OUString, TRANSIENT); - DECL_PROP2_IFACE(SETTINGS, XPropertySet, BOUND, READONLY); + 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); diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 8267b0a571ee..6a2a470b57ec 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -125,7 +125,22 @@ css::uno::Sequence< css::uno::Type > ODocumentContainer::getTypes() } IMPLEMENT_SERVICE_INFO_IMPLNAME(ODocumentContainer, "com.sun.star.comp.dba.ODocumentContainer"); IMPLEMENT_SERVICE_INFO_SUPPORTS(ODocumentContainer); -IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(ODocumentContainer) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODocumentContainer::getPropertySetInfo() +{ + Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); + return xInfo; +} +::cppu::IPropertyArrayHelper& ODocumentContainer::getInfoHelper() +{ + return *ODocumentContainer::getArrayHelper(); +} +::cppu::IPropertyArrayHelper* ODocumentContainer::createArrayHelper( ) const +{ + css::uno::Sequence< css::beans::Property > aProps; + describeProperties(aProps); + return new ::cppu::OPropertyArrayHelper(aProps); +} + Sequence< OUString > SAL_CALL ODocumentContainer::getSupportedServiceNames( ) { |