diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 19:59:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:21 +0100 |
| commit | 8bc3751ea3ce1162137df2d0e10502cd24a3cb92 (patch) | |
| tree | 6e0a16a99e7e9c20bfdb97510da35df9af5256fa /sw/qa | |
| parent | 7dca2dd95b21df2b36c6a8e7e9edfb49dbd2acd1 (diff) | |
bool improvements
Change-Id: Ibeb658e73b588f90242c95d23149f2ef45a7a815
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/odfimport/odfimport.cxx | 2 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index 87e7402fda21..a72d643f28fc 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -309,7 +309,7 @@ DECLARE_ODFIMPORT_TEST(testFdo68839, "fdo68839.odt") lcl_CheckShape(getShape(4), "graphicsXXX"); try { uno::Reference<drawing::XShape> xShape = getShape(5); - CPPUNIT_ASSERT(!"IndexOutOfBoundsException expected"); + CPPUNIT_FAIL("IndexOutOfBoundsException expected"); } catch (lang::IndexOutOfBoundsException const&) { } // check prev/next chain uno::Reference<beans::XPropertySet> xFrame1(getShape(1), uno::UNO_QUERY); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 6aa0ed81f24f..771c2c5ac8a2 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1701,12 +1701,12 @@ DECLARE_OOXMLEXPORT_TEST(testActiveXGrabBag, "activex.docx") uno::Sequence<beans::PropertyValue> aGrabBag(0); xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag; CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty - bool bActiveX = sal_False; + bool bActiveX = false; for(int i = 0; i < aGrabBag.getLength(); ++i) { if (aGrabBag[i].Name == "OOXActiveX") { - bActiveX = sal_True; + bActiveX = true; uno::Reference<xml::dom::XDocument> aActiveXDom; uno::Sequence<uno::Reference<xml::dom::XDocument> > aActiveXDomList; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aActiveXDomList); // PropertyValue of proper type @@ -1729,12 +1729,12 @@ DECLARE_OOXMLEXPORT_TEST(testActiveXBinGrabBag, "activexbin.docx") uno::Sequence<beans::PropertyValue> aGrabBag(0); xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag; CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty - bool bActiveX = sal_False; + bool bActiveX = false; for(int i = 0; i < aGrabBag.getLength(); ++i) { if (aGrabBag[i].Name == "OOXActiveXBin") { - bActiveX = sal_True; + bActiveX = true; uno::Reference<io::XInputStream> aActiveXBin; uno::Sequence<uno::Reference<io::XInputStream> > aActiveXBinList; CPPUNIT_ASSERT(aGrabBag[i].Value >>= aActiveXBinList); // PropertyValue of proper type |