diff options
author | Timothée Isnard <timotheecisnard@gmail.com> | 2015-10-11 22:48:31 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-10-20 21:10:40 +0000 |
commit | 5b6e4a225cf39355f4b345cfe033c07d5c165c7e (patch) | |
tree | 9020082fc8ff28cd93bfa8d357e934d34527de15 /sw | |
parent | 4383e5a79090a514523e86c2365a41a1d1b448e2 (diff) |
Replace bind2nd/mem_fun by lambdas in sw/source/uibase/dbui/dbmgr.cxx
Change-Id: Ibd4b88302a8791a62d612bd49641763d7b565021
Reviewed-on: https://gerrit.libreoffice.org/19312
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 278fad0bccbd..0c763ab817e3 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -1443,7 +1443,7 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, { std::set<SwRootFrm*> aAllLayouts = pTargetShell->GetDoc()->GetAllLayouts(); std::for_each( aAllLayouts.begin(), aAllLayouts.end(), - ::std::bind2nd(::std::mem_fun(&SwRootFrm::FreezeLayout), true)); + [](SwRootFrm* pLayout) { pLayout->FreezeLayout(true); }); bFreezedLayouts = true; } } while( !bCancel && @@ -1484,9 +1484,11 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* pSourceShell, { pTargetShell->CalcLayout(); std::set<SwRootFrm*> aAllLayouts = pTargetShell->GetDoc()->GetAllLayouts(); - std::for_each( aAllLayouts.begin(), aAllLayouts.end(), - ::std::bind2nd(::std::mem_fun(&SwRootFrm::FreezeLayout), false)); - std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllCheckPageDescs)); + std::for_each( aAllLayouts.begin(), aAllLayouts.end(), [](SwRootFrm* pLayout) + { + pLayout->FreezeLayout(false); + pLayout->AllCheckPageDescs(); + }); } pProgressDlg.disposeAndClear(); |