external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1 | 27
+++++++++-
vcl/source/gdi/impgraph.cxx | 4 -
vcl/source/gdi/vectorgraphicdata.cxx | 2
3 files changed, 28 insertions(+), 5 deletions(-)
New commits:
commit 6bccf8e409a1722ab6920f60478c97241790be87
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Jan 1 20:49:44 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jan 2 00:36:32 2024 +0100
cid#1545235 COPY_INSTEAD_OF_MOVE
and
cid#1545514 COPY_INSTEAD_OF_MOVE
cid#1546000 COPY_INSTEAD_OF_MOVE
std::move looks useful there
Change-Id: Ic3967f283ac4c4f5b8b4797889099af5f2dbb117
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161526
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index ac36d2c72be4..7150aab6b0e6 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -1398,7 +1398,7 @@ void ImpGraphic::updateFromLoadedGraphic(const
ImpGraphic* pGraphic)
// Only set the size in case the unloaded and loaded unit matches.
setPrefSize(aPrefSize);
}
- maGraphicExternalLink = aLink;
+ maGraphicExternalLink = std::move(aLink);
}
else
{
@@ -1683,7 +1683,7 @@ bool ImpGraphic::swapInGraphic(SvStream& rStream)
if (!rStream.GetError())
{
- maVectorGraphicData = aVectorGraphicDataPtr;
+ maVectorGraphicData =
std::move(aVectorGraphicDataPtr);
bReturn = true;
}
}
diff --git a/vcl/source/gdi/vectorgraphicdata.cxx
b/vcl/source/gdi/vectorgraphicdata.cxx
index 9d94b171a45f..957d15c13a41 100644
--- a/vcl/source/gdi/vectorgraphicdata.cxx
+++ b/vcl/source/gdi/vectorgraphicdata.cxx
@@ -319,7 +319,7 @@ VectorGraphicData::VectorGraphicData(
if (!rIStm.GetError())
{
- maDataContainer = aData;
+ maDataContainer = std::move(aData);
}
}
}
commit 58d7eabbed200daaf8b6e1fcb82687ce70184412
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Jan 1 20:41:51 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jan 2 00:36:25 2024 +0100
cid#1545836 COPY_INSTEAD_OF_MOVE
Change-Id: Idb754296175f786c7850253749e3b7f968aa87fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161525
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
index 3f587e16b0a9..640d04ad5684 100644
--- a/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
+++ b/external/cppunit/0001-cid-1546460-COPY_INSTEAD_OF_MOVE.patch.1
@@ -19,7 +19,30 @@ index 3b68d58..7b38a34 100644
+ m_name(std::move(name))
{
}
-
+
+diff --git a/src/cppunit/XmlElement.cpp b/src/cppunit/XmlElement.cpp
+index 585c3da..be02385 100644
+--- a/src/cppunit/XmlElement.cpp
++++ b/src/cppunit/XmlElement.cpp
+@@ -8,8 +8,8 @@ CPPUNIT_NS_BEGIN
+
+ XmlElement::XmlElement( std::string elementName,
+ std::string content )
+- : m_name( elementName )
+- , m_content( content )
++ : m_name(std::move(elementName))
++ , m_content(std::move(content))
+ , m_attributes()
+ , m_elements()
+ {
+@@ -18,7 +18,7 @@ XmlElement::XmlElement( std::string elementName,
+
+ XmlElement::XmlElement( std::string elementName,
+ int numericContent )
+- : m_name( elementName )
++ : m_name(std::move(elementName))
+ , m_content()
+ , m_attributes()
+ , m_elements()
--
2.43.0
-
