frmsh.cxx (1ff378ef) frmsh.cxx (395b75f9)
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

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

411 {
412 bUpdateMgr = sal_False;
413 }
414
415 }
416 break;
417
418 case FN_FORMAT_FRAME_DLG:
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

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

411 {
412 bUpdateMgr = sal_False;
413 }
414
415 }
416 break;
417
418 case FN_FORMAT_FRAME_DLG:
419 case FN_PROPERTY_WRAP_DLG:
419 case FN_DRAW_WRAP_DLG:
420 {
421 const int nSel = rSh.GetSelectionType();
422 if (nSel & nsSelectionType::SEL_GRF)
423 {
424 rSh.GetView().GetViewFrame()->GetDispatcher()->Execute(FN_FORMAT_GRAFIC_DLG);
425 bUpdateMgr = sal_False;
426 }
427 else

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

494 aSet, sal_False,
495 nSel & nsSelectionType::SEL_GRF ? DLG_FRM_GRF :
496 nSel & nsSelectionType::SEL_OLE ? DLG_FRM_OLE :
497 DLG_FRM_STD,
498 sal_False,
499 nDefPage);
500 DBG_ASSERT(pDlg, "Dialogdiet fail!");
501
420 {
421 const int nSel = rSh.GetSelectionType();
422 if (nSel & nsSelectionType::SEL_GRF)
423 {
424 rSh.GetView().GetViewFrame()->GetDispatcher()->Execute(FN_FORMAT_GRAFIC_DLG);
425 bUpdateMgr = sal_False;
426 }
427 else

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

494 aSet, sal_False,
495 nSel & nsSelectionType::SEL_GRF ? DLG_FRM_GRF :
496 nSel & nsSelectionType::SEL_OLE ? DLG_FRM_OLE :
497 DLG_FRM_STD,
498 sal_False,
499 nDefPage);
500 DBG_ASSERT(pDlg, "Dialogdiet fail!");
501
502 if ( nSlot == FN_PROPERTY_WRAP_DLG )
502 if ( nSlot == FN_DRAW_WRAP_DLG )
503 {
504 pDlg->SetCurPageId(TP_FRM_WRAP);
505 }
506
507 if ( pDlg->Execute() )
508 {
509 const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
510 if(pOutSet)

--- 713 unchanged lines hidden --- 		503 {
504 pDlg->SetCurPageId(TP_FRM_WRAP);
505 }
506
507 if ( pDlg->Execute() )
508 {
509 const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
510 if(pOutSet)

--- 713 unchanged lines hidden ---