diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-01 11:31:35 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-01 11:31:54 +0200 |
| commit | a5824fa97c7300faca3b09fe0922c9f319b3c49b (patch) | |
| tree | e03dc85e276df5e9c689fc04d1edf79541e3b2b1 /sw/qa/extras/mailmerge | |
| parent | 7bacb89bb955f4985e435c33dde629099dab744b (diff) | |
loplugin:implicitboolconversion
Change-Id: Ia63460949a3ba58f0394f5b94e0d906ca7849710
Diffstat (limited to 'sw/qa/extras/mailmerge')
| -rw-r--r-- | sw/qa/extras/mailmerge/mailmerge.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx index 7c51b3fe66ff..79ab78dcb929 100644 --- a/sw/qa/extras/mailmerge/mailmerge.cxx +++ b/sw/qa/extras/mailmerge/mailmerge.cxx @@ -6,6 +6,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <sal/config.h> + +#include <set> + #include <swmodeltestbase.hxx> #if !defined(MACOSX) && !defined(WNT) @@ -49,8 +53,7 @@ DECLARE_DFLT_MAILMERGE_TEST(testMultiPageAnchoredDraws, "multiple-page-anchored- uno::Reference<container::XIndexAccess> xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(sal_Int32(8), xDraws->getCount()); - // bitset of all page numbers - char nPageSum = 0xFF; + std::set<sal_uInt16> pages; uno::Reference<beans::XPropertySet> xPropertySet; for (sal_Int32 i = 0; i < xDraws->getCount(); i++) @@ -63,11 +66,9 @@ DECLARE_DFLT_MAILMERGE_TEST(testMultiPageAnchoredDraws, "multiple-page-anchored- CPPUNIT_ASSERT_EQUAL( text::TextContentAnchorType_AT_PAGE, nAnchorType ); xPropertySet->getPropertyValue( UNO_NAME_ANCHOR_PAGE_NO ) >>= nAnchorPageNo; - nPageSum &= !nAnchorPageNo; + // are all shapes are on different page numbers? + CPPUNIT_ASSERT(pages.insert(nAnchorPageNo).second); } - - // are all shapes are on different page numbers? - CPPUNIT_ASSERT_EQUAL(char(0), nPageSum); } #endif |