[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source

[Jan Holesovsky]

 sw/source/uibase/shells/textsh1.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ee0d1f08e1b4a1a478a566eace6cf5117488e721
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Mar 1 21:00:24 2018 +0100

    tdf#116070: Use a valid PaM when confirming the dialog.
    
    Change-Id: I8d45e709e6414814b3cf04bbd09588ab4e096e8c
    Reviewed-on: https://gerrit.libreoffice.org/50599
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index f45f89462d05..0edd376acddb 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1107,7 +1107,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 std::shared_ptr<SfxRequest> pRequest(new SfxRequest(rReq));
                 rReq.Ignore(); // the 'old' request is not relevant any more
 
-                pDlg->StartExecuteAsync([pDlg, &rWrtSh, pRequest, nDefDist, pPaM](sal_Int32 nResult){
+                pDlg->StartExecuteAsync([pDlg, &rWrtSh, pRequest, nDefDist](sal_Int32 nResult){
                     if (nResult == RET_OK)
                     {
                         // Apply defaults if necessary.
@@ -1137,7 +1137,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                             pSet->Put(SfxStringItem(FN_DROP_CHAR_STYLE_NAME, sCharStyleName));
                         }
 
-                        sw_ParagraphDialogResult(pSet, rWrtSh, *pRequest, pPaM);
+                        sw_ParagraphDialogResult(pSet, rWrtSh, *pRequest, rWrtSh.GetCursor());
                     }
                 });
             }