Skip to content

C
core
Kaydet (Commit) e2e10b4a authored tarafından Zolnai Tamás's avatar Zolnai Tamás
Dosyalara gözat
Seçenekler

Fix types in new odf tests. 

Change-Id: I0339dd941c81d12688bd531178ce9f1d6b779375
üst 085453d0
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
sw/qa/extras/odfexport/odfexport.cxx
Dosyayı görüntüle @ e2e10b4a
...@@ -204,10 +204,10 @@ void Test::testCharacterBorder() ...@@ -204,10 +204,10 @@ void Test::testCharacterBorder()
// Shadow // Shadow
const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"ParaShadowFormat"); 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((bool)aShadow.IsTransparent, false);
CPPUNIT_ASSERT_EQUAL((int)aShadow.Location, 0); CPPUNIT_ASSERT_EQUAL(aShadow.Location, table::ShadowLocation(0));
CPPUNIT_ASSERT_EQUAL((int)aShadow.ShadowWidth, 0); CPPUNIT_ASSERT_EQUAL(aShadow.ShadowWidth, sal_Int16(0));
} }
// Character border for first paragraph // Character border for first paragraph
...@@ -242,10 +242,10 @@ void Test::testCharacterBorder() ...@@ -242,10 +242,10 @@ void Test::testCharacterBorder()
// Shadow // Shadow
const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"CharShadowFormat"); 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((bool)aShadow.IsTransparent, false);
CPPUNIT_ASSERT_EQUAL((int)aShadow.Location, 2); CPPUNIT_ASSERT_EQUAL(aShadow.Location, table::ShadowLocation(2));
CPPUNIT_ASSERT_EQUAL((int)aShadow.ShadowWidth, 280); CPPUNIT_ASSERT_EQUAL(aShadow.ShadowWidth, sal_Int16(280));
// Check autostyle // Check autostyle
{ {
...@@ -325,10 +325,10 @@ void Test::testCharacterBorder() ...@@ -325,10 +325,10 @@ void Test::testCharacterBorder()
// Shadow // Shadow
const table::ShadowFormat aShadow = getProperty<table::ShadowFormat>(xSet,"CharShadowFormat"); 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((bool)aShadow.IsTransparent, false);
CPPUNIT_ASSERT_EQUAL((int)aShadow.Location, 3); CPPUNIT_ASSERT_EQUAL(aShadow.Location, table::ShadowLocation(3));
CPPUNIT_ASSERT_EQUAL((int)aShadow.ShadowWidth, 79); CPPUNIT_ASSERT_EQUAL(aShadow.ShadowWidth, sal_Int16(79));
// Check character style // Check character style
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment