3 files changed, 5 insertions, 30 deletions
diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx
index 9a684b2cb496..b62ce21cc579 100644
--- a/sd/source/ui/inc/unopage.hxx
+++ b/sd/source/ui/inc/unopage.hxx
@@ -110,9 +110,6 @@ public:
 
     // XInterface
     virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
-    virtual void SAL_CALL release() noexcept override;
-
-    css::uno::Any SAL_CALL queryAggregation(css::uno::Type const & rType) override;
 
     // XShapeCombiner
     virtual css::uno::Reference< css::drawing::XShape > SAL_CALL combine( const css::uno::Reference< css::drawing::XShapes >& xShapes ) override;
@@ -181,8 +178,6 @@ public:
     virtual void SAL_CALL acquire() noexcept override;
     virtual void SAL_CALL release() noexcept override;
 
-    css::uno::Any SAL_CALL queryAggregation(css::uno::Type const & rType) override;
-
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
@@ -240,8 +235,6 @@ public:
     virtual void SAL_CALL acquire() noexcept override;
     virtual void SAL_CALL release() noexcept override;
 
-    css::uno::Any SAL_CALL queryAggregation(css::uno::Type const & rType) override;
-
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
     virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 42ed20634499..f91a6aaa816b 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -44,6 +44,7 @@
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <comphelper/sequence.hxx>
 
 #include <sfx2/infobar.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 17080d0532b2..c7f35d08f1f1 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -512,12 +512,8 @@ rtl::Reference<SdrObject> SdGenericDrawPage::CreateSdrObject_( const Reference<
 }
 
 // XInterface
-Any SAL_CALL SdGenericDrawPage::queryInterface( const uno::Type & rType )
+Any SdGenericDrawPage::queryInterface(const uno::Type & rType)
 {
-    return SvxFmDrawPage::queryInterface(rType);
-}
-
-css::uno::Any SdGenericDrawPage::queryAggregation(css::uno::Type const & rType) {
     Any aAny;
 
     if (rType == cppu::UnoType<beans::XPropertySet>::get())
@@ -564,7 +560,7 @@ css::uno::Any SdGenericDrawPage::queryAggregation(css::uno::Type const & rType)
             return Any( Reference< XAnimationNodeSupplier >( this ) );
     }
     else
-        return SvxFmDrawPage::queryAggregation( rType );
+        return SvxFmDrawPage::queryInterface( rType );
 
     return aAny;
 }
@@ -1880,13 +1876,6 @@ void SdGenericDrawPage::SetHeight( sal_Int32 nHeight )
     refreshpage( &rDoc, ePageKind );
 }
 
-// XInterface
-void SdGenericDrawPage::release() noexcept
-{
-
-    OWeakAggObject::release();
-}
-
 // XComponent
 void SdGenericDrawPage::disposing() noexcept
 {
@@ -2069,10 +2058,6 @@ SdDrawPage::~SdDrawPage() noexcept
 // XInterface
 Any SAL_CALL SdDrawPage::queryInterface( const uno::Type & rType )
 {
-    return SdGenericDrawPage::queryInterface(rType);
-}
-
-css::uno::Any SdDrawPage::queryAggregation(css::uno::Type const & rType) {
     if( rType == cppu::UnoType<drawing::XMasterPageTarget>::get() )
     {
         return Any( Reference< drawing::XMasterPageTarget >( this ) );
@@ -2087,7 +2072,7 @@ css::uno::Any SdDrawPage::queryAggregation(css::uno::Type const & rType) {
         }
     }
 
-    return SdGenericDrawPage::queryAggregation( rType );
+    return SdGenericDrawPage::queryInterface( rType );
 }
 
 void SAL_CALL SdDrawPage::acquire() noexcept
@@ -2670,10 +2655,6 @@ SdMasterPage::~SdMasterPage() noexcept
 // XInterface
 Any SAL_CALL SdMasterPage::queryInterface( const uno::Type & rType )
 {
-    return SdGenericDrawPage::queryInterface(rType);
-}
-
-css::uno::Any SdMasterPage::queryAggregation(css::uno::Type const & rType) {
     ::SolarMutexGuard aGuard;
 
     throwIfDisposed();
@@ -2691,7 +2672,7 @@ css::uno::Any SdMasterPage::queryAggregation(css::uno::Type const & rType) {
                GetPage()  && GetPage()->GetPageKind() != PageKind::Handout) )
         aAny <<= Reference< presentation::XPresentationPage >( this );
     else
-        return SdGenericDrawPage::queryAggregation( rType );
+        return SdGenericDrawPage::queryInterface( rType );
 
     return aAny;
 }