fpicker/source/office/OfficeFilePicker.cxx | 10 +++++++++-
include/comphelper/uno3.hxx | 13 -------------
sc/source/ui/Accessibility/AccessibleCell.cxx | 10 +++++++++-
toolkit/source/awt/vclxaccessiblecomponent.cxx | 10 +++++++++-
toolkit/source/controls/accessiblecontrolcontext.cxx | 12 ++++++++++--
5 files changed, 37 insertions(+), 18 deletions(-)
New commits:
commit dce85afb01c74eddb2cec3656fa76867aa131bd1
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Feb 9 10:55:05 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Feb 9 14:16:17 2022 +0100
expand out IMPLEMENT_FORWARD_XTYPEPROVIDER3
Change-Id: I31a7452bd8822f13905812e8f3fcd31a0753e0a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129711
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/fpicker/source/office/OfficeFilePicker.cxx
b/fpicker/source/office/OfficeFilePicker.cxx
index 49a00f429fb2..c69ab90e8649 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -463,7 +463,15 @@ IMPLEMENT_FORWARD_XINTERFACE3( SvtRemoteFilePicker,
SvtFilePicker, OCommonPicker
// disambiguate XTypeProvider
-IMPLEMENT_FORWARD_XTYPEPROVIDER3( SvtRemoteFilePicker, SvtFilePicker,
OCommonPicker, SvtFilePicker_Base )
+css::uno::Sequence< css::uno::Type > SAL_CALL SvtRemoteFilePicker::getTypes( )
+{
+ return ::comphelper::concatSequences(
+ SvtFilePicker::getTypes(),
+ OCommonPicker::getTypes(),
+ SvtFilePicker_Base::getTypes()
+ );
+}
+IMPLEMENT_GET_IMPLEMENTATION_ID( SvtRemoteFilePicker )
// XExecutableDialog functions
diff --git a/include/comphelper/uno3.hxx b/include/comphelper/uno3.hxx
index 97e4cea0a170..517398fd757e 100644
--- a/include/comphelper/uno3.hxx
+++ b/include/comphelper/uno3.hxx
@@ -144,19 +144,6 @@ namespace comphelper
\
IMPLEMENT_GET_IMPLEMENTATION_ID( classname )
- #define IMPLEMENT_FORWARD_XTYPEPROVIDER3( classname, baseclass1,
baseclass2, baseclass3 ) \
- css::uno::Sequence< css::uno::Type > SAL_CALL classname::getTypes( ) \
- { \
- return ::comphelper::concatSequences( \
- baseclass1::getTypes(), \
- baseclass2::getTypes(), \
- baseclass3::getTypes() \
- ); \
- } \
- \
- IMPLEMENT_GET_IMPLEMENTATION_ID( classname )
-
-
/** ask for an iface of an aggregated object
usage:<br/>
Reference<XFoo> xFoo;<br/>
diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx
b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 01670ca7c560..392eb4b9af2a 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -122,7 +122,15 @@ IMPLEMENT_FORWARD_XINTERFACE3( ScAccessibleCell,
ScAccessibleCellBase, Accessibl
//===== XTypeProvider ===================================================
-IMPLEMENT_FORWARD_XTYPEPROVIDER3( ScAccessibleCell, ScAccessibleCellBase,
AccessibleStaticTextBase, ScAccessibleCellAttributeImpl )
+css::uno::Sequence< css::uno::Type > SAL_CALL ScAccessibleCell::getTypes()
+{
+ return ::comphelper::concatSequences(
+ ScAccessibleCellBase::getTypes(),
+ AccessibleStaticTextBase::getTypes(),
+ ScAccessibleCellAttributeImpl::getTypes()
+ );
+}
+IMPLEMENT_GET_IMPLEMENTATION_ID( ScAccessibleCell )
//===== XAccessibleComponent ============================================
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx
b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index b13eeb1ade52..767004c3539d 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx
@@ -80,7 +80,15 @@ VCLXAccessibleComponent::~VCLXAccessibleComponent()
}
IMPLEMENT_FORWARD_XINTERFACE3( VCLXAccessibleComponent,
OAccessibleExtendedComponentHelper, OAccessibleImplementationAccess,
VCLXAccessibleComponent_BASE )
-IMPLEMENT_FORWARD_XTYPEPROVIDER3( VCLXAccessibleComponent,
OAccessibleExtendedComponentHelper, OAccessibleImplementationAccess,
VCLXAccessibleComponent_BASE )
+css::uno::Sequence< css::uno::Type > SAL_CALL
VCLXAccessibleComponent::getTypes()
+{
+ return ::comphelper::concatSequences(
+ OAccessibleExtendedComponentHelper::getTypes(),
+ OAccessibleImplementationAccess::getTypes(),
+ VCLXAccessibleComponent_BASE::getTypes()
+ );
+}
+IMPLEMENT_GET_IMPLEMENTATION_ID( VCLXAccessibleComponent )
OUString VCLXAccessibleComponent::getImplementationName()
{
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx
b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 5b4be7ed0d84..219b4a610a40 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -58,9 +58,17 @@ namespace toolkit
}
+ // (order matters: the first is the class name, the second is the class
doing the ref counting)
IMPLEMENT_FORWARD_XINTERFACE3( OAccessibleControlContext,
OAccessibleControlContext_Base, OAccessibleImplementationAccess,
OAccessibleControlContext_IBase )
- IMPLEMENT_FORWARD_XTYPEPROVIDER3( OAccessibleControlContext,
OAccessibleControlContext_Base, OAccessibleImplementationAccess,
OAccessibleControlContext_IBase )
- // (order matters: the first is the class name, the second is the
class doing the ref counting)
+ css::uno::Sequence< css::uno::Type > SAL_CALL
OAccessibleControlContext::getTypes()
+ {
+ return ::comphelper::concatSequences(
+ OAccessibleControlContext_Base::getTypes(),
+ OAccessibleImplementationAccess::getTypes(),
+ OAccessibleControlContext_IBase::getTypes()
+ );
+ }
+ IMPLEMENT_GET_IMPLEMENTATION_ID( OAccessibleControlContext )
void OAccessibleControlContext::Init( const Reference< XAccessible >&
_rxCreator )
