diff options
| author | Luke Symes <allsymes@gmail.com> | 2010-10-01 17:50:24 +1300 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2010-10-01 11:17:38 +0200 |
| commit | 44231089eeda805727f6c7143729612059891b02 (patch) | |
| tree | 867f388fce938eb004defe4bf4122e4772120cf5 /sc/source/ui/unoobj | |
| parent | c548012e1e19c3117262d9a943146413ee19eefc (diff) | |
Finished removing //CHINA comments and odd dead code from sc/source/ui/*
Diffstat (limited to 'sc/source/ui/unoobj')
| -rw-r--r-- | sc/source/ui/unoobj/filtuno.cxx | 13 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/nameuno.cxx | 3 |
2 files changed, 5 insertions, 11 deletions
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index efe804784a40..8c7402de370b 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -46,8 +46,8 @@ #include "globstr.hrc" -#include "sc.hrc" //CHINA001 -#include "scabstdlg.hxx" //CHINA001 +#include "sc.hrc" +#include "scabstdlg.hxx" #include "i18npool/lang.h" #include <memory> @@ -169,9 +169,8 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) if ( xInputStream.is() ) pInStream = utl::UcbStreamHelper::CreateStream( xInputStream ); - //CHINA001 ScImportAsciiDlg* pDlg = new ScImportAsciiDlg( NULL, aPrivDatName, pInStream, cAsciiDel ); AbstractScImportAsciiDlg* pDlg = pFact->CreateScImportAsciiDlg( NULL, aPrivDatName, pInStream, RID_SCDLG_ASCII, cAsciiDel); - DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialog create fail!"); if ( pDlg->Execute() == RET_OK ) { ScAsciiOptions aOptions; @@ -273,15 +272,11 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException) } ScImportOptions aOptions( cAsciiDel, cStrDel, eEncoding); -//CHINA001 ScImportOptionsDlg* pDlg = new ScImportOptionsDlg( NULL, bAscii, -//CHINA001 &aOptions, &aTitle, bMultiByte, bDBEnc, -//CHINA001 !bExport ); -//CHINA001 AbstractScImportOptionsDlg* pDlg = pFact->CreateScImportOptionsDlg( NULL, RID_SCDLG_IMPORTOPT, bAscii, &aOptions, &aTitle, bMultiByte, bDBEnc, !bExport); - DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialog create fail!"); if ( pDlg->Execute() == RET_OK ) { pDlg->GetImportOptions( aOptions ); diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 75686df460d6..8aa34b88f25d 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -49,11 +49,10 @@ using namespace ::com::sun::star; #include "docsh.hxx" #include "docfunc.hxx" #include "rangenam.hxx" -//CHINA001 #include "namecrea.hxx" // NAME_TOP etc. #include "unoguard.hxx" #include "unonames.hxx" -#include "scui_def.hxx" //CHINA001 +#include "scui_def.hxx" //------------------------------------------------------------------------ |