diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-03-04 16:45:29 +0000 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2016-03-10 19:36:56 +0100 |
commit | ea31ef72faf89ee49cef4ab9d9b7b386913f5109 (patch) | |
tree | 226c467ca9931e2aac5e9db495ad287f50974d49 | |
parent | 2cc2e1c56b2e51bb54c7e3922824cf096323b656 (diff) |
Resolves: tdf#98399 RET_USER_CANCEL is non-zero and returned on cancel
Change-Id: Id4231454dfb34cac6ee89d63beb18a83c63a44c1
(cherry picked from commit cd9a5cf4312a2dc0c1ecbf682c67ca08862cdde0)
Reviewed-on: https://gerrit.libreoffice.org/22913
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 40e7a2253a72ee490f97a604bcc94d12d0b84fc8)
-rw-r--r-- | sw/source/uibase/shells/grfsh.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx index 39e18fd1ee08..abaa41e1c4f3 100644 --- a/sw/source/uibase/shells/grfsh.cxx +++ b/sw/source/uibase/shells/grfsh.cxx @@ -354,7 +354,7 @@ void SwGrfShell::Execute(SfxRequest &rReq) if (nSlot == FN_DRAW_WRAP_DLG) pDlg->SetCurPageId("wrap"); - if( pDlg->Execute() ) + if (pDlg->Execute() == RET_OK) { rSh.StartAllAction(); rSh.StartUndo(UNDO_START); |