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/view/tabvwsh3.cxx | |
| parent | c548012e1e19c3117262d9a943146413ee19eefc (diff) | |
Finished removing //CHINA comments and odd dead code from sc/source/ui/*
Diffstat (limited to 'sc/source/ui/view/tabvwsh3.cxx')
| -rw-r--r-- | sc/source/ui/view/tabvwsh3.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 07284535d63b..5f98cf3e1cb1 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -36,7 +36,6 @@ #include <editeng/eeitem.hxx> #include <sfx2/app.hxx> -//CHINA001 #include <svx/zoom.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/passwd.hxx> @@ -65,8 +64,6 @@ #include "uiitems.hxx" #include "cell.hxx" #include "inputhdl.hxx" -//CHINA001 #include "scendlg.hxx" -//CHINA001 #include "mtrindlg.hxx" #include "autoform.hxx" #include "autofmt.hxx" #include "dwfunctr.hxx" @@ -79,9 +76,9 @@ #include <svl/svstdarr.hxx> #include <svx/zoomslideritem.hxx> -#include <svx/svxdlg.hxx> //CHINA001 -#include <svx/dialogs.hrc> //CHINA001 -#include "scabstdlg.hxx" //CHINA001 +#include <svx/svxdlg.hxx> +#include <svx/dialogs.hrc> +#include "scabstdlg.hxx" #include <memory> @@ -675,7 +672,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM ); - //CHINA001 SvxZoomDialog* pDlg = NULL; AbstractSvxZoomDialog* pDlg = NULL; ScMarkData& rMark = GetViewData()->GetMarkData(); USHORT nBtnFlags = SVX_ZOOM_ENABLE_50 @@ -691,12 +687,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) aZoomItem.SetValueSet( nBtnFlags ); aSet.Put( aZoomItem ); - //CHINA001 pDlg = new SvxZoomDialog( GetDialogParent(), aSet ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { pDlg = pFact->CreateSvxZoomDialog(GetDialogParent(), aSet ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); } pDlg->SetLimits( MINZOOM, MAXZOOM ); @@ -816,12 +811,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pItem->GetList( aIndexList ); else { - //CHINA001 ScShowTabDlg* pDlg = new ScShowTabDlg( GetDialogParent() ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001 + DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); AbstractScShowTabDlg* pDlg = pFact->CreateScShowTabDlg( GetDialogParent(), RID_SCDLG_SHOW_TAB); - DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialog create fail!"); pDlg->SetDescription( String( ScResId( STR_DLG_SELECTTABLES_TITLE ) ), String( ScResId( STR_DLG_SELECTTABLES_LBNAME ) ), |