[Libreoffice-commits] .: sw/qa

Markus Mohrhard mmohrhard at kemper.freedesktop.org
Fri May 18 10:51:52 PDT 2012


 sw/qa/extras/ooxmltok/ooxmltok.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8ba9f9cd1ea4175751b10e270cc39e481daf1972
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri May 18 19:50:03 2012 +0200

    can't compare int and sal_Int32 in CPPUNIT_ASSERT_EQUAL
    
    Change-Id: I804e8f27197314d913d2dde138391996338458aa

diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index 1238192..2b639e0 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -259,8 +259,8 @@ xray graphic.Size
     uno::Reference<graphic::XGraphic> graphic;
     imageProperties->getPropertyValue( "Graphic" ) >>= graphic;
     uno::Reference<awt::XBitmap> bitmap(graphic, uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL( 120, bitmap->getSize().Width );
-    CPPUNIT_ASSERT_EQUAL( 106, bitmap->getSize().Height );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(120), bitmap->getSize().Width );
+    CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(106), bitmap->getSize().Height );
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);


More information about the Libreoffice-commits mailing list