diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2021-08-19 08:08:20 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2021-08-20 14:25:38 +0200 |
commit | 2bc1a0431becd1c6d4c888a6e301237dcecefd97 (patch) | |
tree | f1a10ef12eeb5e854c561f98abcc57cf32dd4f1f /svx/source | |
parent | 46d3fdeb4fa35e0575395a3a91213fd81fda0e50 (diff) |
New loplugin:unusedcapturedefault
In sc/qa/unit/ucalc_formula.cxx, dropping the capture-default from the
lExpectedinF lambda revealed that MSVC in C++17 mode (i.e., when building
without --with-latest-c++) requires ROW_RANGE (a local const int variable from
the enclosing TestFormula::testTdf97369) to be captured, even though all uses of
that variable within the lambda body are constant expressions. That is still
true at least for the latest Visual Studio 2019 version 16.11.1. (This is not
an issue for the lExpectedinH and lExpectedinI lambdas a few lines further down,
as they, in addition to using that ROW_RANGE, also use the local const double
variables SHIFT1 and SHIFT2, whose uses are not constant expressions, so
they are implicitly captured and loplugin:unusedcapturedefault does not suggest
dropping those lambdas' capture-defaults in the first place.)
Change-Id: Iee7efb485187cbe8eba6a2d470afca4993eb1816
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120693
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/charmap.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/svxbmpnumvalueset.cxx | 2 | ||||
-rw-r--r-- | svx/source/fmcomp/fmgridif.cxx | 2 | ||||
-rw-r--r-- | svx/source/fmcomp/gridcols.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/nbdtmg.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 501c85d6b55d..8910db46c804 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -873,7 +873,7 @@ inline Subset::Subset(sal_UCS4 nMin, sal_UCS4 nMax, const OUString& rName) void SubsetMap::InitList() { - static SubsetVec s_aAllSubsets = [&]() + static SubsetVec s_aAllSubsets = []() { SubsetVec aAllSubsets; //I wish icu had a way to give me the block ranges diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 9736b5703317..ce39faa59734 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -62,7 +62,7 @@ const sal_Unicode aBulletTypes[] = static vcl::Font& lcl_GetDefaultBulletFont() { - static vcl::Font aDefBulletFont = [&]() + static vcl::Font aDefBulletFont = []() { static vcl::Font tmp("OpenSymbol", "", Size(0, 14)); tmp.SetCharSet( RTL_TEXTENCODING_SYMBOL ); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 6d866003e5e3..5d95193d09a1 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -2635,7 +2635,7 @@ const std::vector<DbGridControlNavigationBarState>& FmXGridPeer::getSupportedGri Sequence< css::util::URL>& FmXGridPeer::getSupportedURLs() { - static Sequence< css::util::URL> aSupported = [&]() + static Sequence< css::util::URL> aSupported = []() { static const char* sSupported[] = { FMURL_RECORD_MOVEFIRST, diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index e937c08a6b33..92546d155cb0 100644 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx @@ -27,7 +27,7 @@ using namespace ::com::sun::star::uno; static const css::uno::Sequence<OUString>& getColumnTypes() { - static css::uno::Sequence<OUString> aColumnTypes = [&]() + static css::uno::Sequence<OUString> aColumnTypes = []() { css::uno::Sequence<OUString> tmp(10); OUString* pNames = tmp.getArray(); diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index f53ebb677a0a..f1ee075a3320 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -63,7 +63,7 @@ namespace { const vcl::Font& lcl_GetDefaultBulletFont() { - static vcl::Font aDefBulletFont = [&]() + static vcl::Font aDefBulletFont = []() { static vcl::Font tmp("OpenSymbol", "", Size(0, 14)); tmp.SetCharSet( RTL_TEXTENCODING_SYMBOL ); |