summaryrefslogtreecommitdiff
path: root/xmloff/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolan.mcnamara@collabora.com>2024-11-30 19:37:10 +0000
committerCaolán McNamara <caolan.mcnamara@collabora.com>2024-11-30 22:39:23 +0100
commit8c1dbd3188a3baeaab849d4a72e9de8ea85e00fd (patch)
treea89fa88e224ab40f5dcd7c887da2d65650e68b17 /xmloff/source
parent096a1f0a6f2d8fdbd632bd4263e2f022b07f9b69 (diff)
cid#1607542 COPY_INSTEAD_OF_MOVE
and cid#1606986 COPY_INSTEAD_OF_MOVE cid#1557969 COPY_INSTEAD_OF_MOVE cid#1557837 COPY_INSTEAD_OF_MOVE cid#1557772 COPY_INSTEAD_OF_MOVE cid#1557735 COPY_INSTEAD_OF_MOVE cid#1557672 COPY_INSTEAD_OF_MOVE cid#1557664 COPY_INSTEAD_OF_MOVE cid#1557650 COPY_INSTEAD_OF_MOVE cid#1557642 COPY_INSTEAD_OF_MOVE cid#1557639 COPY_INSTEAD_OF_MOVE cid#1557628 COPY_INSTEAD_OF_MOVE cid#1557623 COPY_INSTEAD_OF_MOVE cid#1557581 COPY_INSTEAD_OF_MOVE cid#1557489 COPY_INSTEAD_OF_MOVE cid#1557473 COPY_INSTEAD_OF_MOVE cid#1557317 COPY_INSTEAD_OF_MOVE cid#1557261 COPY_INSTEAD_OF_MOVE cid#1557146 COPY_INSTEAD_OF_MOVE cid#1557135 COPY_INSTEAD_OF_MOVE cid#1557134 COPY_INSTEAD_OF_MOVE cid#1557079 COPY_INSTEAD_OF_MOVE cid#1557063 COPY_INSTEAD_OF_MOVE cid#1557052 COPY_INSTEAD_OF_MOVE cid#1556982 COPY_INSTEAD_OF_MOVE cid#1556977 COPY_INSTEAD_OF_MOVE cid#1556950 COPY_INSTEAD_OF_MOVE cid#1556943 COPY_INSTEAD_OF_MOVE cid#1556804 COPY_INSTEAD_OF_MOVE cid#1556736 COPY_INSTEAD_OF_MOVE cid#1556658 COPY_INSTEAD_OF_MOVE cid#1556621 COPY_INSTEAD_OF_MOVE cid#1556590 COPY_INSTEAD_OF_MOVE cid#1556579 COPY_INSTEAD_OF_MOVE cid#1556534 COPY_INSTEAD_OF_MOVE cid#1556524 COPY_INSTEAD_OF_MOVE cid#1556478 COPY_INSTEAD_OF_MOVE cid#1556467 COPY_INSTEAD_OF_MOVE cid#1556422 COPY_INSTEAD_OF_MOVE cid#1556314 COPY_INSTEAD_OF_MOVE cid#1556309 COPY_INSTEAD_OF_MOVE cid#1556258 COPY_INSTEAD_OF_MOVE cid#1556143 COPY_INSTEAD_OF_MOVE cid#1556119 COPY_INSTEAD_OF_MOVE cid#1556101 COPY_INSTEAD_OF_MOVE cid#1556097 COPY_INSTEAD_OF_MOVE cid#1556039 COPY_INSTEAD_OF_MOVE cid#1555966 COPY_INSTEAD_OF_MOVE cid#1555948 COPY_INSTEAD_OF_MOVE cid#1555915 COPY_INSTEAD_OF_MOVE cid#1555836 COPY_INSTEAD_OF_MOVE cid#1555748 COPY_INSTEAD_OF_MOVE cid#1555644 COPY_INSTEAD_OF_MOVE cid#1555582 COPY_INSTEAD_OF_MOVE cid#1555478 COPY_INSTEAD_OF_MOVE cid#1555475 COPY_INSTEAD_OF_MOVE cid#1555409 COPY_INSTEAD_OF_MOVE cid#1555372 COPY_INSTEAD_OF_MOVE cid#1555334 COPY_INSTEAD_OF_MOVE cid#1555330 COPY_INSTEAD_OF_MOVE cid#1555310 COPY_INSTEAD_OF_MOVE cid#1555257 COPY_INSTEAD_OF_MOVE cid#1555247 COPY_INSTEAD_OF_MOVE cid#1555147 COPY_INSTEAD_OF_MOVE cid#1555120 COPY_INSTEAD_OF_MOVE cid#1555059 COPY_INSTEAD_OF_MOVE cid#1555016 COPY_INSTEAD_OF_MOVE cid#1554880 COPY_INSTEAD_OF_MOVE cid#1554824 COPY_INSTEAD_OF_MOVE cid#1554808 COPY_INSTEAD_OF_MOVE cid#1546189 COPY_INSTEAD_OF_MOVE Change-Id: I2d2f33c603f1596228c9ecb169472ba6751e7826 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177593 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'xmloff/source')
-rw-r--r--xmloff/source/chart/SchXMLPlotAreaContext.cxx2
-rw-r--r--xmloff/source/core/xmluconv.cxx2
-rw-r--r--xmloff/source/draw/sdpropls.cxx2
-rw-r--r--xmloff/source/style/XMLFontStylesContext.cxx2
-rw-r--r--xmloff/source/text/XMLIndexSimpleEntryContext.cxx4
-rw-r--r--xmloff/source/text/XMLIndexSpanEntryContext.cxx4
-rw-r--r--xmloff/source/text/txtfldi.cxx7
7 files changed, 8 insertions, 15 deletions
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 373c355141a1..cd571bab3562 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -366,7 +366,7 @@ void SchXMLPlotAreaContext::startFastElement (sal_Int32 /*nElement*/,
}
}
}
- mrSeriesDefaultsAndStyles.maDeepDefault = aDeepProperty;
+ mrSeriesDefaultsAndStyles.maDeepDefault = std::move(aDeepProperty);
xProp->getPropertyValue(u"NumberOfLines"_ustr) >>= mnNumOfLinesProp;
xProp->getPropertyValue(u"Volume"_ustr) >>= mbStockHasVolume;
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 27ed06144f54..a99ddff236ef 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -812,7 +812,7 @@ void SvXMLUnitConverter::convertPropertySet(uno::Sequence<beans::PropertyValue>&
beans::PropertyValue aValue;
aValue.Name = rProp.Name;
- aValue.Value = aPropertyValue;
+ aValue.Value = std::move(aPropertyValue);
aPropsVec.push_back(aValue);
}
rProps = comphelper::containerToSequence(aPropsVec);
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index b30585b5541f..2a987ad78e6c 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -994,7 +994,7 @@ public:
if (!rValue.hasValue() ||
rValue.get<drawing::TextFitToSizeType>() < any.get<drawing::TextFitToSizeType>())
{
- rValue = any;
+ rValue = std::move(any);
}
return true;
}
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx b/xmloff/source/style/XMLFontStylesContext.cxx
index 396ae42abd49..57ea1415c0a5 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -89,7 +89,7 @@ void XMLFontStyleContextFontFace::SetAttribute( sal_Int32 nElement,
case XML_ELEMENT(STYLE, XML_FONT_CHARSET):
if( GetStyles()->GetEncodingHdl().importXML( rValue, aAny,
rUnitConv ) )
- aEnc = aAny;
+ aEnc = std::move(aAny);
break;
default:
SvXMLStyleContext::SetAttribute( nElement, rValue );
diff --git a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
index 94d15dd2f196..c46eecefd3e2 100644
--- a/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSimpleEntryContext.cxx
@@ -100,7 +100,6 @@ void XMLIndexSimpleEntryContext::FillPropertyValues(
// directly into the slots. Subclasses will have to know they can
// only use slot so-and-so.
- Any aAny;
auto pValues = rValues.getArray();
// token type
@@ -111,10 +110,9 @@ void XMLIndexSimpleEntryContext::FillPropertyValues(
if (m_bCharStyleNameOK)
{
pValues[1].Name = "CharacterStyleName";
- aAny <<= GetImport().GetStyleDisplayName(
+ pValues[1].Value <<= GetImport().GetStyleDisplayName(
XmlStyleFamily::TEXT_TEXT,
m_sCharStyleName );
- pValues[1].Value = aAny;
}
}
diff --git a/xmloff/source/text/XMLIndexSpanEntryContext.cxx b/xmloff/source/text/XMLIndexSpanEntryContext.cxx
index abf7a3eb4eb9..da97744256de 100644
--- a/xmloff/source/text/XMLIndexSpanEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexSpanEntryContext.cxx
@@ -54,10 +54,8 @@ void XMLIndexSpanEntryContext::FillPropertyValues(
// content
auto pValues = rValues.getArray();
- Any aAny;
- aAny <<= sContent.makeStringAndClear();
pValues[m_nValues-1].Name = "Text";
- pValues[m_nValues-1].Value = aAny;
+ pValues[m_nValues-1].Value <<= sContent.makeStringAndClear();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 3f75fa118311..fcaf900b8f41 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -2967,7 +2967,6 @@ void XMLBibliographyFieldImportContext::startFastElement(
auto nToken = aIter.getToken() & TOKEN_MASK;
PropertyValue aValue;
aValue.Name = MapBibliographyFieldName(nToken);
- Any aAny;
// special treatment for bibliography type
// biblio vs bibilio: #96658#; also read old documents
@@ -2979,8 +2978,7 @@ void XMLBibliographyFieldImportContext::startFastElement(
nTmp, aIter.toView(),
aBibliographyDataTypeMap))
{
- aAny <<= static_cast<sal_Int16>(nTmp);
- aValue.Value = aAny;
+ aValue.Value <<= static_cast<sal_Int16>(nTmp);
aValues.push_back(aValue);
}
@@ -2992,8 +2990,7 @@ void XMLBibliographyFieldImportContext::startFastElement(
{
aStringValue = GetImport().GetAbsoluteReference(aStringValue);
}
- aAny <<= aStringValue;
- aValue.Value = aAny;
+ aValue.Value <<= aStringValue;
aValues.push_back(aValue);
}