[Libreoffice-commits] core.git: sw/qa

[Jan Holesovsky]

 sw/qa/extras/ww8export/ww8export.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5bc759b3ad86ce3c413707b740028cf88364b4da
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Oct 23 09:33:55 2015 +0200

    tdf#94386: Small stylistic change based on gerrit#19371 comments.
    
    Change-Id: If0e97269043addb7a1659e34c0b286d7ac32428a

diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index c3091eb..53a1513 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -609,7 +609,7 @@ DECLARE_WW8EXPORT_TEST(testTdf94386, "tdf94386.odt")
     OUString firstPageStyleName = getProperty<OUString>(xCursor, "PageStyleName");
     xCursor->jumpToLastPage();
     OUString lastPageStyleName = getProperty<OUString>(xCursor, "PageStyleName");
-    CPPUNIT_ASSERT_EQUAL(false, firstPageStyleName.equals(lastPageStyleName));
+    CPPUNIT_ASSERT(firstPageStyleName != lastPageStyleName);
 
     uno::Reference<beans::XPropertySet> xFirstPropertySet(getStyles("PageStyles")->getByName(firstPageStyleName), uno::UNO_QUERY);
     awt::Size fSize;
@@ -618,8 +618,8 @@ DECLARE_WW8EXPORT_TEST(testTdf94386, "tdf94386.odt")
     uno::Reference<beans::XPropertySet> xNextPropertySet(getStyles("PageStyles")->getByName(lastPageStyleName), uno::UNO_QUERY);
     awt::Size lSize;
     xNextPropertySet->getPropertyValue("Size") >>= lSize;
-    bool isEqual = (fSize.Width == lSize.Width) || (fSize.Height == lSize.Height);
-    CPPUNIT_ASSERT_EQUAL(false, isEqual);
+
+    CPPUNIT_ASSERT((fSize.Width != lSize.Width) && (fSize.Height != lSize.Height));
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();