diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-17 08:53:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-02 12:32:01 +0200 |
| commit | 4def21a89a90c642a4bf516c171564b0b578734f (patch) | |
| tree | 0ffa2cc835f8b0f3746a8650bddb6e1fd9a08d21 /sd | |
| parent | df02927207ad19532f5c1ac5a5cf745559e47c22 (diff) | |
Resolve deprecated implicit capture of *this by reference in C++20
...as flagged with -Werror=deprecated by trunk GCC in -std=c++2a mode. But
C++17 forbids "this" in combination with a capture-default of "=", so in such
cases list any entities explicitly that shall be captured by value.
Change-Id: Ic228cd20682277a0f93e3e75798356d0fbbb80d4
Reviewed-on: https://gerrit.libreoffice.org/65241
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit c56a8280bdd605f77f0075a7f2bfa474aa2a26e5)
Reviewed-on: https://gerrit.libreoffice.org/71661
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationPane.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/fuarea.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/fuline.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/func/futransf.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index ab695076ddc2..99675714021b 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -1667,7 +1667,7 @@ void CustomAnimationPane::showOptions(const OString& rPage) std::shared_ptr<CustomAnimationDialog> xDlg(new CustomAnimationDialog(GetFrameWeld(), std::move(xSet), rPage)); - weld::DialogController::runAsync(xDlg, [=](sal_Int32 nResult){ + weld::DialogController::runAsync(xDlg, [xDlg, this](sal_Int32 nResult){ if (nResult ) { addUndo(); diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index 85eaef244991..a7cfa3fef87f 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -63,7 +63,7 @@ void FuArea::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); VclPtr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog(mpViewShell->GetFrameWeld(), &aNewAttr, mpDoc, true)); - pDlg->StartExecuteAsync([=](sal_Int32 nResult){ + pDlg->StartExecuteAsync([pDlg, this](sal_Int32 nResult){ if (nResult == RET_OK) { mpView->SetAttributes (*(pDlg->GetOutputItemSet ())); diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index 819995a99d59..5ddefa8b5cc6 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -77,7 +77,7 @@ void FuLine::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); VclPtr<SfxAbstractTabDialog> pDlg( pFact->CreateSvxLineTabDialog(mpViewShell->GetFrameWeld(), pNewAttr.get(), mpDoc, pObj, bHasMarked) ); - pDlg->StartExecuteAsync([=](sal_Int32 nResult){ + pDlg->StartExecuteAsync([pDlg, this](sal_Int32 nResult){ if (nResult == RET_OK) { mpView->SetAttributes (*(pDlg->GetOutputItemSet ())); diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index d0ffd8366055..ca14213fcf01 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -114,7 +114,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) std::shared_ptr<SfxRequest> pRequest(new SfxRequest(rReq)); rReq.Ignore(); // the 'old' request is not relevant any more - pDlg->StartExecuteAsync([=](sal_Int32 nResult){ + pDlg->StartExecuteAsync([bWelded, pDlg, pRequest, this](sal_Int32 nResult){ if (nResult == RET_OK) { pRequest->Done(*(pDlg->GetOutputItemSet())); |