diff options
| author | Alan Du <alan_du22@yahoo.com> | 2010-10-11 20:11:42 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2010-10-11 20:11:42 -0400 |
| commit | f25d7371795d963369cec5eafe30f436f83f2dd2 (patch) | |
| tree | 8218d41989ad07304442fb8bb663462a0f933323 /cui/source/tabpages/tpbitmap.cxx | |
| parent | 4ad9f8a96576a15f613eebe39f18cc9c9b5c7bae (diff) | |
Removed a lot of the //CHINA001 comments.
Diffstat (limited to 'cui/source/tabpages/tpbitmap.cxx')
| -rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index a9b60a717e1c..30cfac6fdfdb 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -548,18 +548,18 @@ long SvxBitmapTabPage::CheckChanges_Impl() ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxMessDialog* aMessDlg = pFact->CreateSvxMessDialog( DLGWIN, RID_SVXDLG_MESSBOX, String( SVX_RES( RID_SVXSTR_BITMAP ) ), String( CUI_RES( RID_SVXSTR_ASK_CHANGE_BITMAP ) ), &aWarningBoxImage ); - DBG_ASSERT(aMessDlg, "Dialogdiet fail!");//CHINA001 - aMessDlg->SetButtonText( MESS_BTN_1, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_1, + DBG_ASSERT(aMessDlg, "Dialogdiet fail!"); + aMessDlg->SetButtonText( MESS_BTN_1, String( ResId( RID_SVXSTR_CHANGE, rMgr ) ) ); - aMessDlg->SetButtonText( MESS_BTN_2, //CHINA001 aMessDlg.SetButtonText( MESS_BTN_2, + aMessDlg->SetButtonText( MESS_BTN_2, String( ResId( RID_SVXSTR_ADD, rMgr ) ) ); - short nRet = aMessDlg->Execute(); //CHINA001 short nRet = aMessDlg.Execute(); + short nRet = aMessDlg->Execute(); switch( nRet ) { @@ -581,7 +581,7 @@ long SvxBitmapTabPage::CheckChanges_Impl() break; // return( TRUE ); // Abbruch } - delete aMessDlg; //add by CHINA001 + delete aMessDlg; } } nPos = aLbBitmaps.GetSelectEntryPos(); @@ -616,9 +616,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); WarningBox* pWarnBox = NULL; USHORT nError = RID_SVXSTR_WARN_NAME_DUPLICATE; @@ -746,9 +746,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) String aName; INetURLObject aURL( aDlg.GetPath() ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, String(aURL.GetName()).GetToken( 0, '.' ), aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); nError = RID_SVXSTR_WARN_NAME_DUPLICATE; while( pDlg->Execute() == RET_OK ) @@ -838,9 +838,9 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) String aOldName = aName; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - DBG_ASSERT(pFact, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* pDlg = pFact->CreateSvxNameDialog( DLGWIN, aName, aDesc ); - DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + DBG_ASSERT(pDlg, "Dialogdiet fail!"); long nCount = pBitmapList->Count(); BOOL bDifferent = FALSE; |