sw/inc/unodraw.hxx | 5 ++---
sw/source/core/unocore/unodraw.cxx | 8 --------
2 files changed, 2 insertions(+), 11 deletions(-)
New commits:
commit b09c70ec15b4f94688a19f72782c3dc627590c8c
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 19 09:55:21 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 19 16:57:16 2023 +0000
Fix SwFmDrawPage queryAggregation
The base SvxDrawPage uses WeakAggImplHelper7, so (for better or worse)
derives
from XAggregation, but SwFmDrawPage failed to properly implement the
XAggregation protocol.
Change-Id: Idf2c2d27cd5fb443e574cfd770091600a23c6e8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145771
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index f9d60f447dd2..947d3817cded 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -30,6 +30,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
+#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase6.hxx>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
@@ -39,7 +40,7 @@ class SdrView;
class SwDoc;
class SwXShape;
-typedef cppu::ImplInheritanceHelper
+typedef cppu::AggImplInheritanceHelper1
<
SvxFmDrawPage,
css::container::XEnumerationAccess
@@ -76,8 +77,6 @@ public:
//XEnumerationAccess
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
createEnumeration() override;
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType
) override;
-
//XIndexAccess
virtual sal_Int32 SAL_CALL getCount() override;
virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) override;
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 7541eacd59d4..00685756c39d 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -470,14 +470,6 @@ uno::Sequence< OUString >
SwFmDrawPage::getSupportedServiceNames()
return { "com.sun.star.drawing.GenericDrawPage" };
}
-uno::Any SwFmDrawPage::queryInterface( const uno::Type& aType )
-{
- uno::Any aRet = SvxFmDrawPage::queryInterface(aType);
- if(!aRet.hasValue())
- aRet = SwFmDrawPage_Base::queryInterface(aType);
- return aRet;
-}
-
sal_Int32 SwFmDrawPage::getCount()
{
SolarMutexGuard aGuard;
