editsh.cxx (da72173f) editsh.cxx (d9a8b508)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 441 unchanged lines hidden (view full) ---

450 }
451 delete pDlg;
452
453 if (pTopView)
454 pTopView->GetWindow()->GrabFocus();
455 }
456 break;
457
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 441 unchanged lines hidden (view full) ---

450 }
451 delete pDlg;
452
453 if (pTopView)
454 pTopView->GetWindow()->GrabFocus();
455 }
456 break;
457
458 case SID_CHAR_DLG_EFFECT:
458 case SID_CHAR_DLG:
459 {
460 SfxItemSet aAttrs( pTableView->GetAttribs() );
461
462 SfxObjectShell* pObjSh = pViewData->GetSfxDocShell();
463
464 //CHINA001 ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(), &aAttrs, pObjSh );
465 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
466 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
467
468 SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &aAttrs,
469 pObjSh, RID_SCDLG_CHAR );
470 DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
459 case SID_CHAR_DLG:
460 {
461 SfxItemSet aAttrs( pTableView->GetAttribs() );
462
463 SfxObjectShell* pObjSh = pViewData->GetSfxDocShell();
464
465 //CHINA001 ScCharDlg* pDlg = new ScCharDlg( pViewData->GetDialogParent(), &aAttrs, pObjSh );
466 ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
467 DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001
468
469 SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &aAttrs,
470 pObjSh, RID_SCDLG_CHAR );
471 DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
472 if (nSlot == SID_CHAR_DLG_EFFECT)
473 {
474 pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
475 }
471 short nRet = pDlg->Execute();
472 // pDlg is needed below
473
474 // while the dialog was open, edit mode may have been stopped
475 if (!SC_MOD()->IsInputMode())
476 {
477 Sound::Beep();
478 delete pDlg;

--- 728 unchanged lines hidden --- 		476 short nRet = pDlg->Execute();
477 // pDlg is needed below
478
479 // while the dialog was open, edit mode may have been stopped
480 if (!SC_MOD()->IsInputMode())
481 {
482 Sound::Beep();
483 delete pDlg;

--- 728 unchanged lines hidden ---