annotsh.cxx (da72173f) annotsh.cxx (eb39ad03)
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

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

423 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
424 DBG_ASSERT(pFact, "Dialogdiet fail!");
425 AbstractSwWordCountDialog* pDialog = pFact->CreateSwWordCountDialog( rView.GetWindow() );
426 pDialog->SetValues(aCurr, aDocStat );
427 pDialog->Execute();
428 delete pDialog;
429 }
430 break;
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

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

423 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
424 DBG_ASSERT(pFact, "Dialogdiet fail!");
425 AbstractSwWordCountDialog* pDialog = pFact->CreateSwWordCountDialog( rView.GetWindow() );
426 pDialog->SetValues(aCurr, aDocStat );
427 pDialog->Execute();
428 delete pDialog;
429 }
430 break;
431 case SID_CHAR_DLG_EFFECT:
431 case SID_CHAR_DLG:
432 {
433 const SfxItemSet* pArgs = rReq.GetArgs();
434
435 if( !pArgs )
436 {
437 /* mod
438 SwView* pView = &GetView();

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

447 aDlgAttr.Put( SvxKerningItem(0, RES_CHRATR_KERNING) );
448
449 //CHINA001 SwCharDlg* pDlg = new SwCharDlg(pView->GetWindow(), *pView, aDlgAttr, 0, sal_True);
450 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();//CHINA001
451 DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");//CHINA001
452
453 SfxAbstractTabDialog* pDlg = pFact->CreateSwCharDlg( rView.GetWindow(), rView, aDlgAttr, DLG_CHAR,0, sal_True );
454 DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
432 case SID_CHAR_DLG:
433 {
434 const SfxItemSet* pArgs = rReq.GetArgs();
435
436 if( !pArgs )
437 {
438 /* mod
439 SwView* pView = &GetView();

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

448 aDlgAttr.Put( SvxKerningItem(0, RES_CHRATR_KERNING) );
449
450 //CHINA001 SwCharDlg* pDlg = new SwCharDlg(pView->GetWindow(), *pView, aDlgAttr, 0, sal_True);
451 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();//CHINA001
452 DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!");//CHINA001
453
454 SfxAbstractTabDialog* pDlg = pFact->CreateSwCharDlg( rView.GetWindow(), rView, aDlgAttr, DLG_CHAR,0, sal_True );
455 DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
456 if (nSlot == SID_CHAR_DLG_EFFECT)
457 {
458 pDlg->SetCurPageId(TP_CHAR_EXT);
459 }
455 sal_uInt16 nRet = pDlg->Execute();
456 if(RET_OK == nRet )
457 {
458 rReq.Done( *( pDlg->GetOutputItemSet() ) );
459 aNewAttr.Put(*pDlg->GetOutputItemSet());
460 }
461 delete( pDlg );
462 if(RET_OK != nRet)

--- 1218 unchanged lines hidden --- 		460 sal_uInt16 nRet = pDlg->Execute();
461 if(RET_OK == nRet )
462 {
463 rReq.Done( *( pDlg->GetOutputItemSet() ) );
464 aNewAttr.Put(*pDlg->GetOutputItemSet());
465 }
466 delete( pDlg );
467 if(RET_OK != nRet)

--- 1218 unchanged lines hidden ---