diff options
-rw-r--r-- | sd/source/ui/func/fucopy.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index ee4e94896fd7..a2b1b1de2e3a 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -100,27 +100,27 @@ void FuCopy::DoExecute( SfxRequest& rReq ) if( pFact ) { AbstractCopyDlg* pDlg = pFact->CreateCopyDlg(NULL, aSet, mpDoc->GetColorList(), mpView ); - if( pDlg ) + if (!pDlg) + return; + + sal_uInt16 nResult = pDlg->Execute(); + + switch( nResult ) { - sal_uInt16 nResult = pDlg->Execute(); + case RET_OK: + pDlg->GetAttr( aSet ); + rReq.Done( aSet ); + pArgs = rReq.GetArgs(); + break; - switch( nResult ) + default: { - case RET_OK: - pDlg->GetAttr( aSet ); - rReq.Done( aSet ); - pArgs = rReq.GetArgs(); - break; - - default: - { - delete pDlg; - mpView->EndUndo(); - } - return; // Cancel + delete pDlg; + mpView->EndUndo(); } - delete( pDlg ); + return; // Cancel } + delete pDlg; } } |