sw/source/uibase/shells/basesh.cxx | 2 +-
sw/source/uibase/shells/drawdlg.cxx | 6 ++++--
sw/source/uibase/shells/drwbassh.cxx | 4 +++-
sw/source/uibase/shells/frmsh.cxx | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
New commits:
commit f4566911ea1e8877371b1f63a69d19014bda2bcb
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sun Jul 14 15:14:09 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Jul 15 07:30:22 2019 +0200
-Werror=deprecated
("implicit capture of ‘this’ via ‘[=]’ is deprecated in C++20"; but the
recommended replacement with [=,this] leads to "'this' cannot be explicitly
captured when the capture default is '='" failures in older C++ versions)
Change-Id: I6376e0503ef66bff5a0c27c1d997667669b6d5b1
Reviewed-on: https://gerrit.libreoffice.org/75579
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index 156c969797d1..631c70f7a0bf 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -392,7 +392,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
pDlg->PreGetFormat(*aDataHelper);
- pDlg->StartExecuteAsync([=, &rSh](sal_Int32 nResult){
+ pDlg->StartExecuteAsync([aDataHelper, pDlg, &rSh,
this](sal_Int32 nResult){
if (nResult == RET_OK)
{
// Temporary variables, because the shell could
already be
diff --git a/sw/source/uibase/shells/drawdlg.cxx
b/sw/source/uibase/shells/drawdlg.cxx
index b7e6fbd5ee11..6229cbd173d3 100644
--- a/sw/source/uibase/shells/drawdlg.cxx
+++ b/sw/source/uibase/shells/drawdlg.cxx
@@ -98,7 +98,8 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
pDoc,
true));
- pDlg->StartExecuteAsync([=](sal_Int32 nResult){
+ pDlg->StartExecuteAsync([bChanged, bHasMarked, pDoc, pDlg, pSh,
pView, this](
+ sal_Int32 nResult){
if (nResult == RET_OK)
{
pSh->StartAction();
@@ -150,7 +151,8 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
pObj,
bHasMarked));
- pDlg->StartExecuteAsync([=](sal_Int32 nResult){
+ pDlg->StartExecuteAsync([bChanged, bHasMarked, pDoc, pDlg, pSh,
pView, this](
+ sal_Int32 nResult){
if (nResult == RET_OK)
{
pSh->StartAction();
diff --git a/sw/source/uibase/shells/drwbassh.cxx
b/sw/source/uibase/shells/drwbassh.cxx
index 4cc10c9be1d1..409bcd94ac26 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -239,7 +239,9 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
pDlg->SetInputSet( &aSet );
- pDlg->StartExecuteAsync([=, &rMarkList](sal_Int32
nResult){
+ pDlg->StartExecuteAsync([bCaption, bChanged, pDlg,
pFrameFormat, pSdrView,
+ pSh, &rMarkList, this](
+ sal_Int32 nResult){
if (nResult == RET_OK)
{
SwFormatVertOrient
aVOrientFinal(pFrameFormat->GetFormatAttr(RES_VERT_ORIENT));
diff --git a/sw/source/uibase/shells/frmsh.cxx
b/sw/source/uibase/shells/frmsh.cxx
index 31f1cc9ff4d4..38e085f2442b 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -1356,7 +1356,7 @@ void SwFrameShell::ExecDrawDlgTextFrame(SfxRequest const
& rReq)
pDoc,
false));
- pDlg->StartExecuteAsync([=](sal_Int32 nResult){
+ pDlg->StartExecuteAsync([pDlg, this](sal_Int32 nResult){
if(nResult == RET_OK)
{
// set attributes at FlyFrame
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
