[Libreoffice-commits] core.git: cui/source fpicker/source sc/source sd/source sfx2/source svx/source sw/source vcl/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Dec 17 13:44:36 UTC 2018
cui/source/dialogs/cuigaldlg.cxx | 2 +-
fpicker/source/office/OfficeFilePicker.cxx | 2 +-
fpicker/source/office/OfficeFolderPicker.cxx | 2 +-
sc/source/ui/view/tabvwsha.cxx | 2 +-
sd/source/ui/animations/CustomAnimationPane.cxx | 2 +-
sd/source/ui/func/fuarea.cxx | 2 +-
sd/source/ui/func/fuline.cxx | 2 +-
sd/source/ui/func/futransf.cxx | 2 +-
sfx2/source/appl/childwin.cxx | 2 +-
svx/source/gallery2/galbrws1.cxx | 4 ++--
sw/source/uibase/app/apphdl.cxx | 2 +-
sw/source/uibase/app/docst.cxx | 2 +-
sw/source/uibase/shells/txtnum.cxx | 2 +-
sw/source/uibase/uiview/viewling.cxx | 2 +-
vcl/source/window/dialog.cxx | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit c56a8280bdd605f77f0075a7f2bfa474aa2a26e5
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Dec 17 08:53:07 2018 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Dec 17 14:44:14 2018 +0100
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 at redhat.com>
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 41200fc04cc8..0595c2680be2 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -818,7 +818,7 @@ void TPGalleryThemeProperties::SearchFiles()
xProgress->SetDirectory( INetURLObject() );
xProgress->LaunchThread();
- weld::DialogController::runAsync(xProgress, [=](sal_Int32 nResult) {
+ weld::DialogController::runAsync(xProgress, [this](sal_Int32 nResult) {
EndSearchProgressHdl(nResult);
});
}
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 0651b70eb1c0..a1a23de36db7 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -503,7 +503,7 @@ void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< css::ui::dialog
prepareExecute();
SvtFileDialog_Base* pDialog = getDialog();
pDialog->EnableAutocompletion();
- pDialog->StartExecuteAsync([=](sal_Int32 nResult){
+ pDialog->StartExecuteAsync([this](sal_Int32 nResult){
DialogClosedHdl(nResult);
});
}
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx
index 06703055fb4b..b95f0f972980 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -65,7 +65,7 @@ void SAL_CALL SvtFolderPicker::startExecuteModal( const Reference< css::ui::dial
prepareExecute();
SvtFileDialog_Base* pDialog = getDialog();
pDialog->EnableAutocompletion();
- pDialog->StartExecuteAsync([=](sal_Int32 nResult){
+ pDialog->StartExecuteAsync([this](sal_Int32 nResult){
DialogClosedHdl(nResult);
});
}
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 2778d5d79c90..58ef3735f30a 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -547,7 +547,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName
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([pDlg, pOldSet, pRequest, this](sal_Int32 nResult){
bInFormatDialog = false;
if ( nResult == RET_OK )
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index d8306a805def..f87eb0153538 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1645,7 +1645,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()));
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 7966c3de1c95..ff4a1a1023bc 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -636,7 +636,7 @@ void SfxChildWindow::Show( ShowFlags nFlags )
if (!xController->getDialog()->get_visible())
{
weld::DialogController::runAsync(xController,
- [=](sal_Int32 /*nResult*/){ xController->Close(); });
+ [this](sal_Int32 /*nResult*/){ xController->Close(); });
}
}
else
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 69964a31bbf4..416fa67f48e7 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -268,13 +268,13 @@ void GalleryBrowser1::ImplGalleryThemeProperties( const OUString & rThemeName, b
if ( bCreateNew )
{
- mpThemePropertiesDialog->StartExecuteAsync([=](sal_Int32 nResult){
+ mpThemePropertiesDialog->StartExecuteAsync([this](sal_Int32 nResult){
EndNewThemePropertiesDlgHdl(nResult);
});
}
else
{
- mpThemePropertiesDialog->StartExecuteAsync([=](sal_Int32 nResult){
+ mpThemePropertiesDialog->StartExecuteAsync([this](sal_Int32 nResult){
EndThemePropertiesDlgHdl(nResult);
});
}
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 7ee90e3cea06..5fea962e10b4 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -479,7 +479,7 @@ void SwMailMergeWizardExecutor::ExecutionFinished()
void SwMailMergeWizardExecutor::ExecuteWizard()
{
- m_pWizard->StartExecuteAsync([=](sal_Int32 nResult){
+ m_pWizard->StartExecuteAsync([this](sal_Int32 nResult){
EndDialogHdl(nResult);
});
}
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 5f1b42cc7f66..27fdffd1f5f3 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -830,7 +830,7 @@ void SwDocShell::Edit(
pReq->Ignore(); // the 'old' request is not relevant any more
}
- pDlg->StartExecuteAsync([=](sal_Int32 nResult){
+ pDlg->StartExecuteAsync([bModified, bNew, nFamily, nSlot, nNewStyleUndoId, pApplyStyleHelper, pRequest, xTmp, this](sal_Int32 nResult){
if (RET_OK == nResult)
pApplyStyleHelper->apply();
diff --git a/sw/source/uibase/shells/txtnum.cxx b/sw/source/uibase/shells/txtnum.cxx
index daaab629bcd9..b95a9dcf1a47 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -191,7 +191,7 @@ void SwTextShell::ExecEnterNum(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([aSet, pDlg, pNumRuleAtCurrentSelection, pRequest, this](sal_Int32 nResult){
if (RET_OK == nResult)
{
const SfxPoolItem* pItem;
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index 1cb076a471d3..935f974ce75a 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -578,7 +578,7 @@ void SwView::StartThesaurus()
{
guard.dismiss(); // ignore, we'll call SetIdle() explicitly after the dialog ends
- pDlg->StartExecuteAsync([=](sal_Int32 nResult){
+ pDlg->StartExecuteAsync([aTmp, bSelection, bOldIdle, pDlg, pVOpt, this](sal_Int32 nResult){
if (nResult == RET_OK )
InsertThesaurusSynonym(pDlg->GetWord(), aTmp, bSelection);
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 0d371e4641dc..cc793c09696d 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1086,7 +1086,7 @@ void Dialog::RemoveFromDlgList()
auto& rExecuteDialogs = pSVData->maWinData.mpExecuteDialogs;
// remove dialog from the list of dialogs which are being executed
- rExecuteDialogs.erase(std::remove_if(rExecuteDialogs.begin(), rExecuteDialogs.end(), [=](VclPtr<Dialog>& dialog){ return dialog.get() == this; }), rExecuteDialogs.end());
+ rExecuteDialogs.erase(std::remove_if(rExecuteDialogs.begin(), rExecuteDialogs.end(), [this](VclPtr<Dialog>& dialog){ return dialog.get() == this; }), rExecuteDialogs.end());
}
void Dialog::EndDialog( long nResult )
More information about the Libreoffice-commits
mailing list