From 77d6f58dddcc9aba0c9262c9ebb62f56e2845838 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 14 Nov 2012 23:30:20 +0000 Subject: convert text import options to .ui Change-Id: Ice6228f0548507b0400c25f40d8aa7cb557c8088 --- sc/source/ui/attrdlg/scdlgfact.cxx | 17 +++-------------- sc/source/ui/attrdlg/scdlgfact.hxx | 2 +- 2 files changed, 4 insertions(+), 15 deletions(-) (limited to 'sc/source/ui/attrdlg') diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index a23d0edf3f8f..f0fe0d65845e 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -668,23 +668,12 @@ AbstractScImportAsciiDlg * ScAbstractDialogFactory_Impl::CreateScImportAsciiDlg } // ScImportAsciiDlg end -AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg( Window* pParent, int nId ) +AbstractScTextImportOptionsDlg * ScAbstractDialogFactory_Impl::CreateScTextImportOptionsDlg(Window* pParent) { - ScTextImportOptionsDlg* pDlg = NULL; - switch (nId) - { - case RID_SCDLG_TEXT_IMPORT_OPTIONS: - pDlg = new ScTextImportOptionsDlg(pParent); - break; - default: - ; - } - - return pDlg ? new AbstractScTextImportOptionsDlg_Impl(pDlg) : NULL; + ScTextImportOptionsDlg* pDlg = new ScTextImportOptionsDlg(pParent); + return new AbstractScTextImportOptionsDlg_Impl(pDlg); } - - AbstractScAutoFormatDlg * ScAbstractDialogFactory_Impl::CreateScAutoFormatDlg( Window* pParent, ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index dfbd7fd272c7..2e16c9670951 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -401,7 +401,7 @@ public: SvStream* pInStream, int nId, ScImportAsciiCall eCall); - virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg( Window* pParent, int nId ); + virtual AbstractScTextImportOptionsDlg * CreateScTextImportOptionsDlg(Window* pParent); virtual AbstractScAutoFormatDlg * CreateScAutoFormatDlg( Window* pParent, //add for ScAutoFormatDlg ScAutoFormat* pAutoFormat, -- cgit