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

[Zolnai Tamás]

 sw/qa/extras/odfexport/odfexport.cxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit e2e10b4a544520a3dbd21dd7fe3937ce719de24a
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Fri Aug 23 21:57:49 2013 +0200

    Fix types in new odf tests.
    
    Change-Id: I0339dd941c81d12688bd531178ce9f1d6b779375

diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 0ad7743..b8cecb5 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -204,10 +204,10 @@ void Test::testCharacterBorder()
 
         // Shadow
         const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"ParaShadowFormat");
-        CPPUNIT_ASSERT_EQUAL(aShadow.Color, 0L);
+        CPPUNIT_ASSERT_EQUAL(aShadow.Color, sal_Int32(0));
         CPPUNIT_ASSERT_EQUAL((bool)aShadow.IsTransparent, false);
-        CPPUNIT_ASSERT_EQUAL((int)aShadow.Location, 0);
-        CPPUNIT_ASSERT_EQUAL((int)aShadow.ShadowWidth, 0);
+        CPPUNIT_ASSERT_EQUAL(aShadow.Location, table::ShadowLocation(0));
+        CPPUNIT_ASSERT_EQUAL(aShadow.ShadowWidth, sal_Int16(0));
     }
 
     // Character border for first paragraph
@@ -242,10 +242,10 @@ void Test::testCharacterBorder()
 
         // Shadow
         const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"CharShadowFormat");
-        CPPUNIT_ASSERT_EQUAL(aShadow.Color, 16724787L);
+        CPPUNIT_ASSERT_EQUAL(aShadow.Color, sal_Int32(16724787));
         CPPUNIT_ASSERT_EQUAL((bool)aShadow.IsTransparent, false);
-        CPPUNIT_ASSERT_EQUAL((int)aShadow.Location, 2);
-        CPPUNIT_ASSERT_EQUAL((int)aShadow.ShadowWidth, 280);
+        CPPUNIT_ASSERT_EQUAL(aShadow.Location, table::ShadowLocation(2));
+        CPPUNIT_ASSERT_EQUAL(aShadow.ShadowWidth, sal_Int16(280));
 
         // Check autostyle
         {
@@ -325,10 +325,10 @@ void Test::testCharacterBorder()
 
         // Shadow
         const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"CharShadowFormat");
-        CPPUNIT_ASSERT_EQUAL(aShadow.Color, 0L);
+        CPPUNIT_ASSERT_EQUAL(aShadow.Color, sal_Int32(0));
         CPPUNIT_ASSERT_EQUAL((bool)aShadow.IsTransparent, false);
-        CPPUNIT_ASSERT_EQUAL((int)aShadow.Location, 3);
-        CPPUNIT_ASSERT_EQUAL((int)aShadow.ShadowWidth, 79);
+        CPPUNIT_ASSERT_EQUAL(aShadow.Location, table::ShadowLocation(3));
+        CPPUNIT_ASSERT_EQUAL(aShadow.ShadowWidth, sal_Int16(79));
 
         // Check character style
         {