summaryrefslogtreecommitdiff
path: root/sw/qa/extras/odfexport/odfexport.cxx
diff options
context:
space:
mode:
authorZolnai Tamás <zolnaitamas2000@gmail.com>2013-08-23 21:57:49 +0200
committerZolnai Tamás <zolnaitamas2000@gmail.com>2013-08-23 22:33:37 +0200
commite2e10b4a544520a3dbd21dd7fe3937ce719de24a (patch)
tree6830f785869f0a4080fd285bead75256593e347f /sw/qa/extras/odfexport/odfexport.cxx
parent085453d0990c1f88e847ce714bf3c02f167de43a (diff)
Fix types in new odf tests.
Change-Id: I0339dd941c81d12688bd531178ce9f1d6b779375
Diffstat (limited to 'sw/qa/extras/odfexport/odfexport.cxx')
-rw-r--r--sw/qa/extras/odfexport/odfexport.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 0ad774372e75..b8cecb511ee4 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
{