simplify CreateScImportAsciiDlg

Change-Id: Ibcd9dc854cf15ef0a6cbaba3fdc9e377e1073507

8 files changed, 8 insertions, 52 deletions

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index d3fc41a66f69..9c17b881caf5 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1010,9 +1010,6 @@
 #define RID_SCDLG_CHARTCOLROW           (SC_DIALOGS_START + 80)
 #define RID_SCDLG_AREAS                 (SC_DIALOGS_START + 81)
 
-// popup for statusbar controller
-#define RID_SCDLG_ASCII                 (SC_DIALOGS_START + 91)
-
 // popup for drop-mode in navigator
 #define RID_POPUP_DROPMODE              (SC_DIALOGS_START + 92)
 #define RID_DROPMODE_URL                (SC_DIALOGS_START + 93)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 4113b647de99..9873658b7edf 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -325,7 +325,7 @@ public:
     SC_DLLPUBLIC static ScAbstractDialogFactory*    Create();
 
     virtual     AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg
-                                                                    SvStream* pInStream, int nId,
+                                                                    SvStream* pInStream,
                                                                     ScImportAsciiCall eCall) = 0;
 
     virtual     AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent) = 0;
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index dc62cde4d3cf..52d9c58c4a5b 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -647,21 +647,10 @@ bool AbstractScTextImportOptionsDlg_Impl::IsDateConversionSet() const
 
 
 AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg ( Window* pParent, String aDatName,
-                                                    SvStream* pInStream, int nId, ScImportAsciiCall eCall )
+                                                    SvStream* pInStream, ScImportAsciiCall eCall )
 {
-    ScImportAsciiDlg* pDlg=NULL;
-    switch ( nId )
-    {
-        case RID_SCDLG_ASCII :
-            pDlg = new ScImportAsciiDlg( pParent, aDatName,pInStream, eCall );
-            break;
-        default:
-            break;
-    }
-
-    if ( pDlg )
-        return new AbstractScImportAsciiDlg_Impl( pDlg );
-    return 0;
+    ScImportAsciiDlg* pDlg = new ScImportAsciiDlg( pParent, aDatName,pInStream, eCall );
+    return new AbstractScImportAsciiDlg_Impl( pDlg );
 }
 // ScImportAsciiDlg end
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 973a412a7df5..59390edffb52 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -391,7 +391,7 @@ public:
     virtual ~ScAbstractDialogFactory_Impl() {}
 
     virtual     AbstractScImportAsciiDlg * CreateScImportAsciiDlg( Window* pParent, String aDatName, //add for ScImportAsciiDlg
-                                                                    SvStream* pInStream, int nId,
+                                                                    SvStream* pInStream,
                                                                     ScImportAsciiCall eCall);
 
     virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent);
diff --git a/sc/source/ui/dbgui/asciiopt.hrc b/sc/source/ui/dbgui/asciiopt.hrc
index 085b50c29188..ab36c60f137e 100644
--- a/sc/source/ui/dbgui/asciiopt.hrc
+++ b/sc/source/ui/dbgui/asciiopt.hrc
@@ -20,33 +20,3 @@
 #define BTN_OK                      1
 #define BTN_CANCEL                  2
 #define BTN_HELP                    3
-
-#define FL_FIELDOPT                 4
-#define FT_CHARSET                  5
-#define LB_CHARSET                  6
-#define FT_CUSTOMLANG               7
-#define LB_CUSTOMLANG               8
-#define FT_AT_ROW                   9
-#define NF_AT_ROW                   10
-
-#define FL_SEPOPT                   11
-#define RB_FIXED                    12
-#define RB_SEPARATED                13
-#define CKB_TAB                     14
-#define CKB_COMMA                   15
-#define CKB_OTHER                   16
-#define ED_OTHER                    17
-#define CKB_SEMICOLON               18
-#define CKB_SPACE                   19
-#define CB_ASONCE                   20
-#define CB_TEXTSEP                  21
-#define FT_TEXTSEP                  22
-
-#define FL_OTHER_OPTIONS            23
-#define CB_QUOTED_AS_TEXT           24
-#define CB_DETECT_SPECIAL_NUMBER    25
-
-#define FL_WIDTH                    26
-#define FT_TYPE                     27
-#define LB_TYPE1                    28
-#define CTR_TABLEBOX                29
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 282345cec5f5..c1c2f2d60444 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -207,7 +207,7 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException)
         if ( xInputStream.is() )
             pInStream = utl::UcbStreamHelper::CreateStream( xInputStream );
 
-        AbstractScImportAsciiDlg* pDlg = pFact->CreateScImportAsciiDlg( NULL, aPrivDatName, pInStream, RID_SCDLG_ASCII,SC_IMPORTFILE);
+        AbstractScImportAsciiDlg* pDlg = pFact->CreateScImportAsciiDlg( NULL, aPrivDatName, pInStream, SC_IMPORTFILE);
         OSL_ENSURE(pDlg, "Dialog create fail!");
         if ( pDlg->Execute() == RET_OK )
         {
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 1ab57f6d665c..1db84831ff25 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -930,7 +930,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
                     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
                     OSL_ENSURE( pFact, "ScCellShell::ExecuteDB: SID_TEXT_TO_COLUMNS - pFact is null!" );
                     AbstractScImportAsciiDlg *pDlg = pFact->CreateScImportAsciiDlg(
-                        NULL, String(), &aStream, RID_SCDLG_ASCII,SC_TEXTTOCOLUMNS);
+                        NULL, String(), &aStream, SC_TEXTTOCOLUMNS);
                     OSL_ENSURE( pDlg, "ScCellShell::ExecuteDB: SID_TEXT_TO_COLUMNS - pDlg is null!" );
 
                     if ( pDlg->Execute() == RET_OK )
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index cf2c7e572e75..72750098905a 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -331,7 +331,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
                         ScAbstractDialogFactory::Create();
                     AbstractScImportAsciiDlg *pDlg =
                         pFact->CreateScImportAsciiDlg( NULL, String(), &aStrm,
-                                RID_SCDLG_ASCII, SC_PASTETEXT);
+                                SC_PASTETEXT);
 
                     if (pDlg->Execute() == RET_OK)
                     {