svx/source/form/fmdpage.cxx | 2 +-
sw/inc/unodraw.hxx | 1 -
sw/source/core/unocore/unodraw.cxx | 8 --------
3 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit ee8aa3dbaf6c02c9ea1bd7781e5e71847b4e614b
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 19 10:45:14 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 19 12:09:34 2023 +0000
Fix SvxFmDrawPage et al getTypes
The implementation of SxvFmDrawPage::getTypes was presumably forgotten when
e97beb270fd1a5121cdb69ffafd12ea04100e290 "NTEGRATION: CWS xmlperf02" changed
SvxFmDrawPage from supporting XFormsSupplier to supporting XFormsSupplier2
(which derives from XFormsSupplier).
And SwFmDrawPage uses ImplInheritanceHelper to derivefrom SvxFmDrawPage, so
there should be no need to implement SwFmDrawPage::getTypes manually (and
wrongly, at that, in that it included the types of SvxFmDrawPage twice, once
directly via SvxFmDrawPage::getTypes(), and once indirectly via
SwFmDrawPage_Base::getTypes()).
Change-Id: I8c467f5a20e1f44396378abe9199851e646f6947
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145772
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 3846d65cda8f..dbf8ccc001aa 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -56,7 +56,7 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const
css::uno::Type& _rType )
css::uno::Sequence< css::uno::Type > SAL_CALL SvxFmDrawPage::getTypes( )
{
return comphelper::concatSequences(SvxDrawPage::getTypes(),
- css::uno::Sequence { cppu::UnoType<css::form::XFormsSupplier>::get()
});
+ css::uno::Sequence { cppu::UnoType<css::form::XFormsSupplier2>::get()
});
}
rtl::Reference<SdrObject> SvxFmDrawPage::CreateSdrObject_( const
css::uno::Reference< css::drawing::XShape > & xDescr )
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index d7a768317bbf..f9d60f447dd2 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -77,7 +77,6 @@ public:
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
createEnumeration() override;
virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType
) override;
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( )
override;
//XIndexAccess
virtual sal_Int32 SAL_CALL getCount() override;
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 76355ce44a9e..7541eacd59d4 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -478,14 +478,6 @@ uno::Any SwFmDrawPage::queryInterface( const uno::Type&
aType )
return aRet;
}
-uno::Sequence< uno::Type > SwFmDrawPage::getTypes()
-{
- return comphelper::concatSequences(
- SvxFmDrawPage::getTypes(),
- SwFmDrawPage_Base::getTypes(),
- uno::Sequence { cppu::UnoType<form::XFormsSupplier2>::get() });
-}
-
sal_Int32 SwFmDrawPage::getCount()
{
SolarMutexGuard aGuard;
