4 files changed, 7 insertions, 2 deletions
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index b29beaeba461..a04185d37a87 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -96,7 +96,7 @@ ScCellShell::~ScCellShell()
         pImpl->m_pClipEvtLstnr->release();
     }
 
-    delete pImpl->m_pLinkedDlg;
+    pImpl->m_pLinkedDlg.disposeAndClear();
     delete pImpl->m_pRequest;
 }
 
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index e5c3fc206f0e..165b5ef3d0cb 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2530,7 +2530,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
                     OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
 
-                    delete pImpl->m_pLinkedDlg;
+                    pImpl->m_pLinkedDlg.disposeAndClear();
                     pImpl->m_pLinkedDlg =
                         pFact->CreateScLinkedAreaDlg(pTabViewShell->GetDialogParent());
                     OSL_ENSURE(pImpl->m_pLinkedDlg, "Dialog create fail!");
@@ -2986,4 +2986,7 @@ IMPL_LINK_NOARG(ScCellShell, DialogClosed, Dialog&, void)
     ExecuteExternalSource( sFile, sFilter, sOptions, sSource, nRefresh, *(pImpl->m_pRequest) );
 }
 
+CellShell_Impl::~CellShell_Impl()
+{
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index 0aa9280f7154..612a6749fc28 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -27,6 +27,7 @@
 #include "inputwin.hxx"
 #include "document.hxx"
 #include "sc.hrc"
+#include "scabstdlg.hxx"
 
 #include <vcl/svapp.hxx>
 
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index e18f5b1d7acf..4dabdef7c626 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -130,6 +130,7 @@
 #include "hints.hxx"
 #include "spellcheckcontext.hxx"
 #include "uiobject.hxx"
+#include "scabstdlg.hxx"
 
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>