diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-11-28 08:58:21 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-28 09:17:48 +0000 |
commit | 282a6fb530e3b78c1e83a9276aea0a528b9e5752 (patch) | |
tree | fc9c338726a5ac44c0f92867bb8254cf4e410a14 /dbaccess | |
parent | 70fe99d01944e51fd2a9d5eaf007bd3ee8967832 (diff) |
Finish rework of QueryDeleteDlg_Impl
This reverts commit a74b3e89c9b853338506249b0fac8d5f54909de7.
Change-Id: Id670a2b66e61d3a4dceb9640d6ae34e9116691c0
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/ui/app/AppControllerDnD.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 906e341b964e..f4d65fc86c5d 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -188,7 +188,7 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec if ( xNames.is() ) { OString sDialogPosition; - svtools::QueryDeleteResult_Impl eResult = _bConfirm ? svtools::QUERYDELETE_YES : svtools::QUERYDELETE_ALL; + short eResult = _bConfirm ? svtools::QUERYDELETE_YES : svtools::QUERYDELETE_ALL; // The list of elements to delete is allowed to contain related elements: A given element may // be the ancestor or child of another element from the list. @@ -218,9 +218,8 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec if ( nObjectsLeft > 1 ) aDlg.EnableAllButton(); - if ( aDlg.Execute() == RET_OK ) - eResult = aDlg.GetQueryDeleteResult(); - else + eResult = aDlg.Execute(); + if (eResult == svtools::QUERYDELETE_CANCEL) return; sDialogPosition = aDlg.GetWindowState( ); |