sc/source/core/data/column4.cxx | 4 ++-- sc/source/core/data/table7.cxx | 10 +++++----- vcl/source/bitmap/BitmapScaleSuperFilter.cxx | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 90011180cb21186dbd58b8be6d7ffff23416541e Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jul 20 15:45:21 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jul 20 20:48:29 2019 +0200 cid#1448415 Pointer to local outside scope Change-Id: I35f20fa37a19ff921916cd0e8bb7bafbc66ec8b5 Reviewed-on: https://gerrit.libreoffice.org/76021 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx index 4485de036c8d..ac16dd2aa939 100644 --- a/sc/source/core/data/column4.cxx +++ b/sc/source/core/data/column4.cxx @@ -290,14 +290,14 @@ void ScColumn::CopyOneCellFromClip( sc::CopyFromClipContext& rCxt, SCROW nRow1, // Duplicate the cell note over the whole pasted range. ScDocument* pClipDoc = rCxt.getClipDoc(); - const ScAddress& rSrcPos = pClipDoc->GetClipParam().getWholeRange().aStart; + const ScAddress aSrcPos = pClipDoc->GetClipParam().getWholeRange().aStart; std::vector<ScPostIt*> aNotes; ScAddress aDestPos(nCol, nRow1, nTab); aNotes.reserve(nDestSize); for (size_t i = 0; i < nDestSize; ++i) { bool bCloneCaption = (nFlags & InsertDeleteFlags::NOCAPTIONS) == InsertDeleteFlags::NONE; - aNotes.push_back(pNote->Clone(rSrcPos, *pDocument, aDestPos, bCloneCaption).release()); + aNotes.push_back(pNote->Clone(aSrcPos, *pDocument, aDestPos, bCloneCaption).release()); aDestPos.IncRow(); } diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx index 48576f0d6018..203b1e417dbb 100644 --- a/sc/source/core/data/table7.cxx +++ b/sc/source/core/data/table7.cxx @@ -162,14 +162,14 @@ void ScTable::CopyOneCellFromClip( OSL_ENSURE(pDrawLayer, "No drawing layer"); if (pDrawLayer) { - const ScAddress& rSrcStartPos + const ScAddress aSrcStartPos = rCxt.getClipDoc()->GetClipParam().getWholeRange().aStart; - const ScAddress& rSrcEndPos = rCxt.getClipDoc()->GetClipParam().getWholeRange().aEnd; + const ScAddress aSrcEndPos = rCxt.getClipDoc()->GetClipParam().getWholeRange().aEnd; tools::Rectangle aSourceRect = rCxt.getClipDoc()->GetMMRect( - rSrcStartPos.Col(), rSrcStartPos.Row(), rSrcEndPos.Col(), rSrcEndPos.Row(), - rSrcStartPos.Tab()); + aSrcStartPos.Col(), aSrcStartPos.Row(), aSrcEndPos.Col(), aSrcEndPos.Row(), + aSrcStartPos.Tab()); tools::Rectangle aDestRect = GetDoc().GetMMRect(nCol1, nRow1, nCol2, nRow2, nTab); - pDrawLayer->CopyFromClip(rCxt.getClipDoc()->mpDrawLayer.get(), rSrcStartPos.Tab(), + pDrawLayer->CopyFromClip(rCxt.getClipDoc()->mpDrawLayer.get(), aSrcStartPos.Tab(), aSourceRect, ScAddress(nCol1, nRow1, nTab), aDestRect); } } commit 1f3c1b4ca12400348f30f30c2fb7ddfe2c71b2f7 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Jul 20 15:27:38 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Jul 20 20:48:15 2019 +0200 cid#1448542 Unintended sign extension Change-Id: I5ef8661a1c8e28537c96cb899d124012938f4b1f Reviewed-on: https://gerrit.libreoffice.org/76017 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx index 7f7d5bffdd3c..acb3ad04f2a3 100644 --- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx +++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx @@ -790,9 +790,9 @@ void scaleDown24bit(ScaleContext &rCtx, long nStartY, long nEndY) 1 : (rCtx.maMapIX[nRight] - rCtx.maMapIX[nLeft]); } - long nSum1 = 0; - long nSum2 = 0; - long nSum3 = 0; + int nSum1 = 0; + int nSum2 = 0; + int nSum3 = 0; BilinearWeightType nTotalWeightY = 0; for (long i = 0; i<= nLineRange; i++) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
