chart2/source/view/charttypes/VSeriesPlotter.cxx | 6 +++--- sw/source/ui/dialog/swdlgfact.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit d68d45102948ac6d54584f60ba5e493036438d0d Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jan 13 19:11:14 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jan 13 22:09:11 2024 +0100 cid#1546488 COPY_INSTEAD_OF_MOVE Change-Id: I80b843351641e38af6b9f9d6001b89206e37991c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162024 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index daf0dd6ff3f1..66ac1ec21a25 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -599,7 +599,7 @@ void AbstractSwFieldDlg_Impl::SetText( const OUString& rStr ) bool AbstractSwFieldDlg_Impl::StartExecuteAsync(AsyncContext &rCtx) { auto xDlg = m_xDlg; - return SfxTabDialogController::runAsync(m_xDlg, [=](sal_Int32 nResult){ + return SfxTabDialogController::runAsync(m_xDlg, [rCtx, xDlg=std::move(xDlg)](sal_Int32 nResult){ xDlg->Close(); if (rCtx.isSet()) rCtx.maEndDialogFn(nResult); commit 26c375988a913684320ef32ec85afb829913e687 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jan 13 19:04:24 2024 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jan 13 22:09:00 2024 +0100 cid#1585307 Out-of-bounds read sizeof should probably have been std::size, but just replace with range iteration anyway Change-Id: I60d9d7d74a5c039ad49387b114d1142ca27b032a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162023 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 34a702d7b696..948d5ef33f1f 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -2340,9 +2340,9 @@ const ROrderPair pairList[] = { sal_Int32 VSeriesPlotter::getRenderOrder() const { OUString aChartType = m_xChartTypeModel->getChartType(); - for (size_t n = 0; n < sizeof(pairList); ++n) { - if (aChartType.equalsIgnoreAsciiCase(pairList[n].chartName)) { - return pairList[n].renderOrder; + for (const auto& elem : pairList) { + if (aChartType.equalsIgnoreAsciiCase(elem.chartName)) { + return elem.renderOrder; } } SAL_WARN("chart2", "Unsupported chart type in getRenderOrder()");
