diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index aa7e588b9172..5571a38419f3 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -854,9 +854,8 @@ void ImplEESdrWriter::ImplWritePage(
 ImplEESdrWriter::~ImplEESdrWriter()
 {
     DBG_ASSERT( !mpSolverContainer, "ImplEESdrWriter::~ImplEESdrWriter: unwritten SolverContainer" );
-    Reference<css::lang::XComponent> xComp(mXDrawPage, UNO_QUERY);
-    if (xComp.is())
-        xComp->dispose();
+    if (mXDrawPage.is())
+        mXDrawPage->dispose();
 }
 
 
@@ -869,10 +868,10 @@ bool ImplEESdrWriter::ImplInitPage( const SdrPage& rPage )
         ImplFlushSolverContainer();
 
         mpSdrPage = nullptr;
-        Reference<css::lang::XComponent> xOldDrawPage(mXDrawPage, UNO_QUERY);
-        if (xOldDrawPage.is())
-            xOldDrawPage->dispose();
-        mXDrawPage = pSvxDrawPage = new SvxDrawPage( const_cast<SdrPage*>(&rPage) );
+        if (mXDrawPage.is())
+            mXDrawPage->dispose();
+        pSvxDrawPage = new SvxDrawPage( const_cast<SdrPage*>(&rPage) );
+        mXDrawPage = pSvxDrawPage;
         mXShapes = mXDrawPage;
         if ( !mXShapes.is() )
             return false;
@@ -882,7 +881,7 @@ bool ImplEESdrWriter::ImplInitPage( const SdrPage& rPage )
         mpSolverContainer.reset( new EscherSolverContainer );
     }
     else
-        pSvxDrawPage = comphelper::getFromUnoTunnel<SvxDrawPage>(mXDrawPage);
+        pSvxDrawPage = mXDrawPage;
 
     return pSvxDrawPage != nullptr;
 }
diff --git a/filter/source/msfilter/eschesdo.hxx b/filter/source/msfilter/eschesdo.hxx
index ae3fe91ec1cd..bd2c1153eacb 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -19,13 +19,14 @@
 #pragma once
 #include <filter/msfilter/escherex.hxx>
 #include <o3tl/any.hxx>
-
+#include <rtl/ref.hxx>
 
 // fractions of Draw PPTWriter etc.
 
 class ImplEESdrWriter;
 class SdrObject;
 class SdrPage;
+class SvxDrawPage;
 
 class ImplEESdrObject
 {
@@ -99,7 +100,7 @@ class EscherExHostAppData;
 class ImplEESdrWriter
 {
     EscherEx*           mpEscherEx;
-    css::uno::Reference< css::drawing::XDrawPage >        mXDrawPage;
+    rtl::Reference< SvxDrawPage >        mXDrawPage;
     css::uno::Reference< css::drawing::XShapes >          mXShapes;
     SvStream*           mpPicStrm;
     // own extensions
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 93af0594720f..45f766dd1231 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -67,8 +67,6 @@ using namespace com::sun::star::system;
 using namespace com::sun::star::xml;
 using namespace com::sun::star::xml::sax;
 
-namespace {
-
 class GlobalEventListenerImpl : public ::cppu::WeakImplHelper< css::document::XDocumentEventListener >
 {
 public:
@@ -83,8 +81,6 @@ private:
     XMLFilterTestDialog* mpDialog;
 };
 
-}
-
 GlobalEventListenerImpl::GlobalEventListenerImpl( XMLFilterTestDialog* pDialog )
 : mpDialog( pDialog )
 {
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
index bce1e19e1d3e..29efca400748 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx
@@ -26,6 +26,7 @@
 #include <vcl/weld.hxx>
 
 class filter_info_impl;
+class GlobalEventListenerImpl;
 
 class XMLFilterTestDialog : public weld::GenericDialogController
 {
@@ -54,7 +55,7 @@ private:
 private:
     css::uno::Reference< css::uno::XComponentContext >              mxContext;
     css::uno::Reference< css::document::XDocumentEventBroadcaster > mxGlobalBroadcaster;
-    css::uno::Reference< css::document::XDocumentEventListener >    mxGlobalEventListener;
+    rtl::Reference< GlobalEventListenerImpl >                       mxGlobalEventListener;
     css::uno::WeakReference< css::lang::XComponent >                mxLastFocusModel;
 
     OUString m_sImportRecentFile;