we can remove RID_SCDLG_DELCONT

Change-Id: I8edc9210bc172cd285fe4dce54d30606ecc7c716

5 files changed, 10 insertions, 21 deletions

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 0b460be51964..9d85a5ac6544 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -953,7 +953,7 @@
 #define RID_SCDLG_SPEC_FILTER   (SC_DIALOGS_START + 9)
 #define RID_SCDLG_DELCELL       (SC_DIALOGS_START + 11)
 #define RID_SCDLG_INSCELL       (SC_DIALOGS_START + 12)
-#define RID_SCDLG_DELCONT       (SC_DIALOGS_START + 13)
+
 #define RID_SCDLG_INSCONT       (SC_DIALOGS_START + 14)
 #define RID_SCDLG_MOVETAB       (SC_DIALOGS_START + 15)
 #define RID_SCDLG_STRINPUT      (SC_DIALOGS_START + 16)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 14de680f3354..7b6c6023b053 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -363,8 +363,8 @@ public:
     //for dataform
     virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell*      pTabViewShell ) = 0 ; //add for ScDataFormDlg
 
-    virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
-                                                                 sal_uInt16  nCheckDefaults = 0 ) = 0;
+    virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, //add for ScDeleteContentsDlg
+                                                                    sal_uInt16  nCheckDefaults = 0) = 0;
     virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window*        pParent, //add for ScFillSeriesDlg
                                                             ScDocument& rDocument,
                                                             FillDir     eFillDir,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 9ca906acd12a..b6ce1f8fd6f1 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -873,22 +873,11 @@ AbstractScDataFormDlg* ScAbstractDialogFactory_Impl::CreateScDataFormDlg( Window
 
 
 
-AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,int nId,
-                                                                 sal_uInt16  nCheckDefaults )
+AbstractScDeleteContentsDlg* ScAbstractDialogFactory_Impl::CreateScDeleteContentsDlg(Window* pParent,
+                                                                                     sal_uInt16  nCheckDefaults)
 {
-    ScDeleteContentsDlg * pDlg=NULL;
-    switch ( nId )
-    {
-        case RID_SCDLG_DELCONT :
-            pDlg = new ScDeleteContentsDlg( pParent, nCheckDefaults );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractScDeleteContentsDlg_Impl( pDlg );
-    return 0;
+    ScDeleteContentsDlg* pDlg = new ScDeleteContentsDlg(pParent, nCheckDefaults);
+    return new AbstractScDeleteContentsDlg_Impl( pDlg );
 }
 
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 65298a374202..823eaeb0e2fe 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -430,8 +430,8 @@ public:
     //for dataform
     virtual AbstractScDataFormDlg * CreateScDataFormDlg( Window* pParent, int nId, ScTabViewShell*      pTabViewShell); //add for ScDeleteCellDlg
 
-    virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent,int nId, //add for ScDeleteContentsDlg
-                                                                 sal_uInt16  nCheckDefaults = 0 );
+    virtual AbstractScDeleteContentsDlg * CreateScDeleteContentsDlg(Window* pParent, //add for ScDeleteContentsDlg
+                                                                    sal_uInt16  nCheckDefaults = 0);
 
     virtual AbstractScFillSeriesDlg * CreateScFillSeriesDlg( Window*        pParent, //add for ScFillSeriesDlg
                                                             ScDocument& rDocument,
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 4377c8012e88..04d6eb92fe7f 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -359,7 +359,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
                         ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
                         OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
 
-                        AbstractScDeleteContentsDlg* pDlg = pFact->CreateScDeleteContentsDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_DELCONT );
+                        AbstractScDeleteContentsDlg* pDlg = pFact->CreateScDeleteContentsDlg(pTabViewShell->GetDialogParent());
                         OSL_ENSURE(pDlg, "Dialog create fail!");
                         ScDocument* pDoc = GetViewData()->GetDocument();
                         SCTAB nTab = GetViewData()->GetTabNo();