1 files changed, 12 insertions, 2 deletions
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index b1c416c2a507..3ace50cbec6e 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -321,6 +321,16 @@ void SfxTemplateManagerDlg::dispose()
 
     mpSearchView->setItemStateHdl(Link());
     mpSearchView->setOpenTemplateHdl(Link());
+
+    mpTabControl.clear();
+    mpSearchEdit.clear();
+    mpViewBar.clear();
+    mpActionBar.clear();
+    mpTemplateBar.clear();
+    mpSearchView.clear();
+    mpCurView.clear();
+    mpLocalView.clear();
+    mpRemoteView.clear();
     ModalDialog::dispose();
 }
 
@@ -1409,7 +1419,7 @@ void SfxTemplateManagerDlg::switchMainView(bool bDisplayLocal)
 {
     if (bDisplayLocal)
     {
-        mpCurView = mpLocalView;
+        mpCurView = mpLocalView.get();
 
         mpViewBar->HideItem(VIEWBAR_DELETE);
 
@@ -1422,7 +1432,7 @@ void SfxTemplateManagerDlg::switchMainView(bool bDisplayLocal)
     }
     else
     {
-        mpCurView = mpRemoteView;
+        mpCurView = mpRemoteView.get();
 
         mpViewBar->ShowItem(VIEWBAR_DELETE);