sc/inc/fstalgorithm.hxx | 5 +----
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 5 +++--
2 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit ddaea28c9f77bc5b9c323604d7eed4d79d5c732e
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Jan 1 20:59:28 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jan 2 13:31:46 2024 +0100
cid#1545989 COPY_INSTEAD_OF_MOVE
and
cid#1545432 COPY_INSTEAD_OF_MOVE
cid#1545622 COPY_INSTEAD_OF_MOVE
Change-Id: Ib6858cf284bf5c3e185830fcd51361d1db3fc747
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161527
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sc/inc/fstalgorithm.hxx b/sc/inc/fstalgorithm.hxx
index 6cd67c8cf7dd..8cab1187d1e0 100644
--- a/sc/inc/fstalgorithm.hxx
+++ b/sc/inc/fstalgorithm.hxx
@@ -91,12 +91,9 @@ std::vector<Span> toSpanArray( const
mdds::flat_segment_tree<Key,bool>& rTree )
template<typename Key, typename Val, typename Span>
std::vector<Span> toSpanArrayWithValue( const
mdds::flat_segment_tree<Key,Val>& rTree )
{
- typedef mdds::flat_segment_tree<Key,Val> FstType;
-
std::vector<Span> aSpans;
- typename FstType::const_iterator it = rTree.begin(), itEnd = rTree.end();
- buildSpanWithValue<Key,Val,Span>(aSpans, it, itEnd);
+ buildSpanWithValue<Key,Val,Span>(aSpans, rTree.begin(), rTree.end());
return aSpans;
}
diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
index bc41f7ec755c..d5fd05cd58d3 100644
--- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
+++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx
@@ -750,8 +750,9 @@ sal_uInt32
SlideBackgroundFillPrimitive2D::getPrimitive2DID() const
pNew.clear();
// create a new animatedInterpolatePrimitive and add it
- Primitive2DReference xRefA(new
AnimatedInterpolatePrimitive2D({ aLeft, aRight }, aAnimationList,
std::move(aAnimSequence)));
- Primitive2DContainer aContent { xRefA };
+ Primitive2DContainer aContent {
+ Primitive2DReference(new
AnimatedInterpolatePrimitive2D({ aLeft, aRight }, aAnimationList,
std::move(aAnimSequence)))
+ };
// scrolling needs an encapsulating clipping primitive
const basegfx::B2DRange aClipRange(aClipTopLeft,
aClipBottomRight);
