cid#1554837 COPY_INSTEAD_OF_MOVE
and cid#1554847 COPY_INSTEAD_OF_MOVE cid#1554850 COPY_INSTEAD_OF_MOVE cid#1554857 COPY_INSTEAD_OF_MOVE cid#1554860 COPY_INSTEAD_OF_MOVE cid#1554870 COPY_INSTEAD_OF_MOVE cid#1554874 COPY_INSTEAD_OF_MOVE cid#1557899 COPY_INSTEAD_OF_MOVE cid#1608424 COPY_INSTEAD_OF_MOVE cid#1608402 COPY_INSTEAD_OF_MOVE Change-Id: Iaa6e39cf24cd56cdc4a9be5cbf2b8073a1f635c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170722 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Jenkins
This commit is contained in:
@@ -1084,7 +1084,7 @@ TOTypeInfoSP queryPrimaryKeyType(const OTypeInfoMap& _rTypeInfo)
|
||||
pFallback = elem.second; // alternative
|
||||
}
|
||||
if ( !pTypeInfo ) // just a fallback
|
||||
pTypeInfo = pFallback ? pFallback : queryTypeInfoByType(DataType::VARCHAR, _rTypeInfo);
|
||||
pTypeInfo = pFallback ? std::move(pFallback) : queryTypeInfoByType(DataType::VARCHAR, _rTypeInfo);
|
||||
|
||||
OSL_ENSURE(pTypeInfo,"checkColumns: can't find a type which is usable as a key!");
|
||||
return pTypeInfo;
|
||||
|
||||
@@ -3628,7 +3628,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
|
||||
|
||||
if(aStartArrow.Count())
|
||||
{
|
||||
mapCurShape->maShapePolyPoly = aStartArrow;
|
||||
mapCurShape->maShapePolyPoly = std::move(aStartArrow);
|
||||
|
||||
if( bUseElementId ) // #i124825# aElementId is optional, may be zero
|
||||
{
|
||||
@@ -3640,7 +3640,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
|
||||
|
||||
if(aEndArrow.Count())
|
||||
{
|
||||
mapCurShape->maShapePolyPoly = aEndArrow;
|
||||
mapCurShape->maShapePolyPoly = std::move(aEndArrow);
|
||||
|
||||
if( bUseElementId ) // #i124825# aElementId is optional, may be zero
|
||||
{
|
||||
|
||||
@@ -2703,15 +2703,15 @@ rtl::Reference<SdrObject> ImplSdPPTImport::ProcessObj( SvStream& rSt, DffObjData
|
||||
pMediaObj->SetMergedItemSet( pObj->GetMergedItemSet() );
|
||||
|
||||
//--remove object from maAnimations list and add the new object instead
|
||||
Ppt97AnimationPtr pAnimation;
|
||||
Ppt97AnimationPtr xAnimation;
|
||||
{
|
||||
tAnimationMap::iterator aFound = maAnimations.find( pObj.get() );
|
||||
if( aFound != maAnimations.end() )
|
||||
{
|
||||
pAnimation = (*aFound).second;
|
||||
xAnimation = (*aFound).second;
|
||||
maAnimations.erase(aFound);
|
||||
}
|
||||
maAnimations[pMediaObj.get()] = pAnimation;
|
||||
maAnimations[pMediaObj.get()] = std::move(xAnimation);
|
||||
}
|
||||
|
||||
pObj = pMediaObj; // SJ: hoping that pObj is not inserted in any list
|
||||
|
||||
@@ -791,12 +791,15 @@ namespace drawinglayer::primitive2d
|
||||
if(!aLine.isDefault() || !aText.isDefault())
|
||||
{
|
||||
// try shadow
|
||||
const attribute::SdrShadowAttribute aShadow(createNewSdrShadowAttribute(rSet));
|
||||
const attribute::SdrGlowAttribute aGlow = createNewSdrGlowAttribute(rSet);
|
||||
attribute::SdrShadowAttribute aShadow(createNewSdrShadowAttribute(rSet));
|
||||
attribute::SdrGlowAttribute aGlow = createNewSdrGlowAttribute(rSet);
|
||||
const sal_Int32 nSoftEdgeRadius(getSoftEdgeRadius(rSet));
|
||||
|
||||
return attribute::SdrLineEffectsTextAttribute(aLine, aLineStartEnd, aShadow, aText,
|
||||
aGlow, nSoftEdgeRadius);
|
||||
return attribute::SdrLineEffectsTextAttribute(std::move(aLine),
|
||||
std::move(aLineStartEnd),
|
||||
std::move(aShadow),
|
||||
std::move(aText),
|
||||
std::move(aGlow), nSoftEdgeRadius);
|
||||
}
|
||||
|
||||
return attribute::SdrLineEffectsTextAttribute();
|
||||
|
||||
@@ -2023,7 +2023,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
|
||||
rReq.Ignore(); // the 'old' request is not relevant any more
|
||||
auto pWrtSh = &rWrtSh;
|
||||
pDlg->StartExecuteAsync(
|
||||
[pDlg, pFieldBM, pWrtSh, xRequest] (sal_Int32 nResult)->void
|
||||
[pDlg, pFieldBM, pWrtSh, xRequest=std::move(xRequest)] (sal_Int32 nResult)->void
|
||||
{
|
||||
if (nResult == RET_OK)
|
||||
{
|
||||
|
||||
@@ -76,7 +76,7 @@ void XStyleLoader::testLoadStylesFromStream()
|
||||
uno::Any aTmp;
|
||||
aTmp <<= xInputStream;
|
||||
aInputStream.Value = aTmp;
|
||||
aOptions.getArray()[nLength] = aInputStream;
|
||||
aOptions.getArray()[nLength] = std::move(aInputStream);
|
||||
|
||||
xStyleLoader->loadStylesFromURL(u"private:stream"_ustr, aOptions);
|
||||
|
||||
|
||||
@@ -745,7 +745,7 @@ void DAVResourceAccess::POST(
|
||||
rOutputStream,
|
||||
DAVRequestEnvironment(
|
||||
new DAVAuthListener_Impl( xEnv, m_aURL ),
|
||||
aHeaders ) );
|
||||
std::move(aHeaders) ) );
|
||||
}
|
||||
catch (DAVException const& e)
|
||||
{
|
||||
|
||||
@@ -362,7 +362,7 @@ const std::vector< LanguageType >& LocaleDataWrapper::getInstalledLanguageTypes(
|
||||
if ( eLang != LANGUAGE_DONTKNOW )
|
||||
xLang.push_back(eLang);
|
||||
}
|
||||
rInstalledLanguageTypes = xLang;
|
||||
rInstalledLanguageTypes = std::move(xLang);
|
||||
|
||||
return rInstalledLanguageTypes;
|
||||
}
|
||||
|
||||
@@ -189,7 +189,7 @@ BitmapEx BitmapColorQuantizationFilter::execute(BitmapEx const& aBitmapEx) const
|
||||
const MapMode aMap(aBitmap.GetPrefMapMode());
|
||||
const Size aSize(aBitmap.GetPrefSize());
|
||||
|
||||
aBitmap = aNewBmp;
|
||||
aBitmap = std::move(aNewBmp);
|
||||
|
||||
aBitmap.SetPrefMapMode(aMap);
|
||||
aBitmap.SetPrefSize(aSize);
|
||||
|
||||
@@ -253,7 +253,7 @@ void SvXMLImportPropertyMapper::importXMLAttribute(
|
||||
if( nReference == -1 )
|
||||
rProperties.push_back( aNewProperty );
|
||||
else
|
||||
rProperties[nReference] = aNewProperty;
|
||||
rProperties[nReference] = std::move(aNewProperty);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user