[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

[Caolán McNamara]

 sw/source/uibase/shells/grfsh.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e013830e996cb571b0f4acebd2776ca3193b663b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 4 16:45:29 2016 +0000

    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/22912
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index cbd82f1..20614a0 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -355,7 +355,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);