cid#1545970 COPY_INSTEAD_OF_MOVE

and

cid#1545957 COPY_INSTEAD_OF_MOVE
cid#1545944 COPY_INSTEAD_OF_MOVE
cid#1545939 COPY_INSTEAD_OF_MOVE
cid#1545931 COPY_INSTEAD_OF_MOVE
cid#1545926 COPY_INSTEAD_OF_MOVE
cid#1545909 COPY_INSTEAD_OF_MOVE
cid#1545899 COPY_INSTEAD_OF_MOVE
cid#1545896 COPY_INSTEAD_OF_MOVE
cid#1545894 COPY_INSTEAD_OF_MOVE
cid#1545858 COPY_INSTEAD_OF_MOVE
cid#1545823 COPY_INSTEAD_OF_MOVE
cid#1545820 COPY_INSTEAD_OF_MOVE
cid#1545819 COPY_INSTEAD_OF_MOVE
cid#1545772 COPY_INSTEAD_OF_MOVE
cid#1545749 COPY_INSTEAD_OF_MOVE
cid#1545743 COPY_INSTEAD_OF_MOVE
cid#1545739 COPY_INSTEAD_OF_MOVE
cid#1545635 COPY_INSTEAD_OF_MOVE
cid#1545603 COPY_INSTEAD_OF_MOVE
cid#1545602 COPY_INSTEAD_OF_MOVE
cid#1545592 COPY_INSTEAD_OF_MOVE
cid#1545544 COPY_INSTEAD_OF_MOVE
cid#1545532 COPY_INSTEAD_OF_MOVE
cid#1545520 COPY_INSTEAD_OF_MOVE
cid#1545512 COPY_INSTEAD_OF_MOVE
cid#1545490 COPY_INSTEAD_OF_MOVE
cid#1545483 COPY_INSTEAD_OF_MOVE
cid#1545467 COPY_INSTEAD_OF_MOVE
cid#1545461 COPY_INSTEAD_OF_MOVE
cid#1545458 COPY_INSTEAD_OF_MOVE
cid#1545428 COPY_INSTEAD_OF_MOVE
cid#1545394 COPY_INSTEAD_OF_MOVE
cid#1545385 COPY_INSTEAD_OF_MOVE
cid#1545383 COPY_INSTEAD_OF_MOVE
cid#1545366 COPY_INSTEAD_OF_MOVE
cid#1545357 COPY_INSTEAD_OF_MOVE

Change-Id: I76224326977b4067b94ca3176cad1ca6de17930a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160847
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

4 files changed, 6 insertions, 10 deletions

diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 5c2147ed91a9..1afe6e5c154d 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2258,8 +2258,9 @@ namespace sdr::contact
             if(!xRetval.empty())
             {
                 // create transform primitive
-                drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::TransformPrimitive2D(aOffsetMatrix, std::move(xRetval)));
-                xRetval = drawinglayer::primitive2d::Primitive2DContainer { xReference };
+                xRetval = drawinglayer::primitive2d::Primitive2DContainer {
+                    drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::TransformPrimitive2D(aOffsetMatrix, std::move(xRetval)))
+                };
             }
 
             rVisitor.visit(xRetval);
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index d5ec969783ca..84eb066ee5ae 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3115,8 +3115,7 @@ void SwTabFramePainter::Insert( SwLineEntry& rNew, bool bHori )
     SwLineEntrySet* pLineSet = aMapIter != pLine2->end() ? &((*aMapIter).second) : nullptr;
     if ( !pLineSet )
     {
-        SwLineEntrySet aNewSet;
-        (*pLine2)[ nKey ] = aNewSet;
+        (*pLine2)[nKey] = SwLineEntrySet();
         pLineSet = &(*pLine2)[ nKey ];
     }
     SwLineEntrySet::iterator aIter = pLineSet->begin();
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 989f3ff93ea9..3c31d9d131ea 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -184,12 +184,10 @@ ErrCode SwXMLTextBlocks::GetMacroTable( sal_uInt16 nIdx,
         if ( !xDocStream.is() )
             return ERR_SWG_READ_ERROR;
 
-        uno::Reference<io::XInputStream> xInputStream = xDocStream->getInputStream();
-
         // prepare ParserInputSource
         xml::sax::InputSource aParserInput;
         aParserInput.sSystemId = m_aName;
-        aParserInput.aInputStream = xInputStream;
+        aParserInput.aInputStream = xDocStream->getInputStream();
 
         // get service factory
         uno::Reference< uno::XComponentContext > xContext =
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 1f25b8989402..947f4eba39e0 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1740,9 +1740,7 @@ void SwXNumberingRules::SetPropertiesToNumFormat(
                         static_cast<const SvxFontListItem* >(pLclDocShell
                                             ->GetItem( SID_ATTR_CHAR_FONTLIST ));
                 const FontList*  pList = pFontListItem->GetFontList();
-                FontMetric aFontMetric = pList->Get(
-                    sBulletFontName, WEIGHT_NORMAL, ITALIC_NONE);
-                vcl::Font aFont(aFontMetric);
+                vcl::Font aFont(pList->Get(sBulletFontName, WEIGHT_NORMAL, ITALIC_NONE));
                 aFormat.SetBulletFont(&aFont);
             }
             else if (pBulletFontName)