cid#1546141 COPY_INSTEAD_OF_MOVE

and

cid#1546004 COPY_INSTEAD_OF_MOVE
cid#1545934 COPY_INSTEAD_OF_MOVE
cid#1545563 COPY_INSTEAD_OF_MOVE
cid#1545533 COPY_INSTEAD_OF_MOVE
cid#1545529 COPY_INSTEAD_OF_MOVE
cid#1545502 COPY_INSTEAD_OF_MOVE
cid#1545499 COPY_INSTEAD_OF_MOVE
cid#1545479 COPY_INSTEAD_OF_MOVE
cid#1545344 COPY_INSTEAD_OF_MOVE
cid#1545324 COPY_INSTEAD_OF_MOVE
cid#1545313 COPY_INSTEAD_OF_MOVE
cid#1545252 COPY_INSTEAD_OF_MOVE
cid#1545186 COPY_INSTEAD_OF_MOVE

Change-Id: I44a783876699f88c769f239ae84eb5cae44d5f07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161879
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara
2024-01-10 13:44:58 +01:00
parent ba3627ba89
commit 212bbbe5ca
14 changed files with 29 additions and 30 deletions
+2 -2
View File
@@ -1385,10 +1385,10 @@ IMPL_LINK(SvxLinguTabPage, ClickHdl_Impl, weld::Button&, rBtn, void)
if (!pLinguData)
pLinguData.reset( new SvxLinguData_Impl );
SvxLinguData_Impl aOldLinguData( *pLinguData );
SvxLinguData_Impl aOldLinguData(*pLinguData);
SvxEditModulesDlg aDlg(GetFrameWeld(), *pLinguData);
if (aDlg.run() != RET_OK)
*pLinguData = aOldLinguData;
*pLinguData = std::move(aOldLinguData);
// evaluate new status of 'bConfigured' flag
sal_uInt32 nLen = pLinguData->GetDisplayServiceCount();
@@ -190,7 +190,7 @@ namespace drawinglayer::processor3d
// rescue values
const bool bOldModulate(getModulate()); mbModulate = rPrimitive.getModulate();
const bool bOldFilter(getFilter()); mbFilter = rPrimitive.getFilter();
std::shared_ptr< texture::GeoTexSvx > pOldTex = mpGeoTexSvx;
std::shared_ptr<texture::GeoTexSvx> xOldTex(mpGeoTexSvx);
// calculate logic pixel size in object coordinates. Create transformation view
// to object by inverting ObjectToView
@@ -218,7 +218,7 @@ namespace drawinglayer::processor3d
// restore values
mbModulate = bOldModulate;
mbFilter = bOldFilter;
mpGeoTexSvx = pOldTex;
mpGeoTexSvx = std::move(xOldTex);
}
void DefaultProcessor3D::impRenderBitmapTexturePrimitive3D(const primitive3d::BitmapTexturePrimitive3D& rPrimitive)
+2 -2
View File
@@ -1092,7 +1092,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh
basegfx::B2DPolyPolygon aPolyPoly(GetLineArrow( nLineWidth, eLineEnd, eWidth, eLength, nArrowWidth, bArrowCenter, aArrowName, bScaleArrows ));
rSet.Put( XLineStartWidthItem( nArrowWidth ) );
rSet.Put( XLineStartItem( std::move(aArrowName), std::move(aPolyPoly)) );
rSet.Put( XLineStartItem( std::move(aArrowName), std::move(aPolyPoly) ) );
rSet.Put( XLineStartCenterItem( bArrowCenter ) );
}
@@ -1110,7 +1110,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eSh
basegfx::B2DPolyPolygon aPolyPoly(GetLineArrow( nLineWidth, eLineEnd, eWidth, eLength, nArrowWidth, bArrowCenter, aArrowName, bScaleArrows ));
rSet.Put( XLineEndWidthItem( nArrowWidth ) );
rSet.Put( XLineEndItem( aArrowName, aPolyPoly ) );
rSet.Put( XLineEndItem( std::move(aArrowName), std::move(aPolyPoly) ) );
rSet.Put( XLineEndCenterItem( bArrowCenter ) );
}
}
+8 -7
View File
@@ -45,18 +45,19 @@ oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken
{
if (m_bFullWPGSupport)
{
oox::drawingml::ShapePtr pShape = std::make_shared<oox::drawingml::Shape>(
"com.sun.star.drawing.CustomShape", /*bDefaultHeight=*/false);
return new oox::shape::WpsContext(*this, uno::Reference<drawing::XShape>(), mpShape,
pShape);
return new oox::shape::WpsContext(
*this, uno::Reference<drawing::XShape>(), mpShape,
std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.CustomShape",
/*bDefaultHeight=*/false));
}
// Don't set default character height, Writer has its own way to set
// the default, and if we don't set it here, editeng properly inherits
// it.
oox::drawingml::ShapePtr pShape = std::make_shared<oox::drawingml::Shape>(
"com.sun.star.drawing.CustomShape", /*bDefaultHeight=*/false);
return new oox::drawingml::ShapeContext(*this, mpShape, pShape);
return new oox::drawingml::ShapeContext(
*this, mpShape,
std::make_shared<oox::drawingml::Shape>("com.sun.star.drawing.CustomShape",
/*bDefaultHeight=*/false));
}
case XML_pic:
return new oox::drawingml::GraphicShapeContext(
+1 -1
View File
@@ -174,7 +174,7 @@ bool SvFileObject::LoadFile_Impl()
bClearMedium = !xMed.is();
if( bClearMedium )
xMed = xTmpMed; // If already finished in Download
xMed = std::move(xTmpMed); // If already finished in Download
return bDataReady;
}
+1 -1
View File
@@ -1867,7 +1867,7 @@ void Ruler::ImplDrag( const Point& rPos )
Invalidate(InvalidateFlags::NoErase);
// reset the data as before cancel
*mpDragData = aTempData;
*mpDragData = std::move(aTempData);
}
}
else
+1 -3
View File
@@ -375,11 +375,9 @@ void SmartTagMgr::LoadLibraries()
void SmartTagMgr::PrepareConfiguration( std::u16string_view rConfigurationGroupName )
{
Any aAny(
OUString::Concat("/org.openoffice.Office.Common/SmartTags/") + rConfigurationGroupName );
beans::PropertyValue aPathArgument;
aPathArgument.Name = "nodepath";
aPathArgument.Value = aAny;
aPathArgument.Value <<= OUString::Concat("/org.openoffice.Office.Common/SmartTags/") + rConfigurationGroupName;
Sequence< Any > aArguments{ Any(aPathArgument) };
Reference< lang::XMultiServiceFactory > xConfProv = configuration::theDefaultProvider::get( mxContext );
+2 -2
View File
@@ -3593,8 +3593,8 @@ uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints()
if( HasSdrObject() && !xGluePoints.is() )
{
uno::Reference< container::XIndexContainer > xNew( SvxUnoGluePointAccess_createInstance( GetSdrObject() ), uno::UNO_QUERY );
mxGluePoints = xGluePoints = xNew;
xGluePoints.set(SvxUnoGluePointAccess_createInstance(GetSdrObject()), uno::UNO_QUERY);
mxGluePoints = xGluePoints;
}
return xGluePoints;
+1 -1
View File
@@ -1099,7 +1099,7 @@ sal_Int32 SwCursor::FindAll( SwFindParas& rParas,
nFound = rParas.DoFind(*this, fnMove, aRegion, bInReadOnly, xSearchItem) ? 1 : 0;
if (0 != nFound && bMarkPos)
*GetMark() = aMarkPos;
*GetMark() = std::move(aMarkPos);
}
if( nFound && SwCursor::IsSelOvr( SwCursorSelOverFlags::Toggle ) )
+1 -1
View File
@@ -1118,7 +1118,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
rDoc.GetDocumentSettingManager().get(DocumentSettingId::TABS_RELATIVE_TO_INDENT) ?
sw::DefaultToxTabStopTokenHandler::TABSTOPS_RELATIVE_TO_INDENT :
sw::DefaultToxTabStopTokenHandler::TABSTOPS_RELATIVE_TO_PAGE);
sw::ToxTextGenerator ttgn(GetTOXForm(), tabStopTokenHandler);
sw::ToxTextGenerator ttgn(GetTOXForm(), std::move(tabStopTokenHandler));
ttgn.GenerateText(GetFormat()->GetDoc(), markURLs, m_aSortArr, nCnt, nRange, pLayout);
nCnt += nRange - 1;
}
+1 -1
View File
@@ -2134,7 +2134,7 @@ lcl_SelectParaAndReset( SwPaM &rPaM, SwDoc & rDoc,
pTemp->MovePara(GoCurrPara, fnParaStart);
}
pTemp->SetMark();
*pTemp->GetPoint() = aEnd;
*pTemp->GetPoint() = std::move(aEnd);
SwUnoCursorHelper::SelectPam(*pTemp, true);
if(!SwUnoCursorHelper::IsEndOfPara(*pTemp))
{
+2 -2
View File
@@ -1821,12 +1821,12 @@ void MSWordExportBase::WriteSpecialText( SwNodeOffset nStart, SwNodeOffset nEnd,
// tdf#106261 Reset table infos, otherwise the depth of the cells will be
// incorrect, in case the header/footer had table(s) and we try to export
// the same table second time.
ww8::WW8TableInfo::Pointer_t pOldTableInfo = m_pTableInfo;
ww8::WW8TableInfo::Pointer_t xOldTableInfo(m_pTableInfo);
m_pTableInfo = std::make_shared<ww8::WW8TableInfo>();
WriteText();
m_pTableInfo = pOldTableInfo;
m_pTableInfo = std::move(xOldTableInfo);
m_bOutPageDescs = bOldPageDescs;
m_pCurPam = pOldPam; // delete Pam
+2 -2
View File
@@ -10168,7 +10168,7 @@ void PDFWriterImpl::updateGraphicsState(Mode const mode)
if( rNewState.m_bClipRegion )
{
// clip region is always stored in private PDF mapmode
MapMode aNewMapMode = rNewState.m_aMapMode;
MapMode aNewMapMode = std::move(rNewState.m_aMapMode);
rNewState.m_aMapMode = m_aMapMode;
SetMapMode( rNewState.m_aMapMode );
m_aCurrentPDFState.m_aMapMode = rNewState.m_aMapMode;
@@ -10187,7 +10187,7 @@ void PDFWriterImpl::updateGraphicsState(Mode const mode)
}
aLine.append( "W* n\n" );
rNewState.m_aMapMode = aNewMapMode;
rNewState.m_aMapMode = std::move(aNewMapMode);
SetMapMode( rNewState.m_aMapMode );
m_aCurrentPDFState.m_aMapMode = rNewState.m_aMapMode;
}
@@ -1768,10 +1768,10 @@ Reference< xml::sax::XDocumentHandler > importDialogModel(
Reference< XModel > const & xDocument )
{
// single set of styles and stylenames apply to all containers
auto pStyleNames = std::make_shared<std::vector< OUString >>();
auto pStyles = std::make_shared<std::vector< css::uno::Reference< css::xml::input::XElement > >>();
auto xStyleNames = std::make_shared<std::vector< OUString >>();
auto xStyles = std::make_shared<std::vector< css::uno::Reference< css::xml::input::XElement > >>();
return ::xmlscript::createDocumentHandler(
new DialogImport(xContext, xDialogModel, pStyleNames, pStyles, xDocument));
new DialogImport(xContext, xDialogModel, std::move(xStyleNames), std::move(xStyles), xDocument));
}
}