summaryrefslogtreecommitdiffstats
path: root/sw/qa/extras/mailmerge/mailmerge.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-01-20 11:39:37 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2017-01-20 14:07:27 +0000
commite71ed748acd040b68d9a1910b75ea0550e0c2008 (patch)
tree3c9c539fd4e640dc80fa1cc7520db81e1b3e094e /sw/qa/extras/mailmerge/mailmerge.cxx
parentsvmtest: don't output GDIMetaFiles to disk in normal test runs (diff)
downloadcore-e71ed748acd040b68d9a1910b75ea0550e0c2008.tar.gz
core-e71ed748acd040b68d9a1910b75ea0550e0c2008.zip
sw: fix remaining loplugin:cppunitassertequals warnings
Now only subsequentchecks are remaining, as far as I see. Change-Id: Id5e5a874f8de08c0fd3722aecdc02967ae5d421f Reviewed-on: https://gerrit.libreoffice.org/33346 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sw/qa/extras/mailmerge/mailmerge.cxx')
-rw-r--r--sw/qa/extras/mailmerge/mailmerge.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index 675073ca072b..ec5d66ca0ee0 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -223,7 +223,7 @@ public:
}
else
{
- CPPUNIT_ASSERT(res == true);
+ CPPUNIT_ASSERT_EQUAL(uno::makeAny(true), res);
if( !bMMFilenameFromColumn && !bDontLoadResult )
loadMailMergeDocument( 0 );
}
@@ -337,7 +337,7 @@ int MMTest::documentStartPageNumber( int document ) const
if( IDocumentMarkAccess::GetType( **mark ) == IDocumentMarkAccess::MarkType::UNO_BOOKMARK )
++pos;
}
- CPPUNIT_ASSERT( pos == document );
+ CPPUNIT_ASSERT_EQUAL(document, pos);
sal_uInt16 page, dummy;
shell->Push();
shell->GotoMark( mark->get());