cid#1554709 COPY_INSTEAD_OF_MOVE

and

cid#1554745 COPY_INSTEAD_OF_MOVE
cid#1554758 COPY_INSTEAD_OF_MOVE
cid#1554766 COPY_INSTEAD_OF_MOVE
cid#1554771 COPY_INSTEAD_OF_MOVE
cid#1554787 COPY_INSTEAD_OF_MOVE
cid#1554802 COPY_INSTEAD_OF_MOVE
cid#1554820 COPY_INSTEAD_OF_MOVE
cid#1554828 COPY_INSTEAD_OF_MOVE
cid#1554829 COPY_INSTEAD_OF_MOVE
cid#1554832 COPY_INSTEAD_OF_MOVE
cid#1554842 COPY_INSTEAD_OF_MOVE
cid#1554885 COPY_INSTEAD_OF_MOVE

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

chart2/source/controller/main/ObjectHierarchy.cxx

@@ -400,7 +400,7 @@ void ObjectHierarchy::createDataSeriesTree(
                     }
 
                     if( ! aSeriesSubContainer.empty())
-                        m_aChildMap[ aSeriesOID ] = aSeriesSubContainer;
+                        m_aChildMap[ aSeriesOID ] = std::move(aSeriesSubContainer);
                 }
             }
         }

comphelper/source/misc/mimeconfighelper.cxx

@@ -277,7 +277,7 @@ bool MimeConfigurationHelper::GetVerbByShortcut( const OUString& aVerbShortcut,
               && ( xVerbsProps->getByName(sVerbFlags) >>= aTempDescr.VerbFlags )
               && ( xVerbsProps->getByName(sVerbAttributes) >>= aTempDescr.VerbAttributes ) )
             {
-                aDescriptor = aTempDescr;
+                aDescriptor = std::move(aTempDescr);
                 bResult = true;
             }
         }

cui/source/customize/SvxNotebookbarConfigPage.cxx

@@ -316,7 +316,7 @@ void SvxNotebookbarConfigPage::searchNodeandAttribute(std::vector<NotebookbarEnt
                               + " | " + sUIItemId;
                     }
                     aCategoryList.push_back(aCategoryEntry);
-                    aCurItemEntry = aCategoryEntry;
+                    aCurItemEntry = std::move(aCategoryEntry);
                 }
                 else if (sClassId == "svtlo-ManagedMenuButton")
                 {

docmodel/source/color/ComplexColorJSON.cxx

@@ -56,7 +56,7 @@ bool convertFromJSON(OString const& rJsonString, model::ComplexColor& rComplexCo
         return false;
     }
 
-    rComplexColor = aComplexColor;
+    rComplexColor = std::move(aComplexColor);
     return true;
 }
 

sfx2/source/bastyp/fltfnc.cxx

@@ -487,22 +487,20 @@ ErrCode SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, std::shared_ptr<cons
  */
 
 {
-    std::shared_ptr<const SfxFilter> pOldFilter = rMedium.GetFilter();
+    std::shared_ptr<const SfxFilter> pFilter = rMedium.GetFilter();
-    if ( pOldFilter )
+    if ( pFilter )
     {
-        if( !IsFilterInstalled_Impl( pOldFilter ) )
+        if( !IsFilterInstalled_Impl( pFilter ) )
-            pOldFilter = nullptr;
+            pFilter = nullptr;
         else
         {
             const SfxStringItem* pSalvageItem = rMedium.GetItemSet().GetItem(SID_DOC_SALVAGE, false);
-            if ( ( pOldFilter->GetFilterFlags() & SfxFilterFlags::PACKED ) && pSalvageItem )
+            if ( ( pFilter->GetFilterFlags() & SfxFilterFlags::PACKED ) && pSalvageItem )
                 // Salvage is always done without packing
-                pOldFilter = nullptr;
+                pFilter = nullptr;
         }
     }
 
-    std::shared_ptr<const SfxFilter> pFilter = pOldFilter;
-
     bool bPreview = rMedium.IsPreview_Impl();
     const SfxStringItem* pReferer = rMedium.GetItemSet().GetItem(SID_REFERER, false);
     if ( bPreview && rMedium.IsRemote() && ( !pReferer || !pReferer->GetValue().match("private:searchfolder:") ) )

svx/source/sdr/primitive2d/sdrattributecreator.cxx

@@ -880,7 +880,7 @@ namespace drawinglayer::primitive2d
             attribute::FillGradientAttribute aFillFloatTransGradient;
 
             // try line style
-            const attribute::SdrLineAttribute aLine(createNewSdrLineAttribute(rSet));
+            attribute::SdrLineAttribute aLine(createNewSdrLineAttribute(rSet));
 
             if(!aLine.isDefault())
             {
@@ -906,7 +906,8 @@ namespace drawinglayer::primitive2d
                 aShadow = createNewSdrShadowAttribute(rSet);
 
                 return attribute::SdrLineFillShadowAttribute3D(
-                    aLine, aFill, aLineStartEnd, aShadow, aFillFloatTransGradient);
+                    std::move(aLine), std::move(aFill), std::move(aLineStartEnd),
+                    std::move(aShadow), std::move(aFillFloatTransGradient));
             }
 
             return attribute::SdrLineFillShadowAttribute3D();

svx/source/sdr/primitive2d/sdrdecompositiontools.cxx

@@ -892,7 +892,7 @@ sal_uInt32 SlideBackgroundFillPrimitive2D::getPrimitive2DID() const
                 return std::move(rContent);
             Primitive2DContainer aRetval(2);
             aRetval[0] = new GlowPrimitive2D(rGlow.getColor(), rGlow.getRadius(), Primitive2DContainer(rContent));
-            aRetval[1] = new GroupPrimitive2D(Primitive2DContainer(rContent));
+            aRetval[1] = new GroupPrimitive2D(Primitive2DContainer(std::move(rContent)));
             return aRetval;
         }
 

ucb/source/ucp/package/pkgcontent.cxx

@@ -169,7 +169,7 @@ rtl::Reference<Content> Content::create(
 
         uno::Reference< ucb::XContentIdentifier > xId
             = new ::ucbhelper::ContentIdentifier( aURI.getUri() );
-        return new Content( rxContext, pProvider, xId, xPackage, aURI, std::move(aProps) );
+        return new Content( rxContext, pProvider, xId, xPackage, std::move(aURI), std::move(aProps) );
     }
     else
     {
@@ -191,7 +191,7 @@ rtl::Reference<Content> Content::create(
         else
             aInfo.Type = getContentType( aURI.getScheme(), false );
 
-        return new Content( rxContext, pProvider, xId, xPackage, aURI, aInfo );
+        return new Content( rxContext, pProvider, xId, xPackage, std::move(aURI), std::move(aInfo) );
     }
 }
 

vcl/inc/widgetdraw/WidgetDefinitionReader.hxx

@@ -28,7 +28,7 @@ private:
                                        WidgetDefinition& rWidgetDefinition, ControlType eType);
 
     SAL_DLLPRIVATE void readPart(tools::XmlWalker& rWalker,
-                                 std::shared_ptr<WidgetDefinitionPart> rpPart);
+                                 const std::shared_ptr<WidgetDefinitionPart>& rpPart);
 
     SAL_DLLPRIVATE void
     readDrawingDefinition(tools::XmlWalker& rWalker,

vcl/source/filter/svm/SvmConverter.cxx

@@ -643,7 +643,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf )
                     else
                     {
                         nLastPolygonAction = rMtf.GetActionSize();
-                        rMtf.AddAction( new MetaPolyPolygonAction( aPolyPoly ) );
+                        rMtf.AddAction(new MetaPolyPolygonAction(std::move(aPolyPoly)));
                     }
                 }
             }

vcl/source/font/FeatureCollector.cxx

@@ -181,7 +181,7 @@ void FeatureCollector::collectForTable(hb_tag_t aTableTag)
         }
 
         if (aDefinition)
-            rFeature.m_aDefinition = aDefinition;
+            rFeature.m_aDefinition = std::move(aDefinition);
     }
 }
 

vcl/source/gdi/WidgetDefinitionReader.cxx

@@ -332,7 +332,7 @@ void WidgetDefinitionReader::readDefinition(tools::XmlWalker& rWalker,
 }
 
 void WidgetDefinitionReader::readPart(tools::XmlWalker& rWalker,
-                                      std::shared_ptr<WidgetDefinitionPart> rpPart)
+                                      const std::shared_ptr<WidgetDefinitionPart>& rpPart)
 {
     rWalker.children();
     while (rWalker.isValid())

vcl/source/graphic/UnoGraphicProvider.cxx

@@ -411,7 +411,7 @@ uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( co
             {
                 Graphic aGraphic = rFilter.ImportUnloadedGraphic(*pIStm);
                 if (!aGraphic.IsNone())
-                    aVCLGraphic = aGraphic;
+                    aVCLGraphic = std::move(aGraphic);
             }
             if (aVCLGraphic.IsNone())
                 error = rFilter.ImportGraphic(aVCLGraphic, aPath, *pIStm, GRFILTER_FORMAT_DONTKNOW, nullptr, GraphicFilterImportFlags::NONE);

vcl/source/window/window.cxx

@@ -1758,8 +1758,6 @@ void Window::ImplNewInputContext()
     SalInputContext         aNewContext;
     const vcl::Font&        rFont = rInputContext.GetFont();
     const OUString&         rFontName = rFont.GetFamilyName();
-    rtl::Reference<LogicalFontInstance> pFontInstance;
-    aNewContext.mpFont = nullptr;
     if (!rFontName.isEmpty())
     {
         OutputDevice *pFocusWinOutDev = pFocusWin->GetOutDev();
@@ -1773,11 +1771,10 @@ void Window::ImplNewInputContext()
             else
                 aSize.setHeight( (12*pFocusWin->GetOutDev()->mnDPIY)/72 );
         }
-        pFontInstance = pFocusWin->GetOutDev()->mxFontCache->GetFontInstance(
+        aNewContext.mpFont =
+                        pFocusWin->GetOutDev()->mxFontCache->GetFontInstance(
                             pFocusWin->GetOutDev()->mxFontCollection.get(),
                             rFont, aSize, static_cast<float>(aSize.Height()) );
-        if ( pFontInstance )
-            aNewContext.mpFont = pFontInstance;
     }
     aNewContext.mnOptions   = rInputContext.GetOptions();
     pFocusWin->ImplGetFrame()->SetInputContext( &aNewContext );