1 files changed, 2 insertions, 11 deletions
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index bf048f18bebd..a70ba8ce22dd 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -53,12 +53,12 @@ namespace sd::sidebar {
 constexpr OStringLiteral gsDefaultClickAction = "applyselect";
 
 MasterPagesSelector::MasterPagesSelector (
-    vcl::Window* pParent,
+    weld::Widget* pParent,
     SdDrawDocument& rDocument,
     ViewShellBase& rBase,
     const std::shared_ptr<MasterPageContainer>& rpContainer,
     const css::uno::Reference<css::ui::XSidebar>& rxSidebar)
-    : PanelLayout( pParent, "MasterPagePanel", "modules/simpress/ui/masterpagepanel.ui", nullptr ),
+    : PanelLayout( pParent, "MasterPagePanel", "modules/simpress/ui/masterpagepanel.ui" ),
       maMutex(),
       mpContainer(rpContainer),
       mxPreviewValueSet(new PreviewValueSet),
@@ -86,17 +86,10 @@ MasterPagesSelector::MasterPagesSelector (
 
     Link<MasterPageContainerChangeEvent&,void> aChangeListener (LINK(this,MasterPagesSelector,ContainerChangeListener));
     mpContainer->AddChangeListener(aChangeListener);
-
-    m_pInitialFocusWidget = mxPreviewValueSet->GetDrawingArea();
 }
 
 MasterPagesSelector::~MasterPagesSelector()
 {
-    disposeOnce();
-}
-
-void MasterPagesSelector::dispose()
-{
     Clear();
     UpdateLocks(ItemList());
 
@@ -105,8 +98,6 @@ void MasterPagesSelector::dispose()
     mpContainer.reset();
     mxPreviewValueSetWin.reset();
     mxPreviewValueSet.reset();
-
-    PanelLayout::dispose();
 }
 
 void MasterPagesSelector::LateInit()