basctl/source/dlged/dlged.cxx | 2 +-
basic/source/classes/eventatt.cxx | 2 +-
chart2/source/view/main/AxisUsage.hxx | 2 +-
oox/source/export/shapes.cxx | 2 +-
sfx2/source/appl/preventduplicateinteraction.cxx | 2 +-
sfx2/source/appl/shutdownicon.cxx | 5 +----
stoc/source/inspect/introspection.cxx | 4 ++--
stoc/source/security/access_controller.cxx | 2 +-
stoc/source/servicemanager/servicemanager.cxx | 4 ++--
sw/source/core/crsr/crstrvl.cxx | 2 +-
ucb/source/cacher/contentresultsetwrapper.cxx | 2 +-
11 files changed, 13 insertions(+), 16 deletions(-)
New commits:
commit 3808ef2b27a79f55f99543be20c26f0a4ad191b2
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jan 12 10:55:35 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jan 12 20:21:35 2024 +0100
cid#1545535 COPY_INSTEAD_OF_MOVE
and
cid#1545526 COPY_INSTEAD_OF_MOVE
cid#1545442 COPY_INSTEAD_OF_MOVE
cid#1545426 COPY_INSTEAD_OF_MOVE
cid#1545425 COPY_INSTEAD_OF_MOVE
cid#1545387 COPY_INSTEAD_OF_MOVE
cid#1545379 COPY_INSTEAD_OF_MOVE
cid#1545337 COPY_INSTEAD_OF_MOVE
cid#1545334 COPY_INSTEAD_OF_MOVE
cid#1545289 COPY_INSTEAD_OF_MOVE
cid#1545282 COPY_INSTEAD_OF_MOVE
cid#1545270 COPY_INSTEAD_OF_MOVE
cid#1545237 COPY_INSTEAD_OF_MOVE
Change-Id: Iae44a7347c85ae2e367bf672214b2013f30466f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161968
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 2eb099718b5b..be3c4cc1584f 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -427,7 +427,7 @@ Reference< util::XNumberFormatsSupplier > const &
DlgEditor::GetNumberFormatsSup
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !m_xSupplier.is() )
{
- m_xSupplier = xSupplier;
+ m_xSupplier = std::move(xSupplier);
}
}
return m_xSupplier;
diff --git a/basic/source/classes/eventatt.cxx
b/basic/source/classes/eventatt.cxx
index 47930d1f3135..93399726ef11 100644
--- a/basic/source/classes/eventatt.cxx
+++ b/basic/source/classes/eventatt.cxx
@@ -113,7 +113,7 @@ void SFURL_firing_impl( const ScriptEvent& aScriptEvent,
Any* pRet, const Refere
Any result = xScript->invoke( inArgs, outIndex, outArgs );
if ( pRet )
{
- *pRet = result;
+ *pRet = std::move(result);
}
}
catch ( const RuntimeException& )
diff --git a/chart2/source/view/main/AxisUsage.hxx
b/chart2/source/view/main/AxisUsage.hxx
index 83451870755f..51a32a59b0e1 100644
--- a/chart2/source/view/main/AxisUsage.hxx
+++ b/chart2/source/view/main/AxisUsage.hxx
@@ -73,7 +73,7 @@ public:
if (nFoundDimension < nDimensionIndex)
return;
}
- aCoordinateSystems[pCooSys] = aFullAxisIndex;
+ aCoordinateSystems[pCooSys] = std::move(aFullAxisIndex);
//set maximum scale index
auto aIter = aMaxIndexPerDimension.find(nDimensionIndex);
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 5997728e316b..c0c08c7ccf28 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -552,7 +552,7 @@ ShapeExport& ShapeExport::WriteGroupShape(const
uno::Reference<drawing::XShape>&
mnXmlNamespace = nSavedNamespace;
}
- m_xParent = xParent;
+ m_xParent = std::move(xParent);
pFS->endElementNS(mnXmlNamespace, nGroupShapeToken);
return *this;
diff --git a/sfx2/source/appl/preventduplicateinteraction.cxx
b/sfx2/source/appl/preventduplicateinteraction.cxx
index c7d6341fa8f0..694591225ee4 100644
--- a/sfx2/source/appl/preventduplicateinteraction.cxx
+++ b/sfx2/source/appl/preventduplicateinteraction.cxx
@@ -56,7 +56,7 @@ void PreventDuplicateInteraction::useDefaultUUIHandler()
// SAFE ->
std::unique_lock aLock(m_aLock);
- m_xHandler = xHandler;
+ m_xHandler = std::move(xHandler);
// <- SAFE
}
diff --git a/sfx2/source/appl/shutdownicon.cxx
b/sfx2/source/appl/shutdownicon.cxx
index fca7e56b3f3f..0e61f8eb040e 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -464,10 +464,9 @@ void ShutdownIcon::init()
{
css::uno::Reference < XDesktop2 > xDesktop = Desktop::create( m_xContext );
std::unique_lock aGuard(m_aMutex);
- m_xDesktop = xDesktop;
+ m_xDesktop = std::move(xDesktop);
}
-
void ShutdownIcon::disposing(std::unique_lock<std::mutex>&)
{
m_xContext.clear();
@@ -476,13 +475,11 @@ void
ShutdownIcon::disposing(std::unique_lock<std::mutex>&)
deInitSystray();
}
-
// XEventListener
void SAL_CALL ShutdownIcon::disposing( const css::lang::EventObject& )
{
}
-
// XTerminateListener
void SAL_CALL ShutdownIcon::queryTermination( const css::lang::EventObject& )
{
diff --git a/stoc/source/inspect/introspection.cxx
b/stoc/source/inspect/introspection.cxx
index 6e6bd048ac2f..7ab9c4e5f116 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -791,7 +791,7 @@ Reference<XElementAccess>
ImplIntrospectionAccess::getXElementAccess()
Reference<XElementAccess> xElementAccess( mxIface, UNO_QUERY );
aGuard.lock();
if( !mxObjElementAccess.is() )
- mxObjElementAccess = xElementAccess;
+ mxObjElementAccess = std::move(xElementAccess);
}
return mxObjElementAccess;
}
@@ -957,7 +957,7 @@ Reference<XIdlArray> ImplIntrospectionAccess::getXIdlArray()
Reference<XIdlArray> xIdlArray( mxIface, UNO_QUERY );
aGuard.lock();
if( !mxObjIdlArray.is() )
- mxObjIdlArray = xIdlArray;
+ mxObjIdlArray = std::move(xIdlArray);
}
return mxObjIdlArray;
}
diff --git a/stoc/source/security/access_controller.cxx
b/stoc/source/security/access_controller.cxx
index 1359e529c73d..63f5ca10137b 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -623,7 +623,7 @@ PermissionCollection
AccessController::getEffectivePermissions(
MutexGuard guard( m_aMutex );
if (! m_defaultPerm_init)
{
- m_defaultPermissions = defaultPermissions;
+ m_defaultPermissions = std::move(defaultPermissions);
m_defaultPerm_init = true;
}
#ifdef __DIAGNOSE
diff --git a/stoc/source/servicemanager/servicemanager.cxx
b/stoc/source/servicemanager/servicemanager.cxx
index c61e23cf8546..96fa0a988518 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -645,7 +645,7 @@ Reference<XPropertySetInfo >
OServiceManager::getPropertySetInfo()
MutexGuard aGuard( m_aMutex );
if (! m_xPropertyInfo.is())
{
- m_xPropertyInfo = xInfo;
+ m_xPropertyInfo = std::move(xInfo);
}
}
return m_xPropertyInfo;
@@ -1427,7 +1427,7 @@ Reference<XPropertySetInfo >
ORegistryServiceManager::getPropertySetInfo()
MutexGuard aGuard( m_aMutex );
if (! m_xPropertyInfo.is())
{
- m_xPropertyInfo = xInfo;
+ m_xPropertyInfo = std::move(xInfo);
}
}
return m_xPropertyInfo;
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index e934cd1a8686..9fa8c76adf09 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -476,7 +476,7 @@ bool SwCursorShell::GotoNxtPrvTableFormula( bool bNext,
bool bOnlyErrors )
if( !bFnd )
{
- rPos = aOldPos;
+ rPos = std::move(aOldPos);
SvxSearchDialogWrapper::SetSearchLabel(
SearchLabel::NavElementNotFound );
return false;
}
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx
b/ucb/source/cacher/contentresultsetwrapper.cxx
index 24c1ba67ea41..2fca4e90d4c9 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -345,7 +345,7 @@ Reference< XResultSetMetaData > SAL_CALL
ContentResultSetWrapper::getMetaData()
= xMetaDataSupplier->getMetaData();
aGuard.lock();
- m_xMetaDataFromOrigin = xMetaData;
+ m_xMetaDataFromOrigin = std::move(xMetaData);
}
}
return m_xMetaDataFromOrigin;
