summaryrefslogtreecommitdiff
path: root/sw/qa/extras
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-13 14:56:28 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-09-14 08:28:31 +0200
commitb0b0aef18fff981fa1f4a1539c150260cc526595 (patch)
tree5ca719fbb17aa857d132f2d97becfa0ac95b34c2 /sw/qa/extras
parenta4fb52ac0f48b10b72be330fe49d99a9a2471751 (diff)
clang-tidy modernize-use-emplace in sw
Change-Id: I92fd035824f247dc61edfb18c54b960a7733fdf7 Reviewed-on: https://gerrit.libreoffice.org/42244 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/qa/extras')
-rw-r--r--sw/qa/extras/mailmerge/mailmerge.cxx26
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx2
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx10
3 files changed, 19 insertions, 19 deletions
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index 60b5c0bd9011..d7413f33a68a 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -147,36 +147,36 @@ public:
mMMargs.reserve( 15 );
- mMMargs.push_back( beans::NamedValue( UNO_NAME_OUTPUT_TYPE, uno::Any( file ? text::MailMergeType::FILE : text::MailMergeType::SHELL ) ) );
- mMMargs.push_back( beans::NamedValue( UNO_NAME_DOCUMENT_URL, uno::Any(
- ( OUString( m_directories.getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(filename)) ) ) ) );
- mMMargs.push_back( beans::NamedValue( UNO_NAME_DATA_SOURCE_NAME, uno::Any( aDBName ) ) );
- mMMargs.push_back( beans::NamedValue( UNO_NAME_OUTPUT_URL, uno::Any( aWorkDir ) ) );
+ mMMargs.emplace_back( UNO_NAME_OUTPUT_TYPE, uno::Any( file ? text::MailMergeType::FILE : text::MailMergeType::SHELL ) );
+ mMMargs.emplace_back( UNO_NAME_DOCUMENT_URL, uno::Any(
+ ( OUString( m_directories.getURLFromSrc(mpTestDocumentPath) + OUString::createFromAscii(filename)) ) ) );
+ mMMargs.emplace_back( UNO_NAME_DATA_SOURCE_NAME, uno::Any( aDBName ) );
+ mMMargs.emplace_back( UNO_NAME_OUTPUT_URL, uno::Any( aWorkDir ) );
if (file)
- mMMargs.push_back( beans::NamedValue( UNO_NAME_FILE_NAME_PREFIX, uno::Any( aPrefix )) );
+ mMMargs.emplace_back( UNO_NAME_FILE_NAME_PREFIX, uno::Any( aPrefix ) );
if (bPrefixIsColumn)
- mMMargs.push_back( beans::NamedValue( UNO_NAME_FILE_NAME_FROM_COLUMN, uno::Any( true ) ) );
+ mMMargs.emplace_back( UNO_NAME_FILE_NAME_FROM_COLUMN, uno::Any( true ) );
if (tablename)
{
- mMMargs.push_back( beans::NamedValue( UNO_NAME_DAD_COMMAND_TYPE, uno::Any( sdb::CommandType::TABLE ) ) );
- mMMargs.push_back( beans::NamedValue( UNO_NAME_DAD_COMMAND, uno::Any( OUString::createFromAscii(tablename) ) ) );
+ mMMargs.emplace_back( UNO_NAME_DAD_COMMAND_TYPE, uno::Any( sdb::CommandType::TABLE ) );
+ mMMargs.emplace_back( UNO_NAME_DAD_COMMAND, uno::Any( OUString::createFromAscii(tablename) ) );
}
if (nDataSets > 0)
{
mxCurResultSet = getXResultFromDataset( tablename, aDBName );
uno::Reference< sdbcx::XRowLocate > xCurRowLocate( mxCurResultSet, uno::UNO_QUERY );
- mMMargs.push_back( beans::NamedValue( UNO_NAME_RESULT_SET, uno::Any( mxCurResultSet ) ) );
+ mMMargs.emplace_back( UNO_NAME_RESULT_SET, uno::Any( mxCurResultSet ) );
std::vector< uno::Any > vResult;
vResult.reserve( nDataSets );
sal_Int32 i;
for (i = 0, mxCurResultSet->first(); i < nDataSets; i++, mxCurResultSet->next())
{
- vResult.push_back( uno::Any( xCurRowLocate->getBookmark() ) );
+ vResult.emplace_back( xCurRowLocate->getBookmark() );
}
- mMMargs.push_back( beans::NamedValue( UNO_NAME_SELECTION, uno::Any( comphelper::containerToSequence(vResult) ) ) );
+ mMMargs.emplace_back( UNO_NAME_SELECTION, uno::Any( comphelper::containerToSequence(vResult) ) );
}
}
@@ -652,7 +652,7 @@ DECLARE_FILE_MAILMERGE_TEST(testTdf102010, "empty.odt", "10-testing-addresses.od
++aNamedValueIter;
}
}
- mMMargs.push_back( beans::NamedValue( UNO_NAME_SAVE_AS_SINGLE_FILE, uno::Any( true ) ) );
+ mMMargs.emplace_back( UNO_NAME_SAVE_AS_SINGLE_FILE, uno::Any( true ) );
// Generate correct mail merge result filename
executeMailMerge();
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b83881d0d1da..b7eb3393fc61 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -238,7 +238,7 @@ void SwTiledRenderingTest::callbackImpl(int nType, const char* pPayload)
boost::property_tree::read_json(aStream, aTree);
for (boost::property_tree::ptree::value_type& rValue : aTree.get_child("searchResultSelection"))
{
- m_aSearchResultSelection.push_back(rValue.second.get<std::string>("rectangles").c_str());
+ m_aSearchResultSelection.emplace_back(rValue.second.get<std::string>("rectangles").c_str());
m_aSearchResultPart.push_back(std::atoi(rValue.second.get<std::string>("part").c_str()));
}
}
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index c3ef16b82558..4e3a437d104c 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -3908,29 +3908,29 @@ class PortionHandler : public SwPortionHandler
virtual void Text(sal_Int32 nLength, sal_uInt16 nType,
sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/) override
{
- mPortionItems.push_back(PortionItem("text", nLength, nType));
+ mPortionItems.emplace_back("text", nLength, nType);
}
virtual void Special(sal_Int32 nLength, const OUString & /*rText*/,
sal_uInt16 nType, sal_Int32 /*nHeight*/,
sal_Int32 /*nWidth*/, const SwFont* /*pFont*/) override
{
- mPortionItems.push_back(PortionItem("special", nLength, nType));
+ mPortionItems.emplace_back("special", nLength, nType);
}
virtual void LineBreak(sal_Int32 /*nWidth*/) override
{
- mPortionItems.push_back(PortionItem("line_break"));
+ mPortionItems.emplace_back("line_break");
}
virtual void Skip(sal_Int32 nLength) override
{
- mPortionItems.push_back(PortionItem("skip", nLength));
+ mPortionItems.emplace_back("skip", nLength);
}
virtual void Finish() override
{
- mPortionItems.push_back(PortionItem("finish"));
+ mPortionItems.emplace_back("finish");
}
};