[ooo-build-commit] .: 2 commits - sc/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Fri Oct 1 02:19:25 PDT 2010
sc/source/ui/app/scmod.cxx | 17 -
sc/source/ui/attrdlg/attrdlg.cxx | 53 +---
sc/source/ui/attrdlg/scdlgfact.cxx | 14 -
sc/source/ui/attrdlg/scdlgfact.hxx | 29 --
sc/source/ui/docshell/arealink.cxx | 9
sc/source/ui/docshell/docfunc.cxx | 3
sc/source/ui/docshell/docsh.cxx | 10
sc/source/ui/docshell/docsh4.cxx | 47 +--
sc/source/ui/drawfunc/chartsh.cxx | 2
sc/source/ui/drawfunc/drawsh.cxx | 32 --
sc/source/ui/drawfunc/drawsh5.cxx | 6
sc/source/ui/drawfunc/drformsh.cxx | 2
sc/source/ui/drawfunc/drtxtob1.cxx | 18 -
sc/source/ui/drawfunc/oleobjsh.cxx | 2
sc/source/ui/inc/asciiopt.hxx | 89 -------
sc/source/ui/inc/autofmt.hxx | 59 ----
sc/source/ui/inc/crdlg.hxx | 5
sc/source/ui/inc/drawsh.hxx | 2
sc/source/ui/inc/filldlg.hxx | 6
sc/source/ui/inc/inscodlg.hxx | 6
sc/source/ui/inc/namecrea.hxx | 7
sc/source/ui/inc/namepast.hxx | 5
sc/source/ui/inc/redcom.hxx | 6
sc/source/ui/inc/sortdlg.hxx | 2
sc/source/ui/inc/subtdlg.hxx | 5
sc/source/ui/inc/tphfedit.hxx | 101 --------
sc/source/ui/miscdlgs/autofmt.cxx | 412 ----------------------------------
sc/source/ui/miscdlgs/redcom.cxx | 7
sc/source/ui/miscdlgs/textdlgs.cxx | 38 +--
sc/source/ui/optdlg/tpusrlst.cxx | 12
sc/source/ui/pagedlg/hfedtdlg.cxx | 3
sc/source/ui/pagedlg/scuitphfedit.cxx | 8
sc/source/ui/pagedlg/tphf.cxx | 3
sc/source/ui/pagedlg/tphfedit.cxx | 315 -------------------------
sc/source/ui/styleui/styledlg.cxx | 105 +++-----
sc/source/ui/unoobj/filtuno.cxx | 13 -
sc/source/ui/unoobj/nameuno.cxx | 3
sc/source/ui/vba/vbaworksheet.cxx | 4
sc/source/ui/view/cellsh1.cxx | 88 ++-----
sc/source/ui/view/cellsh2.cxx | 80 +-----
sc/source/ui/view/cellsh3.cxx | 64 +----
sc/source/ui/view/editsh.cxx | 18 -
sc/source/ui/view/formatsh.cxx | 13 -
sc/source/ui/view/gridwin2.cxx | 10
sc/source/ui/view/pivotsh.cxx | 10
sc/source/ui/view/prevwsh.cxx | 15 -
sc/source/ui/view/tabvwsh3.cxx | 18 -
sc/source/ui/view/tabvwsh4.cxx | 7
sc/source/ui/view/tabvwsha.cxx | 11
sc/source/ui/view/tabvwshc.cxx | 1
sc/source/ui/view/tabvwshf.cxx | 32 --
sc/source/ui/view/viewfunc.cxx | 3
sc/source/ui/view/viewutil.cxx | 4
53 files changed, 274 insertions(+), 1560 deletions(-)
New commits:
commit 9903d5a611403253addf310b427723db27760f94
Author: Luke Symes <allsymes at gmail.com>
Date: Fri Oct 1 17:50:24 2010 +1300
Finished removing //CHINA comments and odd dead code from sc/source/ui/*
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index ceed2e0..28d5540 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -58,7 +58,6 @@
#include "global.hxx"
#include "globstr.hrc"
#include "autoform.hxx"
-//CHINA001 #include "strindlg.hxx"
#include "miscdlgs.hrc"
#include "autofmt.hxx"
#include "scresid.hxx"
@@ -69,417 +68,6 @@
#define FRAME_OFFSET 4
-//CHINA001 //========================================================================
-//CHINA001 // AutoFormat-Dialog:
-//CHINA001
-//CHINA001 ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent,
-//CHINA001 ScAutoFormat* pAutoFormat,
-//CHINA001 const ScAutoFormatData* pSelFormatData,
-//CHINA001 ScDocument* pDoc ) :
-//CHINA001
-//CHINA001 ModalDialog ( pParent, ScResId( RID_SCDLG_AUTOFORMAT ) ),
-//CHINA001 //
-//CHINA001 aLbFormat ( this, ScResId( LB_FORMAT ) ),
-//CHINA001 aFlFormat ( this, ScResId( FL_FORMAT ) ),
-//CHINA001 pWndPreview ( new ScAutoFmtPreview( this, ScResId( WND_PREVIEW ), pDoc ) ),
-//CHINA001 aBtnNumFormat ( this, ScResId( BTN_NUMFORMAT ) ),
-//CHINA001 aBtnBorder ( this, ScResId( BTN_BORDER ) ),
-//CHINA001 aBtnFont ( this, ScResId( BTN_FONT ) ),
-//CHINA001 aBtnPattern ( this, ScResId( BTN_PATTERN ) ),
-//CHINA001 aBtnAlignment ( this, ScResId( BTN_ALIGNMENT ) ),
-//CHINA001 aBtnAdjust ( this, ScResId( BTN_ADJUST ) ),
-//CHINA001 aFlFormatting ( this, ScResId( FL_FORMATTING ) ),
-//CHINA001 aBtnOk ( this, ScResId( BTN_OK ) ),
-//CHINA001 aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
-//CHINA001 aBtnHelp ( this, ScResId( BTN_HELP ) ),
-//CHINA001 aBtnAdd ( this, ScResId( BTN_ADD ) ),
-//CHINA001 aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
-//CHINA001 aBtnMore ( this, ScResId( BTN_MORE ) ),
-//CHINA001 aBtnRename ( this, ScResId( BTN_RENAME ) ),
-//CHINA001 aStrTitle ( ScResId( STR_ADD_TITLE ) ),
-//CHINA001 aStrLabel ( ScResId( STR_ADD_LABEL ) ),
-//CHINA001 aStrRename ( ScResId( STR_RENAME_TITLE ) ),
-//CHINA001 aStrClose ( ScResId( STR_BTN_CLOSE ) ),
-//CHINA001 aStrDelTitle ( ScResId( STR_DEL_TITLE ) ),
-//CHINA001 aStrDelMsg ( ScResId( STR_DEL_MSG ) ) ,
-//CHINA001 //
-//CHINA001 nIndex ( 0 ),
-//CHINA001 bFmtInserted ( FALSE ),
-//CHINA001 bCoreDataChanged( FALSE ),
-//CHINA001 pFormat ( pAutoFormat ),
-//CHINA001 pSelFmtData ( pSelFormatData )
-//CHINA001 {
-//CHINA001 Init();
-//CHINA001 pWndPreview->NotifyChange( (*pFormat)[0] );
-//CHINA001 FreeResource();
-//CHINA001 }
-//CHINA001
-//CHINA001 //------------------------------------------------------------------------
-//CHINA001
-//CHINA001 ScAutoFormatDlg::~ScAutoFormatDlg()
-//CHINA001 {
-//CHINA001 delete pWndPreview;
-//CHINA001 }
-//CHINA001
-//CHINA001 //------------------------------------------------------------------------
-//CHINA001
-//CHINA001 void ScAutoFormatDlg::Init()
-//CHINA001 {
-//CHINA001 USHORT nCount;
-//CHINA001 String aEntry;
-//CHINA001
-//CHINA001 aLbFormat .SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) );
-//CHINA001 aBtnNumFormat.SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
-//CHINA001 aBtnBorder .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
-//CHINA001 aBtnFont .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
-//CHINA001 aBtnPattern .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
-//CHINA001 aBtnAlignment.SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
-//CHINA001 aBtnAdjust .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) );
-//CHINA001 aBtnAdd .SetClickHdl ( LINK( this, ScAutoFormatDlg, AddHdl ) );
-//CHINA001 aBtnRemove .SetClickHdl ( LINK( this, ScAutoFormatDlg, RemoveHdl ) );
-//CHINA001 aBtnOk .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) );
-//CHINA001 aBtnCancel .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) );
-//CHINA001 aBtnRename .SetClickHdl ( LINK( this, ScAutoFormatDlg, RenameHdl ) );
-//CHINA001 aLbFormat .SetDoubleClickHdl( LINK( this, ScAutoFormatDlg, DblClkHdl ) );
-//CHINA001
-//CHINA001 aBtnMore.AddWindow( &aBtnRename );
-//CHINA001 aBtnMore.AddWindow( &aBtnNumFormat );
-//CHINA001 aBtnMore.AddWindow( &aBtnBorder );
-//CHINA001 aBtnMore.AddWindow( &aBtnFont );
-//CHINA001 aBtnMore.AddWindow( &aBtnPattern );
-//CHINA001 aBtnMore.AddWindow( &aBtnAlignment );
-//CHINA001 aBtnMore.AddWindow( &aBtnAdjust );
-//CHINA001 aBtnMore.AddWindow( &aFlFormatting );
-//CHINA001
-//CHINA001 nCount = pFormat->GetCount();
-//CHINA001
-//CHINA001 for ( USHORT i = 0; i < nCount; i++ )
-//CHINA001 {
-//CHINA001 ((*pFormat)[i])->GetName( aEntry );
-//CHINA001 aLbFormat.InsertEntry( aEntry );
-//CHINA001 }
-//CHINA001
-//CHINA001 if ( nCount == 1 )
-//CHINA001 aBtnRemove.Disable();
-//CHINA001
-//CHINA001 aLbFormat.SelectEntryPos( 0 );
-//CHINA001 aBtnRename.Disable();
-//CHINA001 aBtnRemove.Disable();
-//CHINA001
-//CHINA001 nIndex = 0;
-//CHINA001 UpdateChecks();
-//CHINA001
-//CHINA001 if ( !pSelFmtData )
-//CHINA001 {
-//CHINA001 aBtnAdd.Disable();
-//CHINA001 aBtnRemove.Disable();
-//CHINA001 bFmtInserted = TRUE;
-//CHINA001 }
-//CHINA001 }
-//CHINA001
-//CHINA001 //------------------------------------------------------------------------
-//CHINA001
-//CHINA001 void ScAutoFormatDlg::UpdateChecks()
-//CHINA001 {
-//CHINA001 ScAutoFormatData* pData = (*pFormat)[nIndex];
-//CHINA001
-//CHINA001 aBtnNumFormat.Check( pData->GetIncludeValueFormat() );
-//CHINA001 aBtnBorder .Check( pData->GetIncludeFrame() );
-//CHINA001 aBtnFont .Check( pData->GetIncludeFont() );
-//CHINA001 aBtnPattern .Check( pData->GetIncludeBackground() );
-//CHINA001 aBtnAlignment.Check( pData->GetIncludeJustify() );
-//CHINA001 aBtnAdjust .Check( pData->GetIncludeWidthHeight() );
-//CHINA001 }
-//CHINA001
-//CHINA001 //------------------------------------------------------------------------
-//CHINA001 // Handler:
-//CHINA001 //---------
-//CHINA001
-//CHINA001 IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn )
-//CHINA001 {
-//CHINA001 if ( pBtn == &aBtnOk || pBtn == &aBtnCancel )
-//CHINA001 {
-//CHINA001 if ( bCoreDataChanged )
-//CHINA001 ScGlobal::GetAutoFormat()->Save();
-//CHINA001
-//CHINA001 EndDialog( (pBtn == &aBtnOk) ? RET_OK : RET_CANCEL );
-//CHINA001 }
-//CHINA001 return 0;
-//CHINA001 }
-//CHINA001
-//CHINA001 //------------------------------------------------------------------------
-//CHINA001
-//CHINA001 IMPL_LINK_INLINE_START( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG )
-//CHINA001 {
-//CHINA001 if ( bCoreDataChanged )
-//CHINA001 ScGlobal::GetAutoFormat()->Save();
-//CHINA001
-//CHINA001 EndDialog( RET_OK );
-//CHINA001 return 0;
-//CHINA001 }
-//CHINA001 IMPL_LINK_INLINE_END( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG )
-//CHINA001
-//CHINA001 //------------------------------------------------------------------------
-//CHINA001
-//CHINA001 IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn )
-//CHINA001 {
-//CHINA001 ScAutoFormatData* pData = (*pFormat)[nIndex];
-//CHINA001 BOOL bCheck = ((CheckBox*)pBtn)->IsChecked();
-//CHINA001
-//CHINA001 if ( pBtn == &aBtnNumFormat )
-//CHINA001 pData->SetIncludeValueFormat( bCheck );
-//CHINA001 else if ( pBtn == &aBtnBorder )
-//CHINA001 pData->SetIncludeFrame( bCheck );
-//CHINA001 else if ( pBtn == &aBtnFont )
-//CHINA001 pData->SetIncludeFont( bCheck );
-//CHINA001 else if ( pBtn == &aBtnPattern )
-//CHINA001 pData->SetIncludeBackground( bCheck );
-//CHINA001 else if ( pBtn == &aBtnAlignment )
-//CHINA001 pData->SetIncludeJustify( bCheck );
-//CHINA001 else if ( pBtn == &aBtnAdjust )
-//CHINA001 pData->SetIncludeWidthHeight( bCheck );
-//CHINA001
-//CHINA001 if ( !bCoreDataChanged )
-//CHINA001 {
-//CHINA001 aBtnCancel.SetText( aStrClose );
-//CHINA001 bCoreDataChanged = TRUE;
-//CHINA001 }
-//CHINA001
-//CHINA001 pWndPreview->NotifyChange( pData );
-//CHINA001
-//CHINA001 return 0;
-//CHINA001 }
-//CHINA001
-//CHINA001 //------------------------------------------------------------------------
-//CHINA001
-//CHINA001 IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG )
-//CHINA001 {
-//CHINA001 if ( !bFmtInserted && pSelFmtData )
-//CHINA001 {
-//CHINA001 String aStrStandard( ScResId(STR_STANDARD) );
-//CHINA001 String aFormatName;
-//CHINA001 ScStringInputDlg* pDlg;
-//CHINA001 BOOL bOk = FALSE;
-//CHINA001
-//CHINA001 while ( !bOk )
-//CHINA001 {
-//CHINA001 pDlg = new ScStringInputDlg( this,
-//CHINA001 aStrTitle,
-//CHINA001 aStrLabel,
-//CHINA001 aFormatName,
-//CHINA001 HID_SC_ADD_AUTOFMT );
-//CHINA001
-//CHINA001 if ( pDlg->Execute() == RET_OK )
-//CHINA001 {
-//CHINA001 pDlg->GetInputString( aFormatName );
-//CHINA001
-//CHINA001 if ( (aFormatName.Len() > 0) && (aFormatName != aStrStandard) )
-//CHINA001 {
-//CHINA001 ScAutoFormatData* pNewData
-//CHINA001 = new ScAutoFormatData( *pSelFmtData );
-//CHINA001
-//CHINA001 pNewData->SetName( aFormatName );
-//CHINA001 bFmtInserted = pFormat->Insert( pNewData );
-//CHINA001
-//CHINA001 if ( bFmtInserted )
-//CHINA001 {
-//CHINA001 USHORT nAt = pFormat->IndexOf( pNewData );
-//CHINA001
-//CHINA001 aLbFormat.InsertEntry( aFormatName, nAt );
-//CHINA001 aLbFormat.SelectEntry( aFormatName );
-//CHINA001 aBtnAdd.Disable();
-//CHINA001
-//CHINA001 if ( !bCoreDataChanged )
-//CHINA001 {
-//CHINA001 aBtnCancel.SetText( aStrClose );
-//CHINA001 bCoreDataChanged = TRUE;
-//CHINA001 }
-//CHINA001
-//CHINA001 SelFmtHdl( 0 );
-//CHINA001 bOk = TRUE;
-//CHINA001 }
-//CHINA001 else
-//CHINA001 delete pNewData;
-//CHINA001
-//CHINA001 }
-//CHINA001
-//CHINA001 if ( !bFmtInserted )
-//CHINA001 {
-//CHINA001 USHORT nRet = ErrorBox( this,
-//CHINA001 WinBits( WB_OK_CANCEL | WB_DEF_OK),
-//CHINA001 ScGlobal::GetRscString(STR_INVALID_AFNAME)
-//CHINA001 ).Execute();
-//CHINA001
-//CHINA001 bOk = ( nRet == RET_CANCEL );
-//CHINA001 }
-//CHINA001 }
-//CHINA001 else
-//CHINA001 bOk = TRUE;
-//CHINA001
-//CHINA001 delete pDlg;
-//CHINA001 }
-//CHINA001 }
-//CHINA001
-//CHINA001 return 0;
-//CHINA001 }
-//CHINA001
-//CHINA001 //------------------------------------------------------------------------
-//CHINA001
-//CHINA001 IMPL_LINK( ScAutoFormatDlg, RemoveHdl, void *, EMPTYARG )
-//CHINA001 {
-//CHINA001 if ( (nIndex > 0) && (aLbFormat.GetEntryCount() > 0) )
-//CHINA001 {
-//CHINA001 String aMsg( aStrDelMsg.GetToken( 0, '#' ) );
-//CHINA001
-//CHINA001 aMsg += aLbFormat.GetSelectEntry();
-//CHINA001 aMsg += aStrDelMsg.GetToken( 1, '#' );
-//CHINA001
-//CHINA001 if ( RET_YES ==
-//CHINA001 QueryBox( this, WinBits( WB_YES_NO | WB_DEF_YES ), aMsg ).Execute() )
-//CHINA001 {
-//CHINA001 aLbFormat.RemoveEntry( nIndex );
-//CHINA001 aLbFormat.SelectEntryPos( nIndex-1 );
-//CHINA001
-//CHINA001 if ( nIndex-1 == 0 )
-//CHINA001 aBtnRemove.Disable();
-//CHINA001
-//CHINA001 if ( !bCoreDataChanged )
-//CHINA001 {
-//CHINA001 aBtnCancel.SetText( aStrClose );
-//CHINA001 bCoreDataChanged = TRUE;
-//CHINA001 }
-//CHINA001
-//CHINA001 pFormat->AtFree( nIndex ); // in der Core loeschen
-//CHINA001 nIndex--;
-//CHINA001
-//CHINA001 SelFmtHdl( 0 );
-//CHINA001 }
-//CHINA001 }
-//CHINA001
-//CHINA001 SelFmtHdl( 0 );
-//CHINA001
-//CHINA001 return 0;
-//CHINA001 }
-//CHINA001
-//CHINA001 IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, pBtn)
-//CHINA001 {
-//CHINA001 BOOL bOk = FALSE;
-//CHINA001 while( !bOk )
-//CHINA001 {
-//CHINA001
-//CHINA001 String aFormatName=aLbFormat.GetSelectEntry();
-//CHINA001 String aEntry;
-//CHINA001
-//CHINA001 ScStringInputDlg* pDlg = new ScStringInputDlg( this,
-//CHINA001 aStrRename,
-//CHINA001 aStrLabel,
-//CHINA001 aFormatName,
-//CHINA001 HID_SC_RENAME_AUTOFMT );
-//CHINA001 if( pDlg->Execute() == RET_OK )
-//CHINA001 {
-//CHINA001 BOOL bFmtRenamed = FALSE;
-//CHINA001 pDlg->GetInputString( aFormatName );
-//CHINA001 USHORT n;
-//CHINA001
-//CHINA001 if ( aFormatName.Len() > 0 )
-//CHINA001 {
-//CHINA001 for( n = 0; n < pFormat->GetCount(); ++n )
-//CHINA001 {
-//CHINA001 (*pFormat)[n]->GetName(aEntry);
-//CHINA001 if ( aEntry== aFormatName)
-//CHINA001 break;
-//CHINA001 }
-//CHINA001 if( n >= pFormat->GetCount() )
-//CHINA001 {
-//CHINA001 // Format mit dem Namen noch nicht vorhanden, also
-//CHINA001 // umbenennen
-//CHINA001
-//CHINA001 aLbFormat.RemoveEntry(nIndex );
-//CHINA001 ScAutoFormatData* p=(*pFormat)[ nIndex ];
-//CHINA001 ScAutoFormatData* pNewData
-//CHINA001 = new ScAutoFormatData(*p);
-//CHINA001
-//CHINA001 pFormat->AtFree( nIndex );
-//CHINA001
-//CHINA001 pNewData->SetName( aFormatName );
-//CHINA001
-//CHINA001 pFormat->Insert( pNewData);
-//CHINA001
-//CHINA001 USHORT nCount = pFormat->GetCount();
-//CHINA001
-//CHINA001 aLbFormat.SetUpdateMode(FALSE);
-//CHINA001 aLbFormat.Clear();
-//CHINA001 for ( USHORT i = 0; i < nCount; i++ )
-//CHINA001 {
-//CHINA001 ((*pFormat)[i])->GetName( aEntry );
-//CHINA001 aLbFormat.InsertEntry( aEntry );
-//CHINA001 }
-//CHINA001
-//CHINA001 aLbFormat.SetUpdateMode( TRUE);
-//CHINA001 aLbFormat.SelectEntry( aFormatName);
-//CHINA001
-//CHINA001 if ( !bCoreDataChanged )
-//CHINA001 {
-//CHINA001 aBtnCancel.SetText( aStrClose );
-//CHINA001 bCoreDataChanged = TRUE;
-//CHINA001 }
-//CHINA001
-//CHINA001
-//CHINA001 SelFmtHdl( 0 );
-//CHINA001 bOk = TRUE;
-//CHINA001 bFmtRenamed = TRUE;
-//CHINA001 }
-//CHINA001 }
-//CHINA001 if( !bFmtRenamed )
-//CHINA001 {
-//CHINA001 bOk = RET_CANCEL == ErrorBox( this,
-//CHINA001 WinBits( WB_OK_CANCEL | WB_DEF_OK),
-//CHINA001 ScGlobal::GetRscString(STR_INVALID_AFNAME)
-//CHINA001 ).Execute();
-//CHINA001 }
-//CHINA001 }
-//CHINA001 else
-//CHINA001 bOk = TRUE;
-//CHINA001 delete pDlg;
-//CHINA001 }
-//CHINA001
-//CHINA001 return 0;
-//CHINA001 }
-//CHINA001
-//CHINA001 //------------------------------------------------------------------------
-//CHINA001
-//CHINA001 IMPL_LINK( ScAutoFormatDlg, SelFmtHdl, void *, EMPTYARG )
-//CHINA001 {
-//CHINA001 nIndex = aLbFormat.GetSelectEntryPos();
-//CHINA001 UpdateChecks();
-//CHINA001
-//CHINA001 if ( nIndex == 0 )
-//CHINA001 {
-//CHINA001 aBtnRename.Disable();
-//CHINA001 aBtnRemove.Disable();
-//CHINA001 }
-//CHINA001 else
-//CHINA001 {
-//CHINA001 aBtnRename.Enable();
-//CHINA001 aBtnRemove.Enable();
-//CHINA001 }
-//CHINA001
-//CHINA001 pWndPreview->NotifyChange( (*pFormat)[nIndex] );
-//CHINA001
-//CHINA001 return 0;
-//CHINA001 }
-//CHINA001
-//CHINA001 //------------------------------------------------------------------------
-//CHINA001
-//CHINA001 String ScAutoFormatDlg::GetCurrFormatName()
-//CHINA001 {
-//CHINA001 String aResult;
-//CHINA001
-//CHINA001 ((*pFormat)[nIndex])->GetName( aResult );
-//CHINA001
-//CHINA001 return aResult;
-//CHINA001 }
-//CHINA001
//========================================================================
// ScAutoFmtPreview
diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx
index f1004a3..8d7d138 100644
--- a/sc/source/ui/miscdlgs/redcom.cxx
+++ b/sc/source/ui/miscdlgs/redcom.cxx
@@ -35,19 +35,18 @@
#include "redcom.hxx"
#include "docsh.hxx"
#include "tabvwsh.hxx"
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
//------------------------------------------------------------------------
ScRedComDialog::ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet,
ScDocShell *pShell,ScChangeAction *pAction,BOOL bPrevNext)
{
- //CHINA001 pDlg = new SvxPostItDialog(pParent,rCoreSet,bPrevNext,TRUE);
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
pDlg = pFact->CreateSvxPostItDialog( pParent, rCoreSet, bPrevNext, TRUE );
- DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog creation failed!");
pDocShell=pShell;
pDlg->DontChangeAuthor();
pDlg->HideAuthor();
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx
index 7c48cf2..fc83920 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -38,19 +38,16 @@
#include <svx/svxids.hrc>
-//CHINA001 #include <svx/chardlg.hxx>
#include <editeng/flstitem.hxx>
-//CHINA001 #include <svx/paragrph.hxx>
-//CHINA001 #include <svx/tabstpge.hxx>
#include <sfx2/objsh.hxx>
#include <svl/cjkoptions.hxx>
#include "textdlgs.hxx"
#include "scresid.hxx"
#include "sc.hrc"
-#include <svx/svxids.hrc> //add CHINA001
-#include <svl/intitem.hxx> //add CHINA001
-#include <svx/flagsdef.hxx> //CHINA001
+#include <svx/svxids.hrc>
+#include <svl/intitem.hxx>
+#include <svx/flagsdef.hxx>
// -----------------------------------------------------------------------
ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr,
@@ -61,16 +58,16 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr,
{
FreeResource();
- AddTabPage( RID_SVXPAGE_CHAR_NAME ); //CHINA001 AddTabPage( RID_SVXPAGE_CHAR_NAME, SvxCharNamePage::Create, 0);
- AddTabPage( RID_SVXPAGE_CHAR_EFFECTS ); //CHINA001 AddTabPage( RID_SVXPAGE_CHAR_EFFECTS, SvxCharEffectsPage::Create, 0);
- AddTabPage( RID_SVXPAGE_CHAR_POSITION ); //CHINA001 AddTabPage( RID_SVXPAGE_CHAR_POSITION, SvxCharPositionPage::Create, 0);
+ AddTabPage( RID_SVXPAGE_CHAR_NAME );
+ AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
+ AddTabPage( RID_SVXPAGE_CHAR_POSITION );
}
// -----------------------------------------------------------------------
void __EXPORT ScCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
{
- SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); //CHINA001
+ SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
switch( nId )
{
case RID_SVXPAGE_CHAR_NAME:
@@ -78,16 +75,13 @@ void __EXPORT ScCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
SvxFontListItem aItem(*( (const SvxFontListItem*)
( rDocShell.GetItem( SID_ATTR_CHAR_FONTLIST) ) ) );
- //CHINA001 ( (SvxCharNamePage&) rPage ).SetFontList( aItem );
aSet.Put (SvxFontListItem( aItem.GetFontList(), SID_ATTR_CHAR_FONTLIST));
rPage.PageCreated(aSet);
}
break;
case RID_SVXPAGE_CHAR_EFFECTS:
- //CHINA001 ( (SvxCharEffectsPage&) rPage ).DisableControls(
- //CHINA001 DISABLE_CASEMAP);
- aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP)); //CHINA001
+ aSet.Put (SfxUInt16Item(SID_DISABLE_CTL,DISABLE_CASEMAP));
rPage.PageCreated(aSet);
break;
@@ -106,14 +100,13 @@ ScParagraphDlg::ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) :
SvtCJKOptions aCJKOptions;
- AddTabPage( RID_SVXPAGE_STD_PARAGRAPH );//CHINA001 AddTabPage( RID_SVXPAGE_STD_PARAGRAPH, SvxStdParagraphTabPage::Create, 0);
- AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH );//CHINA001 AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH, SvxParaAlignTabPage::Create, 0);
- //AddTabPage( RID_SVXPAGE_EXT_PARAGRAPH, SvxExtParagraphTabPage::Create, 0);
+ AddTabPage( RID_SVXPAGE_STD_PARAGRAPH );
+ AddTabPage( RID_SVXPAGE_ALIGN_PARAGRAPH );
if ( aCJKOptions.IsAsianTypographyEnabled() )
- AddTabPage( RID_SVXPAGE_PARA_ASIAN);//CHINA001 AddTabPage( RID_SVXPAGE_PARA_ASIAN, SvxAsianTabPage::Create,0);
+ AddTabPage( RID_SVXPAGE_PARA_ASIAN);
else
RemoveTabPage( RID_SVXPAGE_PARA_ASIAN );
- AddTabPage( RID_SVXPAGE_TABULATOR );//CHINA001 AddTabPage( RID_SVXPAGE_TABULATOR, SvxTabulatorTabPage::Create, 0);
+ AddTabPage( RID_SVXPAGE_TABULATOR );
}
// -----------------------------------------------------------------------
@@ -124,13 +117,10 @@ void __EXPORT ScParagraphDlg::PageCreated( USHORT nId, SfxTabPage &rPage )
{
case RID_SVXPAGE_TABULATOR:
{
- //CHINA001 ( (SvxTabulatorTabPage&) rPage ).
- //CHINA001 DisableControls( TABTYPE_ALL &~TABTYPE_LEFT |
- //CHINA001 TABFILL_ALL &~TABFILL_NONE );
- SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));//add CHINA001
+ SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
aSet.Put(SfxUInt16Item(SID_SVXTABULATORTABPAGE_CONTROLFLAGS,(TABTYPE_ALL &~TABTYPE_LEFT) |
(TABFILL_ALL &~TABFILL_NONE) ));
- rPage.PageCreated(aSet);//add CHINA001
+ rPage.PageCreated(aSet);
}
break;
}
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index ae16bb7..4d6f4fc 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -53,11 +53,6 @@
#include "tpusrlst.hxx"
#undef _TPUSRLST_CXX
-//CHINA001 #include "scui_def.hxx" //CHINA001
-//CHINA001 #include "scresid.hxx" //add by CHINA001
-//CHINA001 #include "miscdlgs.hrc" //add by CHINA001
-//CHINA001
-//CHINA001 #include "scabstdlg.hxx" //CHINA001
// STATIC DATA -----------------------------------------------------------
#define CR (sal_Unicode)13
@@ -444,13 +439,6 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
if ( (nStartCol != nEndCol) && (nStartRow != nEndRow) )
{
nCellDir = ScColOrRowDlg( this, aStrCopyList, aStrCopyFrom ).Execute();
-//CHINA001 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
-//CHINA001 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
-//CHINA001
-//CHINA001 VclAbstractDialog* pDlg = pFact->CreateScColOrRowDlg( this, aStrCopyList, aStrCopyFrom,ResId(RID_SCDLG_COLORROW) );
-//CHINA001 DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
-//CHINA001 nCellDir = pDlg->Execute();
-//CHINA001 delete pDlg; //CHINA001
}
else if ( nStartCol != nEndCol )
nCellDir = SCRET_ROWS;
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index c155ef3..8f703d5 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -40,10 +40,9 @@
#include "hfedtdlg.hxx"
#include "global.hxx"
#include "globstr.hrc"
-//CHINA001 #include "tphfedit.hxx"
#include "scresid.hxx"
#include "hfedtdlg.hrc"
-#include "scuitphfedit.hxx" //CHINA001
+#include "scuitphfedit.hxx"
//------------------------------------------------------------------
// macros from docsh4.cxx
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 2c897cb..b395436 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -38,7 +38,6 @@
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
-//CHINA001 #include <svx/chardlg.hxx>
#include <editeng/editobj.hxx>
#include <editeng/editstat.hxx>
#include <editeng/editview.hxx>
@@ -51,7 +50,6 @@
#define _SVSTDARR_USHORTS
#include <svl/svstdarr.hxx>
-//CHINA001 #include "tphfedit.hxx"
#include "editutil.hxx"
#include "global.hxx"
#include "attrib.hxx"
@@ -65,7 +63,7 @@
#include "textdlgs.hxx"
#include "AccessibleEditObject.hxx"
-#include "scuitphfedit.hxx" //CHINA001
+#include "scuitphfedit.hxx"
#include <memory> // header file for auto_ptr
// STATIC DATA -----------------------------------------------------------
@@ -866,7 +864,7 @@ IMPL_LINK( ScHFEditPage, ListHdl_Impl, ListBox*, pList )
IMPL_LINK( ScHFEditPage, ClickHdl, ImageButton*, pBtn )
{
- pActiveEdWnd = ::GetScEditWindow(); //CHINA001
+ pActiveEdWnd = ::GetScEditWindow();
if ( !pActiveEdWnd )
return 0;
@@ -899,7 +897,7 @@ IMPL_LINK( ScHFEditPage, ClickHdl, ImageButton*, pBtn )
IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn )
{
- pActiveEdWnd = ::GetScEditWindow(); //CHINA001
+ pActiveEdWnd = ::GetScEditWindow();
if ( !pActiveEdWnd )
return 0;
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 059535e..b7d1134 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -47,11 +47,10 @@
#include "tabvwsh.hxx"
#include "viewdata.hxx"
#include "document.hxx"
-//CHINA001 #include "tphfedit.hxx"
#include "hfedtdlg.hxx"
#include "styledlg.hxx"
#include "scresid.hxx"
-#include "scuitphfedit.hxx" //CHINA001
+#include "scuitphfedit.hxx"
#undef _TPHF_CXX
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index baaf85e..02fcd55 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -37,7 +37,6 @@
#include <editeng/eeitem.hxx>
-//CHINA001 #include <svx/chardlg.hxx>
#include <editeng/editobj.hxx>
#include <editeng/editstat.hxx>
#include <editeng/editview.hxx>
@@ -59,10 +58,9 @@
#include "tabvwsh.hxx"
#include "prevwsh.hxx"
#include "hfedtdlg.hrc"
-//CHINA001 #include "textdlgs.hxx"
#include "AccessibleEditObject.hxx"
-#include "scabstdlg.hxx" //CHINA001
+#include "scabstdlg.hxx"
// STATIC DATA -----------------------------------------------------------
@@ -73,312 +71,6 @@ ScEditWindow* GetScEditWindow ()
return pActiveEdWnd;
}
-//CHINA001
-//CHINA001 static USHORT pPageRightHeaderRanges[] = { SID_SCATTR_PAGE_HEADERRIGHT,
-//CHINA001 SID_SCATTR_PAGE_HEADERRIGHT,
-//CHINA001 0 };
-//CHINA001
-//CHINA001 static USHORT pPageRightFooterRanges[] = { SID_SCATTR_PAGE_FOOTERRIGHT,
-//CHINA001 SID_SCATTR_PAGE_FOOTERRIGHT,
-//CHINA001 0 };
-//CHINA001
-//CHINA001 static USHORT pPageLeftHeaderRanges[] = { SID_SCATTR_PAGE_HEADERLEFT,
-//CHINA001 SID_SCATTR_PAGE_HEADERLEFT,
-//CHINA001 0 };
-//CHINA001
-//CHINA001 static USHORT pPageLeftFooterRanges[] = { SID_SCATTR_PAGE_FOOTERLEFT,
-//CHINA001 SID_SCATTR_PAGE_FOOTERLEFT,
-//CHINA001 0 };
-//CHINA001
-//CHINA001 static ScEditWindow* pActiveEdWnd = NULL;
-//CHINA001
-//CHINA001
-//CHINA001
-//CHINA001 //========================================================================
-//CHINA001 // class ScHFEditPage
-//CHINA001 //
-//CHINA001
-//CHINA001 ScHFEditPage::ScHFEditPage( Window* pParent,
-//CHINA001 USHORT nResId,
-//CHINA001 const SfxItemSet& rCoreAttrs,
-//CHINA001 USHORT nWhichId )
-//CHINA001
-//CHINA001 : SfxTabPage ( pParent, ScResId( nResId ), rCoreAttrs ),
-//CHINA001
-//CHINA001 aWndLeft ( this, ScResId( WND_LEFT ), Left ),
-//CHINA001 aWndCenter ( this, ScResId( WND_CENTER ), Center ),
-//CHINA001 aWndRight ( this, ScResId( WND_RIGHT ), Right ),
-//CHINA001 aFtLeft ( this, ScResId( FT_LEFT ) ),
-//CHINA001 aFtCenter ( this, ScResId( FT_CENTER ) ),
-//CHINA001 aFtRight ( this, ScResId( FT_RIGHT ) ),
-//CHINA001 aFlInfo ( this, ScResId( FL_INFO ) ),
-//CHINA001 aFtInfo ( this, ScResId( FT_INFO ) ),
-//CHINA001 aBtnText ( this, ScResId( BTN_TEXT ) ),
-//CHINA001 aBtnPage ( this, ScResId( BTN_PAGE ) ),
-//CHINA001 aBtnLastPage ( this, ScResId( BTN_PAGES ) ),
-//CHINA001 aBtnDate ( this, ScResId( BTN_DATE ) ),
-//CHINA001 aBtnTime ( this, ScResId( BTN_TIME ) ),
-//CHINA001 aBtnFile ( this, ScResId( BTN_FILE ) ),
-//CHINA001 aBtnTable ( this, ScResId( BTN_TABLE ) ),
-//CHINA001 aPopUpFile ( ScResId( RID_POPUP_FCOMMAND) ),
-//CHINA001 nWhich ( nWhichId )
-//CHINA001 {
-//CHINA001 //! use default style from current document?
-//CHINA001 //! if font color is used, header/footer background color must be set
-//CHINA001
-//CHINA001 ScPatternAttr aPatAttr( rCoreAttrs.GetPool() );
-//CHINA001
-//CHINA001 aBtnFile.SetPopupMenu(&aPopUpFile);
-//CHINA001
-//CHINA001 aBtnFile.SetMenuHdl( LINK( this, ScHFEditPage, MenuHdl ) );
-//CHINA001 aBtnText .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
-//CHINA001 aBtnPage .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
-//CHINA001 aBtnLastPage.SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
-//CHINA001 aBtnDate .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
-//CHINA001 aBtnTime .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
-//CHINA001 aBtnFile .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
-//CHINA001 aBtnTable .SetClickHdl( LINK( this, ScHFEditPage, ClickHdl ) );
-//CHINA001
-//CHINA001 aBtnText .SetModeImage( Image( ScResId( IMG_TEXT_H ) ), BMP_COLOR_HIGHCONTRAST );
-//CHINA001 aBtnFile .SetModeImage( Image( ScResId( IMG_FILE_H ) ), BMP_COLOR_HIGHCONTRAST );
-//CHINA001 aBtnTable .SetModeImage( Image( ScResId( IMG_TABLE_H ) ), BMP_COLOR_HIGHCONTRAST );
-//CHINA001 aBtnPage .SetModeImage( Image( ScResId( IMG_PAGE_H ) ), BMP_COLOR_HIGHCONTRAST );
-//CHINA001 aBtnLastPage.SetModeImage( Image( ScResId( IMG_PAGES_H ) ), BMP_COLOR_HIGHCONTRAST );
-//CHINA001 aBtnDate .SetModeImage( Image( ScResId( IMG_DATE_H ) ), BMP_COLOR_HIGHCONTRAST );
-//CHINA001 aBtnTime .SetModeImage( Image( ScResId( IMG_TIME_H ) ), BMP_COLOR_HIGHCONTRAST );
-//CHINA001
-//CHINA001 aWndLeft. SetFont( aPatAttr );
-//CHINA001 aWndCenter. SetFont( aPatAttr );
-//CHINA001 aWndRight. SetFont( aPatAttr );
-//CHINA001
-//CHINA001 FillCmdArr();
-//CHINA001
-//CHINA001 aWndLeft.GrabFocus();
-//CHINA001
-//CHINA001 FreeResource();
-//CHINA001 }
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 __EXPORT ScHFEditPage::~ScHFEditPage()
-//CHINA001 {
-//CHINA001 }
-//CHINA001
-//CHINA001 void ScHFEditPage::SetNumType(SvxNumType eNumType)
-//CHINA001 {
-//CHINA001 aWndLeft.SetNumType(eNumType);
-//CHINA001 aWndCenter.SetNumType(eNumType);
-//CHINA001 aWndRight.SetNumType(eNumType);
-//CHINA001 }
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 #define IS_AVAILABLE(w)(rCoreSet.GetItemState( (w) ) >= SFX_ITEM_AVAILABLE)
-//CHINA001
-//CHINA001 void __EXPORT ScHFEditPage::Reset( const SfxItemSet& rCoreSet )
-//CHINA001 {
-//CHINA001 if ( IS_AVAILABLE( nWhich ) )
-//CHINA001 {
-//CHINA001 const ScPageHFItem& rItem = (const ScPageHFItem&)(rCoreSet.Get( nWhich ));
-//CHINA001
-//CHINA001 const EditTextObject* pLeft = rItem.GetLeftArea();
-//CHINA001 const EditTextObject* pCenter = rItem.GetCenterArea();
-//CHINA001 const EditTextObject* pRight = rItem.GetRightArea();
-//CHINA001
-//CHINA001 if ( pLeft && pCenter && pRight )
-//CHINA001 {
-//CHINA001 aWndLeft .SetText( *pLeft );
-//CHINA001 aWndCenter .SetText( *pCenter );
-//CHINA001 aWndRight .SetText( *pRight );
-//CHINA001 }
-//CHINA001 }
-//CHINA001 }
-//CHINA001
-//CHINA001 #undef IS_AVAILABLE
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 BOOL __EXPORT ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet )
-//CHINA001 {
-//CHINA001 ScPageHFItem aItem( nWhich );
-//CHINA001 EditTextObject* pLeft = aWndLeft .CreateTextObject();
-//CHINA001 EditTextObject* pCenter = aWndCenter.CreateTextObject();
-//CHINA001 EditTextObject* pRight = aWndRight .CreateTextObject();
-//CHINA001
-//CHINA001 aItem.SetLeftArea ( *pLeft );
-//CHINA001 aItem.SetCenterArea( *pCenter );
-//CHINA001 aItem.SetRightArea ( *pRight );
-//CHINA001 delete pLeft;
-//CHINA001 delete pCenter;
-//CHINA001 delete pRight;
-//CHINA001
-//CHINA001 rCoreSet.Put( aItem );
-//CHINA001
-//CHINA001 return TRUE;
-//CHINA001 }
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 #define SET_CMD(i,id) x
-//CHINA001 aCmd = aDel; x
-//CHINA001 aCmd += ScGlobal::GetRscString( id ); x
-//CHINA001 aCmd += aDel; x
-//CHINA001 aCmdArr[i] = aCmd;
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 void ScHFEditPage::FillCmdArr()
-//CHINA001 {
-//CHINA001 String aDel( ScGlobal::GetRscString( STR_HFCMD_DELIMITER ) );
-//CHINA001 String aCmd;
-//CHINA001
-//CHINA001 SET_CMD( 0, STR_HFCMD_PAGE )
-//CHINA001 SET_CMD( 1, STR_HFCMD_PAGES )
-//CHINA001 SET_CMD( 2, STR_HFCMD_DATE )
-//CHINA001 SET_CMD( 3, STR_HFCMD_TIME )
-//CHINA001 SET_CMD( 4, STR_HFCMD_FILE )
-//CHINA001 SET_CMD( 5, STR_HFCMD_TABLE )
-//CHINA001 }
-//CHINA001
-//CHINA001 #undef SET_CMD
-//CHINA001
-//CHINA001 //-----------------------------------------------------------------------
-//CHINA001 // Handler:
-//CHINA001 //-----------------------------------------------------------------------
-//CHINA001
-//CHINA001 IMPL_LINK( ScHFEditPage, ClickHdl, ImageButton*, pBtn )
-//CHINA001 {
-//CHINA001 if ( !pActiveEdWnd )
-//CHINA001 return 0;
-//CHINA001
-//CHINA001 if ( pBtn == &aBtnText )
-//CHINA001 {
-//CHINA001 pActiveEdWnd->SetCharAttriutes();
-//CHINA001 }
-//CHINA001 else
-//CHINA001 {
-//CHINA001 if ( pBtn == &aBtnPage )
-//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem(SvxPageField()) );
-//CHINA001 else if ( pBtn == &aBtnLastPage )
-//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem(SvxPagesField()) );
-//CHINA001 else if ( pBtn == &aBtnDate )
-//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem(SvxDateField(Date(),SVXDATETYPE_VAR)) );
-//CHINA001 else if ( pBtn == &aBtnTime )
-//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem(SvxTimeField()) );
-//CHINA001 else if ( pBtn == &aBtnFile )
-//CHINA001 {
-//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem( SvxFileField() ) );
-//CHINA001 }
-//CHINA001 else if ( pBtn == &aBtnTable )
-//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem(SvxTableField()) );
-//CHINA001 }
-//CHINA001 pActiveEdWnd->GrabFocus();
-//CHINA001
-//CHINA001 return 0;
-//CHINA001 }
-//CHINA001
-//CHINA001 IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn )
-//CHINA001 {
-//CHINA001 if ( !pActiveEdWnd )
-//CHINA001 return 0;
-//CHINA001
-//CHINA001 if(pBtn!=NULL)
-//CHINA001 {
-//CHINA001 switch(pBtn->GetSelected())
-//CHINA001 {
-//CHINA001 case FILE_COMMAND_TITEL:
-//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem( SvxFileField() ) );
-//CHINA001 break;
-//CHINA001 case FILE_COMMAND_FILENAME:
-//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField(
-//CHINA001 EMPTY_STRING, SVXFILETYPE_VAR, SVXFILEFORMAT_NAME_EXT ) ) );
-//CHINA001 break;
-//CHINA001 case FILE_COMMAND_PATH:
-//CHINA001 pActiveEdWnd->InsertField( SvxFieldItem( SvxExtFileField(
-//CHINA001 EMPTY_STRING, SVXFILETYPE_VAR, SVXFILEFORMAT_FULLPATH ) ) );
-//CHINA001 break;
-//CHINA001 }
-//CHINA001 }
-//CHINA001 return 0;
-//CHINA001 }
-//CHINA001
-//CHINA001 //========================================================================
-//CHINA001 // class ScRightHeaderEditPage
-//CHINA001 //========================================================================
-//CHINA001
-//CHINA001 ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet )
-//CHINA001 : ScHFEditPage( pParent, RID_SCPAGE_HFED_HR, rCoreSet,
-//CHINA001 rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_HEADERRIGHT) )
-//CHINA001 {}
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 USHORT* __EXPORT ScRightHeaderEditPage::GetRanges()
-//CHINA001 { return pPageRightHeaderRanges; }
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 SfxTabPage* __EXPORT ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
-//CHINA001 { return ( new ScRightHeaderEditPage( pParent, rCoreSet ) ); };
-//CHINA001
-//CHINA001
-//CHINA001 //========================================================================
-//CHINA001 // class ScLeftHeaderEditPage
-//CHINA001 //========================================================================
-//CHINA001
-//CHINA001 ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet )
-//CHINA001 : ScHFEditPage( pParent, RID_SCPAGE_HFED_HL, rCoreSet,
-//CHINA001 rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_HEADERLEFT) )
-//CHINA001 {}
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 USHORT* __EXPORT ScLeftHeaderEditPage::GetRanges()
-//CHINA001 { return pPageLeftHeaderRanges; }
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 SfxTabPage* __EXPORT ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
-//CHINA001 { return ( new ScLeftHeaderEditPage( pParent, rCoreSet ) ); };
-//CHINA001
-//CHINA001 //========================================================================
-//CHINA001 // class ScRightFooterEditPage
-//CHINA001 //========================================================================
-//CHINA001
-//CHINA001 ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet )
-//CHINA001 : ScHFEditPage( pParent, RID_SCPAGE_HFED_FR, rCoreSet,
-//CHINA001 rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_FOOTERRIGHT) )
-//CHINA001 {}
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 USHORT* __EXPORT ScRightFooterEditPage::GetRanges()
-//CHINA001 { return pPageRightFooterRanges; }
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 SfxTabPage* __EXPORT ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
-//CHINA001 { return ( new ScRightFooterEditPage( pParent, rCoreSet ) ); };
-//CHINA001
-//CHINA001 //========================================================================
-//CHINA001 // class ScLeftFooterEditPage
-//CHINA001 //========================================================================
-//CHINA001
-//CHINA001 ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet )
-//CHINA001 : ScHFEditPage( pParent, RID_SCPAGE_HFED_FL, rCoreSet,
-//CHINA001 rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_FOOTERLEFT) )
-//CHINA001 {}
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 USHORT* __EXPORT ScLeftFooterEditPage::GetRanges()
-//CHINA001 { return pPageLeftFooterRanges; }
-//CHINA001
-//CHINA001 // -----------------------------------------------------------------------
-//CHINA001
-//CHINA001 SfxTabPage* __EXPORT ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
-//CHINA001 { return ( new ScLeftFooterEditPage( pParent, rCoreSet ) ); };
-
//========================================================================
void lcl_GetFieldData( ScHeaderFieldData& rData )
@@ -523,13 +215,12 @@ void ScEditWindow::SetCharAttriutes()
SfxItemSet aSet( pEdView->GetAttribs() );
- //CHINA001 ScCharDlg* pDlg = new ScCharDlg( GetParent(), &aSet, pDocSh );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( GetParent(), &aSet,
pDocSh,RID_SCDLG_CHAR );
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
pDlg->SetText( ScGlobal::GetRscString( STR_TEXTATTRS ) );
if ( pDlg->Execute() == RET_OK )
{
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index 6d5c2d3..41dcc9c 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -35,14 +35,7 @@
//------------------------------------------------------------------
#include "scitems.hxx"
-//CHINA001 #include <svx/align.hxx>
-//CHINA001 #include <svx/backgrnd.hxx>
-//CHINA001 #include <svx/border.hxx>
-//CHINA001 #include <svx/chardlg.hxx>
-//CHINA001 #include <svx/numfmt.hxx>
-#include <svx/numinf.hxx> //CHINA001
-//CHINA001 #include <svx/page.hxx>
-//CHINA001 #include <svx/paragrph.hxx>
+#include <svx/numinf.hxx>
#include <sfx2/objsh.hxx>
#include <svl/style.hxx>
#include <svl/cjkoptions.hxx>
@@ -54,13 +47,13 @@
#include "scresid.hxx"
#include "sc.hrc"
#include "styledlg.hrc"
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/svxids.hrc> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
-#include <svl/intitem.hxx> //CHINA001
-#include <editeng/flstitem.hxx> //CHINA001
-#include <svl/aeitem.hxx> //CHINA001
-#include <svx/flagsdef.hxx> //CHINA001
+#include <svx/svxdlg.hxx>
+#include <svx/svxids.hrc>
+#include <svx/dialogs.hrc>
+#include <svl/intitem.hxx>
+#include <editeng/flstitem.hxx>
+#include <svl/aeitem.hxx>
+#include <svx/flagsdef.hxx>
//==================================================================
ScStyleDlg::ScStyleDlg( Window* pParent,
@@ -73,56 +66,54 @@ ScStyleDlg::ScStyleDlg( Window* pParent,
FALSE ),
nDlgRsc ( nRscId )
{
- SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); //CHINA001
- DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001
+ SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
+ DBG_ASSERT(pFact, "Dialogdiet fail!");
switch ( nRscId )
{
case RID_SCDLG_STYLES_PAR: // Zellformatvorlagen
{
SvtCJKOptions aCJKOptions;
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!");//CHINA001
- DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT ) ); //CHINA001 AddTabPage( TP_NUMBER, &SvxNumberFormatTabPage::Create, &SvxNumberFormatTabPage::GetRanges );
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");//CHINA001
- DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) ); //CHINA001 AddTabPage( TP_FONT, &SvxCharNamePage::Create, &SvxCharNamePage::GetRanges );
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!");//CHINA001
- DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_FONTEFF, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) ); //CHINA001 AddTabPage( TP_FONTEFF, &SvxCharEffectsPage::Create, &SvxCharEffectsPage::GetRanges );
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc fail!");//CHINA001
- DBG_ASSERT( pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ) ); //CHINA001 AddTabPage( TP_ALIGNMENT, &SvxAlignmentTabPage::Create, &SvxAlignmentTabPage::GetRanges );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageCreatorFunc fail!");
+ DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT ), "GetTabPageRangesFunc fail!");
+ AddTabPage( TP_NUMBER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_NUMBERFORMAT ) );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageCreatorFunc fail!");
+ DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ), "GetTabPageRangesFunc fail!");
+ AddTabPage( TP_FONT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_NAME ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_NAME ) );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageCreatorFunc fail!");
+ DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ), "GetTabPageRangesFunc fail!");
+ AddTabPage( TP_FONTEFF, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_EFFECTS ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_CHAR_EFFECTS ) );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageCreatorFunc fail!");
+ DBG_ASSERT( pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ), "GetTabPageRangesFunc fail!");
+ AddTabPage( TP_ALIGNMENT, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_ALIGNMENT ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_ALIGNMENT ) );
if ( aCJKOptions.IsAsianTypographyEnabled() )
{
- //CHINA001 AddTabPage( TP_ASIAN, &SvxAsianTabPage::Create, &SvxAsianTabPage::GetRanges );
-
- DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!");//CHINA001
- DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!");//CHINA001
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageCreatorFunc fail!");
+ DBG_ASSERT(pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN), "GetTabPageRangesFunc fail!");
AddTabPage( TP_ASIAN, pFact->GetTabPageCreatorFunc(RID_SVXPAGE_PARA_ASIAN), pFact->GetTabPageRangesFunc(RID_SVXPAGE_PARA_ASIAN) );
}
else
RemoveTabPage( TP_ASIAN );
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");//CHINA001
- DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); //CHINA001 AddTabPage( TP_BORDER, &SvxBorderTabPage::Create, &SvxBorderTabPage::GetRanges );
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");//CHINA001
- DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); //CHINA001 AddTabPage( TP_BACKGROUND, &SvxBackgroundTabPage::Create, &SvxBackgroundTabPage::GetRanges );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
+ DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
+ AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
+ DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
+ AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
AddTabPage( TP_PROTECTION, &ScTabPageProtection::Create, &ScTabPageProtection::GetRanges );
}
break;
case RID_SCDLG_STYLES_PAGE: // Seitenvorlagen
{
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!");//CHINA001
- DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_PAGE_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) ); //CHINA001 AddTabPage( TP_PAGE_STD, &SvxPageDescPage::Create, &SvxPageDescPage::GetRanges );
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");//CHINA001
- DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) ); //CHINA001 AddTabPage( TP_BORDER, &SvxBorderTabPage::Create, &SvxBorderTabPage::GetRanges );
- DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");//CHINA001
- DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");//CHINA001
- AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) ); //CHINA001 AddTabPage( TP_BACKGROUND, &SvxBackgroundTabPage::Create, &SvxBackgroundTabPage::GetRanges );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), "GetTabPageCreatorFunc fail!");
+ DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ), "GetTabPageRangesFunc fail!");
+ AddTabPage( TP_PAGE_STD, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_PAGE ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_PAGE ) );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), "GetTabPageCreatorFunc fail!");
+ DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ), "GetTabPageRangesFunc fail!");
+ AddTabPage( TP_BORDER, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BORDER ) );
+ DBG_ASSERT(pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageCreatorFunc fail!");
+ DBG_ASSERT(pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ), "GetTabPageRangesFunc fail!");
+ AddTabPage( TP_BACKGROUND, pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ), pFact->GetTabPageRangesFunc( RID_SVXPAGE_BACKGROUND ) );
AddTabPage( TP_PAGE_HEADER, &ScHeaderPage::Create, &ScHeaderPage::GetRanges );
AddTabPage( TP_PAGE_FOOTER, &ScFooterPage::Create, &ScFooterPage::GetRanges );
AddTabPage( TP_TABLE, &ScTablePage::Create, &ScTablePage::GetRanges );
@@ -150,7 +141,7 @@ void __EXPORT ScStyleDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
if ( nDlgRsc == RID_SCDLG_STYLES_PAR )
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
- SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); //CHINA001
+ SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
switch ( nPageId )
{
case TP_NUMBER:
@@ -160,9 +151,6 @@ void __EXPORT ScStyleDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
DBG_ASSERT( pInfoItem, "NumberInfoItem nicht gefunden!" );
- //CHINA001 ((SvxNumberFormatTabPage&)rTabPage).
- //CHINA001 SetNumberFormatList(
- //CHINA001 (const SvxNumberInfoItem&)*pInfoItem ) ;
aSet.Put (SvxNumberInfoItem( (const SvxNumberInfoItem&)*pInfoItem ) );
rTabPage.PageCreated(aSet);
}
@@ -175,9 +163,6 @@ void __EXPORT ScStyleDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
DBG_ASSERT( pInfoItem, "FontListItem nicht gefunden!" );
- //CHINA001 ((SvxCharNamePage&)rTabPage).
- //CHINA001 SetFontList(
- //CHINA001 (const SvxFontListItem&)*pInfoItem );
aSet.Put (SvxFontListItem(((const SvxFontListItem&)*pInfoItem).GetFontList(), SID_ATTR_CHAR_FONTLIST));
rTabPage.PageCreated(aSet);
}
@@ -189,13 +174,12 @@ void __EXPORT ScStyleDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
}
else if ( nDlgRsc == RID_SCDLG_STYLES_PAGE )
{
- SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));//CHINA001
+ SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
switch ( nPageId )
{
case TP_PAGE_STD:
- //CHINA001 ((SvxPageDescPage&)rTabPage).SetMode( SVX_PAGE_MODE_CENTER );
- aSet.Put (SfxAllEnumItem((const USHORT)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_CENTER)); //CHINA001
- rTabPage.PageCreated(aSet); //CHINA001
+ aSet.Put (SfxAllEnumItem((const USHORT)SID_ENUM_PAGE_MODE, SVX_PAGE_MODE_CENTER));
+ rTabPage.PageCreated(aSet);
break;
case TP_PAGE_HEADER:
@@ -206,8 +190,7 @@ void __EXPORT ScStyleDlg::PageCreated( USHORT nPageId, SfxTabPage& rTabPage )
break;
case TP_BACKGROUND:
if( nDlgRsc == RID_SCDLG_STYLES_PAGE)
- //CHINA001 ((SvxBackgroundTabPage&)rTabPage).ShowSelector();
- { //add CHINA001
+ {
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, SVX_SHOW_SELECTOR));
rTabPage.PageCreated(aSet);
}
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 6a472b1..1a6a140 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 6f2f605..82fbe85 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"
//------------------------------------------------------------------------
diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx
index 71e4fae..d99cf01 100644
--- a/sc/source/ui/vba/vbaworksheet.cxx
+++ b/sc/source/ui/vba/vbaworksheet.cxx
@@ -816,10 +816,10 @@ ScVbaWorksheet::ShowDataForm( ) throw (uno::RuntimeException)
ScTabViewShell* pTabViewShell = excel::getBestViewShell( xModel );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScDataFormDlg* pDlg = pFact->CreateScDataFormDlg( pTabViewShell->GetDialogParent(),RID_SCDLG_DATAFORM, pTabViewShell);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
pDlg->Execute();
#else
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 4282c14..4c4f624 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -78,22 +78,13 @@
#include "scmod.hxx"
#include "scresid.hxx"
#include "tabvwsh.hxx"
-//CHINA001 #include "inscldlg.hxx"
-//CHINA001 #include "inscodlg.hxx"
-//CHINA001 #include "delcldlg.hxx"
-//CHINA001 #include "delcodlg.hxx"
-//CHINA001 #include "filldlg.hxx"
-//CHINA001 #include "groupdlg.hxx"
#include "impex.hxx"
#include "reffind.hxx"
-//CHINA001 #include "namecrea.hxx"
#include "uiitems.hxx"
#include "reffact.hxx"
-//CHINA001 #include "namepast.hxx"
#include "inputhdl.hxx"
#include "transobj.hxx"
#include "drwtrans.hxx"
-//CHINA001 #include "linkarea.hxx"
#include "docfunc.hxx"
#include "editable.hxx"
#include "dpobject.hxx"
@@ -104,10 +95,10 @@
#include "clipparam.hxx"
#include "globstr.hrc"
-#include "scui_def.hxx" //CHINA001
-#include <svx/svxdlg.hxx> //CHINA001
-#include <svx/dialogs.hrc> //CHINA001
-#include "scabstdlg.hxx" //CHINA001
+#include "scui_def.hxx"
+#include <svx/svxdlg.hxx>
+#include <svx/dialogs.hrc>
+#include "scabstdlg.hxx"
#define IS_AVAILABLE(WhichId,ppItem) \
(pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
@@ -223,13 +214,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScDocument* pDoc = GetViewData()->GetDocument();
BOOL bTheFlag=(pDoc->GetChangeTrack()!=NULL);
-//CHINA001 ScInsertCellDlg* pDlg = new ScInsertCellDlg( pTabViewShell->GetDialogParent(),
-//CHINA001 bTheFlag);
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScInsertCellDlg* pDlg = pFact->CreateScInsertCellDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_INSCELL, bTheFlag);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if (pDlg->Execute() == RET_OK)
eCmd = pDlg->GetInsCellCmd();
delete pDlg;
@@ -298,13 +287,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
(GetViewData()->GetSimpleArea(aRange) == SC_MARK_SIMPLE_FILTERED) ||
(pDoc->GetChangeTrack() != NULL);
- //CHINA001 ScDeleteCellDlg* pDlg = new ScDeleteCellDlg(
- //CHINA001 pTabViewShell->GetDialogParent(),bTheFlag);
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScDeleteCellDlg* pDlg = pFact->CreateScDeleteCellDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_DELCELL, bTheFlag );
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if (pDlg->Execute() == RET_OK)
eCmd = pDlg->GetDelCellCmd();
@@ -385,12 +372,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScEditableTester aTester( pTabViewShell );
if (aTester.IsEditable())
{
- //CHINA001 ScDeleteContentsDlg* pDlg = new ScDeleteContentsDlg( pTabViewShell->GetDialogParent() );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScDeleteContentsDlg* pDlg = pFact->CreateScDeleteContentsDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_DELCONT );
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
ScDocument* pDoc = GetViewData()->GetDocument();
SCTAB nTab = GetViewData()->GetTabNo();
if ( pDoc->IsTabProtected(nTab) )
@@ -496,17 +482,13 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
else
{
-//CHINA001 ScInsertContentsDlg* pDlg =
-//CHINA001 new ScInsertContentsDlg(pTabViewShell->GetDialogParent(),
-//CHINA001 0, /* nCheckDefaults */
-//CHINA001 &ScGlobal::GetRscString(STR_FILL_TAB) );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScInsertContentsDlg* pDlg = pFact->CreateScInsertContentsDlg( pTabViewShell->GetDialogParent(),
RID_SCDLG_INSCONT, 0, /* nCheckDefaults */
&ScGlobal::GetRscString(STR_FILL_TAB));
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
pDlg->SetFillMode(TRUE);
if (pDlg->Execute() == RET_OK)
@@ -734,13 +716,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
}
}
-//CHINA001 ScFillSeriesDlg* pDlg = new ScFillSeriesDlg(
-//CHINA001 pTabViewShell->GetDialogParent(), *pDoc,
-//CHINA001 eFillDir, eFillCmd, eFillDateCmd,
-//CHINA001 aStartStr, fIncVal, fMaxVal,
-//CHINA001 nPossDir);
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScFillSeriesDlg* pDlg = pFact->CreateScFillSeriesDlg( pTabViewShell->GetDialogParent(),
*pDoc,
@@ -748,7 +725,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
aStartStr, fIncVal, fMaxVal,
nPossDir,
RID_SCDLG_FILLSERIES);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if ( nStartCol != nEndCol && nStartRow != nEndRow )
{
@@ -969,11 +946,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
if ( pTabViewShell->HasSelectionForDrillDown( nOrientation ) )
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScDPShowDetailDlg* pDlg = pFact->CreateScDPShowDetailDlg(
pTabViewShell->GetDialogParent(), RID_SCDLG_DPSHOWDETAIL, *pDPObj, nOrientation );
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
{
String aNewDimName( pDlg->GetDimensionName() );
@@ -1062,13 +1039,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
bColumns = FALSE;
else
{
-//CHINA001 ScGroupDlg* pDlg = new ScGroupDlg(pTabViewShell->GetDialogParent(),
-//CHINA001 RID_SCDLG_GRP_MAKE, FALSE );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScGroupDlg* pDlg = pFact->CreateAbstractScGroupDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_GRP_MAKE, RID_SCDLG_GRP_MAKE,FALSE);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
bColumns = pDlg->GetColsChecked();
else
@@ -1124,13 +1099,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
pTabViewShell->TestRemoveOutline( bColPoss, bRowPoss );
if ( bColPoss && bRowPoss )
{
- //CHINA001 ScGroupDlg* pDlg = new ScGroupDlg( pTabViewShell->GetDialogParent(),
- //CHINA001 RID_SCDLG_GRP_KILL, TRUE );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScGroupDlg* pDlg = pFact->CreateAbstractScGroupDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_GRP_KILL, RID_SCDLG_GRP_KILL,TRUE);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
bColumns = pDlg->GetColsChecked();
else
@@ -1293,13 +1266,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScEditableTester aTester( pTabViewShell );
if (aTester.IsEditable())
{
- //CHINA001 ScInsertContentsDlg* pDlg = new ScInsertContentsDlg( pTabViewShell->GetDialogParent() );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScInsertContentsDlg* pDlg = pFact->CreateScInsertContentsDlg( pTabViewShell->GetDialogParent(),
RID_SCDLG_INSCONT);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
pDlg->SetOtherDoc( bOtherDoc );
// #53661# bei ChangeTrack MoveMode disablen
pDlg->SetChangeTrack( pDoc->GetChangeTrack() != NULL );
@@ -1666,12 +1638,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
USHORT nFlags = pTabViewShell->GetCreateNameFlags();
- //CHINA001 ScNameCreateDlg* pDlg = new ScNameCreateDlg( pTabViewShell->GetDialogParent(), nFlags );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScNameCreateDlg* pDlg = pFact->CreateScNameCreateDlg(pTabViewShell->GetDialogParent(), nFlags, RID_SCDLG_NAMES_CREATE );
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if( pDlg->Execute() )
{
@@ -1822,12 +1793,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
case FID_INSERT_NAME:
{
ScDocument* pDoc = GetViewData()->GetDocument();
- //CHINA001 ScNamePasteDlg* pDlg = new ScNamePasteDlg( pTabViewShell->GetDialogParent(), pDoc->GetRangeName() );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScNamePasteDlg* pDlg = pFact->CreateScNamePasteDlg( pTabViewShell->GetDialogParent(), pDoc->GetRangeName(), RID_SCDLG_NAMES_PASTE );
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
switch( pDlg->Execute() )
{
case BTN_PASTE_LIST:
@@ -1945,7 +1915,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
else
{
- //CHINA001 SvxCharacterMap* pDlg = new SvxCharacterMap( pTabViewShell->GetDialogParent(), FALSE );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
// font color doesn't matter here
@@ -2071,15 +2040,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
else
{
- //CHINA001 ScLinkedAreaDlg* pDlg = new ScLinkedAreaDlg( pTabViewShell->GetDialogParent() );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
delete pImpl->m_pLinkedDlg;
pImpl->m_pLinkedDlg =
pFact->CreateScLinkedAreaDlg( pTabViewShell->GetDialogParent(),
RID_SCDLG_LINKAREA);
- DBG_ASSERT(pImpl->m_pLinkedDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pImpl->m_pLinkedDlg, "Dialog create fail!");
delete pImpl->m_pRequest;
pImpl->m_pRequest = new SfxRequest( rReq );
pImpl->m_pLinkedDlg->StartExecuteModal( LINK( this, ScCellShell, DialogClosed ) );
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 3908596..293e423 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -61,35 +61,24 @@
#include "uiitems.hxx"
#include "dbfunc.hxx"
#include "dbdocfun.hxx"
-//CHINA001 #include "lbseldlg.hxx"
-//CHINA001 #include "sortdlg.hxx"
#include "filtdlg.hxx"
#include "dbnamdlg.hxx"
-//CHINA001 #include "subtdlg.hxx"
#include "reffact.hxx"
#include "pvlaydlg.hxx"
#include "validat.hxx"
#include "scresid.hxx"
-//CHINA001 #include "validate.hxx"
#include "pivot.hxx"
#include "dpobject.hxx"
-//CHINA001 #include "dapitype.hxx"
-//CHINA001 #include "dapidata.hxx"
#include "dpsdbtab.hxx" // ScImportSourceDesc
#include "dpshttab.hxx" // ScSheetSourceDesc
-#include "validate.hrc" //CHINA001 add for ScValidationDlg
-#include "scui_def.hxx" //CHINA001
-#include "scabstdlg.hxx" //CHINA001
+#include "validate.hrc" // ScValidationDlg
+#include "scui_def.hxx"
+#include "scabstdlg.hxx"
#include "impex.hxx"
#include "asciiopt.hxx"
using namespace com::sun::star;
-//#include "strindlg.hxx" //! Test !!!!!
-
-//static ScArea aPivotSource; //! wohin? (ueber den Dialog retten)
-
-
#define IS_AVAILABLE(WhichId,ppItem) \
(pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET)
@@ -181,10 +170,10 @@ BOOL lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam )
rCurrentRange.Format( aCurrentStr, nFmt, pDoc );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
VclAbstractDialog* pWarningDlg = pFact->CreateScSortWarningDlg( pTabViewShell->GetDialogParent(),aExtendStr,aCurrentStr,RID_SCDLG_SORT_WARNING );
- DBG_ASSERT(pWarningDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pWarningDlg, "Dialog create fail!");
short bResult = pWarningDlg->Execute();
if( bResult == BTN_EXTEND_RANGE || bResult == BTN_CURRENT_SELECTION )
{
@@ -356,7 +345,6 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
else
{
- //CHINA001 ScSubTotalDlg* pDlg = NULL;
SfxAbstractTabDialog * pDlg = NULL;
ScSubTotalParam aSubTotalParam;
SfxItemSet aArgSet( GetPool(), SCITEM_SUBTDATA, SCITEM_SUBTDATA );
@@ -366,12 +354,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
aSubTotalParam.bRemoveOnly = FALSE;
aArgSet.Put( ScSubTotalItem( SCITEM_SUBTDATA, GetViewData(), &aSubTotalParam ) );
- //CHINA001 pDlg = new ScSubTotalDlg( pTabViewShell->GetDialogParent(), &aArgSet );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
pDlg = pFact->CreateScSubTotalDlg( pTabViewShell->GetDialogParent(), &aArgSet, RID_SCDLG_SUBTOTALS );
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
pDlg->SetCurPageId(1);
short bResult = pDlg->Execute();
@@ -551,10 +538,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
aArgSet.Put( ScSortItem( SCITEM_SORTDATA, GetViewData(), &aSortParam ) );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
pDlg = pFact->CreateScSortDlg( pTabViewShell->GetDialogParent(), &aArgSet, RID_SCDLG_SORT );
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
pDlg->SetCurPageId(1); // 1=sort field tab 2=sort options tab
if ( pDlg->Execute() == RET_OK )
@@ -775,23 +762,19 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
// first select type of source data
BOOL bEnableExt = ScDPObject::HasRegisteredSources();
- //CHINA001 ScDataPilotSourceTypeDlg* pTypeDlg = new ScDataPilotSourceTypeDlg(
- //CHINA001 pTabViewShell->GetDialogParent(), bEnableExt );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScDataPilotSourceTypeDlg* pTypeDlg = pFact->CreateScDataPilotSourceTypeDlg( pTabViewShell->GetDialogParent(), bEnableExt, RID_SCDLG_DAPITYPE );
- DBG_ASSERT(pTypeDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pTypeDlg, "Dialog create fail!");
if ( pTypeDlg->Execute() == RET_OK )
{
if ( pTypeDlg->IsExternal() )
{
uno::Sequence<rtl::OUString> aSources = ScDPObject::GetRegisteredSources();
- //CHINA001 ScDataPilotServiceDlg* pServDlg = new ScDataPilotServiceDlg(
- //CHINA001 pTabViewShell->GetDialogParent(), aSources );
AbstractScDataPilotServiceDlg* pServDlg = pFact->CreateScDataPilotServiceDlg( pTabViewShell->GetDialogParent(), aSources, RID_SCDLG_DAPISERVICE );
- DBG_ASSERT(pServDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pServDlg, "Dialog create fail!");
if ( pServDlg->Execute() == RET_OK )
{
ScDPServiceDesc aServDesc(
@@ -807,13 +790,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
else if ( pTypeDlg->IsDatabase() )
{
- //CHINA001 ScDataPilotDatabaseDlg* pDataDlg = new ScDataPilotDatabaseDlg(
- //CHINA001 pTabViewShell->GetDialogParent() );
- //ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScDataPilotDatabaseDlg* pDataDlg = pFact->CreateScDataPilotDatabaseDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_DAPIDATA);
- DBG_ASSERT(pDataDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDataDlg, "Dialog create fail!");
if ( pDataDlg->Execute() == RET_OK )
{
ScImportSourceDesc aImpDesc;
@@ -974,13 +954,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
}
-//CHINA001 ScSelEntryDlg* pDlg =
-//CHINA001 new ScSelEntryDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_SELECTDB,
-//CHINA001 String(ScResId(SCSTR_SELECTDB)),
-//CHINA001 String(ScResId(SCSTR_AREAS)),
-//CHINA001 aList );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScSelEntryDlg* pDlg = pFact->CreateScSelEntryDlg( pTabViewShell->GetDialogParent(),
RID_SCDLG_SELECTDB,
@@ -988,7 +963,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
String(ScResId(SCSTR_AREAS)),
aList,
RID_SCDLG_SELECTDB);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
{
String aName = pDlg->GetSelectEntry();
@@ -1020,12 +995,11 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
else
{
- //CHINA001 SfxItemSet aArgSet( GetPool(), ScTPValidationValue::GetRanges() );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
::GetTabPageRanges ScTPValidationValueGetRanges = pFact->GetTabPageRangesFunc(TP_VALIDATION_VALUES);
- DBG_ASSERT(ScTPValidationValueGetRanges, "TabPage create fail!");//CHINA001
- SfxItemSet aArgSet( GetPool(), (*ScTPValidationValueGetRanges)() );//CHINA001
+ DBG_ASSERT(ScTPValidationValueGetRanges, "TabPage create fail!");
+ SfxItemSet aArgSet( GetPool(), (*ScTPValidationValueGetRanges)() );
ScValidationMode eMode = SC_VALID_ANY;
ScConditionMode eOper = SC_COND_EQUAL;
String aExpr1, aExpr2;
@@ -1083,22 +1057,14 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
}
}
- //CHINA001 ScValidationDlg* pDlg = new ScValidationDlg( NULL, &aArgSet );
- //CHINA001 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- //CHINA001 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
-
- //<!--Modified by PengYunQuan for Validity Cell Range Picker
- //SfxAbstractTabDialog* pDlg = pFact->CreateScValidationDlg( NULL, &aArgSet, TAB_DLG_VALIDATION );
+ // cell range picker
SfxAbstractTabDialog* pDlg = pFact->CreateScValidationDlg( NULL, &aArgSet, TAB_DLG_VALIDATION, pTabViewShell );
- //-->Modified by PengYunQuan for Validity Cell Range Picker
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
- //<!--Modified by PengYunQuan for Validity Cell Range Picker
- //if ( pDlg->Execute() == RET_OK )
short nResult = pDlg->Execute();
- pTabViewShell->SetTabNo( nTab );//When picking Cell Range ,other Tab may be switched. Need restore the correct tab
+ //When picking Cell Range, other Tab may be switched. Need restore the correct tab
+ pTabViewShell->SetTabNo( nTab );
if ( nResult == RET_OK )
- //-->Modified by PengYunQuan for Validity Cell Range Picker
{
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index a2a7520..90eafab 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -49,8 +49,6 @@
#include "docsh.hxx"
#include "reffact.hxx"
#include "uiitems.hxx"
-//CHINA001 #include "scendlg.hxx"
-//CHINA001 #include "mtrindlg.hxx"
#include "autoform.hxx"
#include "autofmt.hxx"
#include "cellsh.hxx"
@@ -58,7 +56,7 @@
#include "inputhdl.hxx"
#include "editable.hxx"
-#include "scabstdlg.hxx" //CHINA001
+#include "scabstdlg.hxx"
#define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() )
@@ -481,13 +479,11 @@ void ScCellShell::Execute( SfxRequest& rReq )
else
{
BOOL bSheetProtected = pDoc->IsTabProtected(nTab);
- //CHINA001 ScNewScenarioDlg* pNewDlg =
- //CHINA001 new ScNewScenarioDlg( pTabViewShell->GetDialogParent(), aName, FALSE, bSheetProtected );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScNewScenarioDlg* pNewDlg = pFact->CreateScNewScenarioDlg( pTabViewShell->GetDialogParent(), aName, RID_SCDLG_NEWSCENARIO, FALSE,bSheetProtected);
- DBG_ASSERT(pNewDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pNewDlg, "Dialog create fail!");
if ( pNewDlg->Execute() == RET_OK )
{
pNewDlg->GetScenarioData( aName, aComment, aColor, nFlags );
@@ -537,15 +533,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
USHORT nCurHeight = pData->GetDocument()->
GetRowHeight( pData->GetCurY(),
pData->GetTabNo() );
-//CHINA001 ScMetricInputDlg* pDlg =
-//CHINA001 new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_ROW_MAN,
-//CHINA001 nCurHeight,
-//CHINA001 ScGlobal::nStdRowHeight,
-//CHINA001 eMetric,
-//CHINA001 2,
-//CHINA001 MAX_COL_HEIGHT );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScMetricInputDlg* pDlg = pFact->CreateScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_ROW_MAN,
nCurHeight,
@@ -554,7 +543,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
eMetric,
2,
MAX_COL_HEIGHT);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
{
@@ -589,15 +578,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
{
FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric();
-//CHINA001 ScMetricInputDlg* pDlg =
-//CHINA001 new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_ROW_OPT,
-//CHINA001 ScGlobal::nLastRowHeightExtra,
-//CHINA001 0,
-//CHINA001 eMetric,
-//CHINA001 1,
-//CHINA001 MAX_EXTRA_HEIGHT );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScMetricInputDlg* pDlg = pFact->CreateScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_ROW_OPT,
ScGlobal::nLastRowHeightExtra,
@@ -606,7 +588,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
eMetric,
1,
MAX_EXTRA_HEIGHT);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
{
@@ -643,15 +625,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
USHORT nCurHeight = pData->GetDocument()->
GetColWidth( pData->GetCurX(),
pData->GetTabNo() );
-//CHINA001 ScMetricInputDlg* pDlg =
-//CHINA001 new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_COL_MAN,
-//CHINA001 nCurHeight,
-//CHINA001 STD_COL_WIDTH,
-//CHINA001 eMetric,
-//CHINA001 2,
-//CHINA001 MAX_COL_WIDTH );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScMetricInputDlg* pDlg = pFact->CreateScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_COL_MAN,
nCurHeight,
@@ -660,7 +635,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
eMetric,
2,
MAX_COL_WIDTH);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
{
@@ -695,16 +670,8 @@ void ScCellShell::Execute( SfxRequest& rReq )
{
FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric();
-//CHINA001 ScMetricInputDlg* pDlg =
-//CHINA001 new ScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_COL_OPT,
-//CHINA001 ScGlobal::nLastColWidthExtra,
-//CHINA001 STD_EXTRA_WIDTH,
-//CHINA001 eMetric,
-//CHINA001 1,
-//CHINA001 MAX_EXTRA_WIDTH );
-
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScMetricInputDlg* pDlg = pFact->CreateScMetricInputDlg( pTabViewShell->GetDialogParent(), RID_SCDLG_COL_OPT,
ScGlobal::nLastColWidthExtra,
@@ -713,7 +680,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
eMetric,
1,
MAX_EXTRA_WIDTH);
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
{
long nVal = pDlg->GetInputValue();
@@ -858,16 +825,11 @@ void ScCellShell::Execute( SfxRequest& rReq )
{
ScGlobal::ClearAutoFormat();
ScAutoFormatData* pNewEntry = pTabViewShell->CreateAutoFormatData();
-//CHINA001 ScAutoFormatDlg* pDlg = new ScAutoFormatDlg(
-//CHINA001 pDlgParent,
-//CHINA001 ScGlobal::GetAutoFormat(),
-//CHINA001 pNewEntry,
-//CHINA001 GetViewData()->GetDocument() );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScAutoFormatDlg* pDlg = pFact->CreateScAutoFormatDlg( pDlgParent, ScGlobal::GetAutoFormat(), pNewEntry,GetViewData()->GetDocument(), RID_SCDLG_AUTOFORMAT );
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
if ( pDlg->Execute() == RET_OK )
{
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 3ca671d..686071c 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -82,18 +82,16 @@
#include "viewutil.hxx"
#include "viewdata.hxx"
#include "document.hxx"
-//CHINA001 #include "namepast.hxx"
#include "reffind.hxx"
#include "tabvwsh.hxx"
-//CHINA001 #include "textdlgs.hxx"
#include "editutil.hxx"
#include "globstr.hrc"
#define ScEditShell
#include "scslots.hxx"
-#include "scui_def.hxx" //CHINA001
-#include "scabstdlg.hxx" //CHINA001
+#include "scui_def.hxx"
+#include "scabstdlg.hxx"
using namespace ::com::sun::star;
@@ -421,14 +419,11 @@ void ScEditShell::Execute( SfxRequest& rReq )
case FID_INSERT_NAME:
{
ScDocument* pDoc = pViewData->GetDocument();
- //CHINA001 ScNamePasteDlg* pDlg = new ScNamePasteDlg( pViewData->GetDialogParent(),
- //CHINA001 pDoc->GetRangeName(), FALSE );
- // "Liste" disablen
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
AbstractScNamePasteDlg* pDlg = pFact->CreateScNamePasteDlg( pViewData->GetDialogParent(), pDoc->GetRangeName(), RID_SCDLG_NAMES_PASTE, FALSE );
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
short nRet = pDlg->Execute();
// pDlg is needed below
@@ -460,13 +455,12 @@ void ScEditShell::Execute( SfxRequest& rReq )
SfxObjectShell* pObjSh = pViewData->GetSfxDocShell();
- //CHINA001 ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(), &aAttrs, pObjSh );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &aAttrs,
pObjSh, RID_SCDLG_CHAR );
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
short nRet = pDlg->Execute();
// pDlg is needed below
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 62ddd35..da9ea59 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -90,7 +90,6 @@
#include "docsh.hxx"
#include "patattr.hxx"
#include "scmod.hxx"
-//CHINA001 #include "styledlg.hxx"
#include "attrdlg.hrc"
#include "stlpool.hxx"
#include "stlsheet.hxx"
@@ -109,7 +108,7 @@
#define Interior
#include <svx/svxslots.hxx>
-#include "scabstdlg.hxx" //CHINA001
+#include "scabstdlg.hxx"
namespace {
@@ -710,10 +709,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
SvxNumberInfoItem* pNumberInfoItem = NULL;
SfxStyleFamily eFam = pStyleSheet->GetFamily();
- // ScDocument* pDoc = GetViewData()->GetDocument();
- // ScDocShell* pDocSh = GetViewData()->GetDocShell();
- //CHINA001 ScStyleDlg* pDlg = NULL;
- SfxAbstractTabDialog* pDlg = NULL; //CHINA001
+ SfxAbstractTabDialog* pDlg = NULL;
USHORT nRsc = 0;
// #37034#/#37245# alte Items aus der Vorlage merken
@@ -794,12 +790,11 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq )
pTabViewShell->SetInFormatDialog(TRUE);
- //CHINA001 pDlg = new ScStyleDlg( pParent, *pStyleSheet, nRsc );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
- DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
+ DBG_ASSERT(pFact, "ScAbstractFactory create fail!");
pDlg = pFact->CreateScStyleDlg( pParent, *pStyleSheet, nRsc, nRsc );
- DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ DBG_ASSERT(pDlg, "Dialog create fail!");
short nResult = pDlg->Execute();
pTabViewShell->SetInFormatDialog(FALSE);
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 28cf67c..da95f97 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -41,7 +41,6 @@
#include "docsh.hxx"
#include "viewdata.hxx"
#include "pivot.hxx"
-//CHINA001 #include "pfiltdlg.hxx"
#include "uiitems.hxx"
#include "scresid.hxx"
#include "sc.hrc"
@@ -58,7 +57,7 @@
#include "userlist.hxx"
... etc. - the rest is truncated
More information about the ooo-build-commit
mailing list