writerfilter/source/dmapper/DomainMapper.cxx | 4 +--
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6 ++---
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 24 +++++++++++-----------
3 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit d727f58d73014a3fb4e7eb7f0a29ec4d4599090f
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Fri Dec 29 14:00:46 2023 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Fri Dec 29 16:06:09 2023 +0100
Use emplace_back instead of push_back (writerfilter)
Change-Id: Ic09353c1c99265c789edb745044b0afe7dffbee6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161404
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index c6be4d9f8c98..142d7f2f12eb 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2958,12 +2958,12 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
if (m_pImpl->m_pSdtHelper->getDropDownDisplayTexts().size() !=
nDropDownDisplayTexts + 1)
{
// w:displayText="..." is optional, add empty value if it was not
provided.
-
m_pImpl->m_pSdtHelper->getDropDownDisplayTexts().push_back(OUString());
+ m_pImpl->m_pSdtHelper->getDropDownDisplayTexts().emplace_back();
}
if (m_pImpl->m_pSdtHelper->getDropDownItems().size() != nDropDownItems
+ 1)
{
// w:value="..." is optional, add empty value if it was not
provided.
- m_pImpl->m_pSdtHelper->getDropDownItems().push_back(OUString());
+ m_pImpl->m_pSdtHelper->getDropDownItems().emplace_back();
}
}
break;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c2489210d852..4f65f1b1cefd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4108,9 +4108,9 @@ void
DomainMapper_Impl::CreateRedline(uno::Reference<text::XTextRange> const& xR
if (eType != StoredRedlines::NONE)
{
- m_aStoredRedlines[eType].push_back( uno::Any(xRange) );
- m_aStoredRedlines[eType].push_back( uno::Any(sType) );
- m_aStoredRedlines[eType].push_back( uno::Any(aRedlineProperties) );
+ m_aStoredRedlines[eType].emplace_back(xRange);
+ m_aStoredRedlines[eType].emplace_back(sType);
+ m_aStoredRedlines[eType].emplace_back(aRedlineProperties);
}
}
catch( const uno::Exception & )
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1d0c2d7dde4c..33b90aa9b5ca 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1348,7 +1348,7 @@ void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool
bRunProps)
}
else
{
- pCurrentBuffer->push_back(Buf_t(BUFFER_STARTRUN, nullptr, nullptr));
+ pCurrentBuffer->emplace_back(BUFFER_STARTRUN, nullptr, nullptr);
}
// Should we send run properties?
@@ -1363,8 +1363,8 @@ void RTFDocumentImpl::singleChar(sal_uInt8 nValue, bool
bRunProps)
else
{
auto pValue = new RTFValue(*sValue);
- pCurrentBuffer->push_back(Buf_t(BUFFER_TEXT, pValue, nullptr));
- pCurrentBuffer->push_back(Buf_t(BUFFER_ENDRUN, nullptr, nullptr));
+ pCurrentBuffer->emplace_back(BUFFER_TEXT, pValue, nullptr);
+ pCurrentBuffer->emplace_back(BUFFER_ENDRUN, nullptr, nullptr);
}
}
@@ -1604,7 +1604,7 @@ void RTFDocumentImpl::text(OUString& rString)
else if (pCurrentBuffer)
{
RTFValue::Pointer_t pValue;
- pCurrentBuffer->push_back(Buf_t(BUFFER_STARTRUN, pValue, nullptr));
+ pCurrentBuffer->emplace_back(BUFFER_STARTRUN, pValue, nullptr);
}
if (m_aStates.top().getDestination() == Destination::NORMAL
@@ -1617,7 +1617,7 @@ void RTFDocumentImpl::text(OUString& rString)
else
{
auto pValue = new RTFValue(rString);
- pCurrentBuffer->push_back(Buf_t(BUFFER_UTEXT, pValue, nullptr));
+ pCurrentBuffer->emplace_back(BUFFER_UTEXT, pValue, nullptr);
}
m_bNeedCr = true;
@@ -1627,7 +1627,7 @@ void RTFDocumentImpl::text(OUString& rString)
else if (pCurrentBuffer)
{
RTFValue::Pointer_t pValue;
- pCurrentBuffer->push_back(Buf_t(BUFFER_ENDRUN, pValue, nullptr));
+ pCurrentBuffer->emplace_back(BUFFER_ENDRUN, pValue, nullptr);
}
}
@@ -2498,8 +2498,8 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState&
rState)
// Also buffer the RTFPicture of the state stack as it
contains
// the shape size.
auto pPictureValue = new
RTFValue(m_aStates.top().getPicture());
- m_aStates.top().getCurrentBuffer()->push_back(
- Buf_t(BUFFER_PICTURE, pPictureValue, nullptr));
+
m_aStates.top().getCurrentBuffer()->emplace_back(BUFFER_PICTURE, pPictureValue,
+ nullptr);
auto pValue = new RTFValue(m_aStates.top().getShape());
// Buffer wrap type.
@@ -2513,8 +2513,8 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState&
rState)
}
}
- m_aStates.top().getCurrentBuffer()->push_back(
- Buf_t(BUFFER_RESOLVESHAPE, pValue, nullptr));
+
m_aStates.top().getCurrentBuffer()->emplace_back(BUFFER_RESOLVESHAPE, pValue,
+ nullptr);
}
}
else if (rState.getInShapeGroup() && !rState.getInShape())
@@ -3575,8 +3575,8 @@ void RTFDocumentImpl::afterPopState(RTFParserState&
rState)
if (!m_aStates.top().getCurrentBuffer())
m_pSdrImport->close();
else
- m_aStates.top().getCurrentBuffer()->push_back(
- Buf_t(BUFFER_ENDSHAPE, nullptr, nullptr));
+
m_aStates.top().getCurrentBuffer()->emplace_back(BUFFER_ENDSHAPE, nullptr,
+
nullptr);
}
// It's allowed to declare these inside the shape text, and
they
