diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index 1e891416483a..1d9197871071 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -52,19 +52,28 @@ rtl::Reference FuArea::Create( ViewShell* pViewSh, ::sd::Window* pWin, : void FuArea::DoExecute( SfxRequest& rReq ) { + rReq.Ignore (); + const SfxItemSet* pArgs = rReq.GetArgs(); - - if( !pArgs ) + if (pArgs) { - SfxItemSet aNewAttr( mpDoc->GetPool() ); - mpView->GetAttributes( aNewAttr ); + mpViewShell->Cancel(); + return; + } - SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ScopedVclPtr pDlg(pFact ? pFact->CreateSvxAreaTabDialog( nullptr, - &aNewAttr, - mpDoc, - true) : nullptr); - if( pDlg && (pDlg->Execute() == RET_OK) ) + SfxItemSet aNewAttr( mpDoc->GetPool() ); + mpView->GetAttributes( aNewAttr ); + + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + VclPtr pDlg(pFact ? pFact->CreateSvxAreaTabDialog(nullptr, &aNewAttr, mpDoc, true) : nullptr); + if (!pDlg) + { + mpViewShell->Cancel(); + return; + } + + pDlg->StartExecuteAsync([=](sal_Int32 nResult){ + if (nResult == RET_OK) { mpView->SetAttributes (*(pDlg->GetOutputItemSet ())); @@ -81,10 +90,7 @@ void FuArea::DoExecute( SfxRequest& rReq ) mpViewShell->GetViewFrame()->GetBindings().Invalidate( SidArray ); } - } - - rReq.Ignore (); - + }, pDlg); } void FuArea::Activate() diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 4cbe90ccc623..02d514ae611c 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1374,7 +1374,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_ATTRIBUTES_AREA: // BASIC { SetCurrentFunction( FuArea::Create( this, GetActiveWindow(), mpDrawView, GetDoc(), rReq ) ); - Cancel(); + // Cancel() called directly in FuTransform::Create() } break;