diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-23 15:27:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-24 07:58:51 +0100 |
| commit | 35f5274ece0fcbb70753a71619b526ed0d4cbd6b (patch) | |
| tree | 65ca5922a2d39b926e3ad219888afc04f96eeab9 /sw/qa | |
| parent | 50915bababcf6b645fe3b57c265560a3cd0c6224 (diff) | |
TypedWhichId for RES_CHRATR constants
Change-Id: Id6c45c237e9c8c55597d97b647b443eab9d1880a
Reviewed-on: https://gerrit.libreoffice.org/45147
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 0504bbc27b59..8c8f71f198c5 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -3220,14 +3220,14 @@ void SwUiWriterTest::testTdf99689TableOfContents() // next node should contain superscript SwTextNode* pNext = static_cast<SwTextNode*> (pDoc->GetNodes().GoNext( &aIdx )); CPPUNIT_ASSERT( pNext->HasHints() ); - sal_Int32 nAttrType = lcl_getAttributeIDFromHints( pNext->GetSwpHints() ); - CPPUNIT_ASSERT_EQUAL(RES_CHRATR_ESCAPEMENT, static_cast<RES_CHRATR>(nAttrType) ); + sal_uInt16 nAttrType = lcl_getAttributeIDFromHints( pNext->GetSwpHints() ); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(RES_CHRATR_ESCAPEMENT), nAttrType ); // next node should contain subscript pNext = static_cast<SwTextNode*> (pDoc->GetNodes().GoNext( &aIdx )); CPPUNIT_ASSERT( pNext->HasHints() ); nAttrType = lcl_getAttributeIDFromHints( pNext->GetSwpHints() ); - CPPUNIT_ASSERT_EQUAL(RES_CHRATR_ESCAPEMENT, static_cast<RES_CHRATR>(nAttrType) ); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(RES_CHRATR_ESCAPEMENT), nAttrType ); } void SwUiWriterTest::testTdf99689TableOfFigures() @@ -3245,14 +3245,14 @@ void SwUiWriterTest::testTdf99689TableOfFigures() // next node should contain subscript SwTextNode* pNext = static_cast<SwTextNode*> (pDoc->GetNodes().GoNext( &aIdx )); CPPUNIT_ASSERT( pNext->HasHints() ); - sal_Int32 nAttrType = lcl_getAttributeIDFromHints( pNext->GetSwpHints() ); - CPPUNIT_ASSERT_EQUAL(RES_CHRATR_ESCAPEMENT, static_cast<RES_CHRATR>(nAttrType) ); + sal_uInt16 nAttrType = lcl_getAttributeIDFromHints( pNext->GetSwpHints() ); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(RES_CHRATR_ESCAPEMENT), nAttrType ); // next node should contain superscript pNext = static_cast<SwTextNode*> (pDoc->GetNodes().GoNext( &aIdx )); CPPUNIT_ASSERT( pNext->HasHints() ); nAttrType = lcl_getAttributeIDFromHints( pNext->GetSwpHints() ); - CPPUNIT_ASSERT_EQUAL(RES_CHRATR_ESCAPEMENT, static_cast<RES_CHRATR>(nAttrType) ); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(RES_CHRATR_ESCAPEMENT), nAttrType ); } void SwUiWriterTest::testTdf99689TableOfTables() @@ -3270,14 +3270,14 @@ void SwUiWriterTest::testTdf99689TableOfTables() // next node should contain superscript SwTextNode* pNext = static_cast<SwTextNode*> (pDoc->GetNodes().GoNext( &aIdx )); CPPUNIT_ASSERT( pNext->HasHints() ); - sal_Int32 nAttrType = lcl_getAttributeIDFromHints( pNext->GetSwpHints() ); - CPPUNIT_ASSERT_EQUAL(RES_CHRATR_ESCAPEMENT, static_cast<RES_CHRATR>(nAttrType) ); + sal_uInt16 nAttrType = lcl_getAttributeIDFromHints( pNext->GetSwpHints() ); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(RES_CHRATR_ESCAPEMENT), nAttrType ); // next node should contain subscript pNext = static_cast<SwTextNode*> (pDoc->GetNodes().GoNext( &aIdx )); CPPUNIT_ASSERT( pNext->HasHints() ); nAttrType = lcl_getAttributeIDFromHints( pNext->GetSwpHints() ); - CPPUNIT_ASSERT_EQUAL(RES_CHRATR_ESCAPEMENT, static_cast<RES_CHRATR>(nAttrType) ); + CPPUNIT_ASSERT_EQUAL(sal_uInt16(RES_CHRATR_ESCAPEMENT), nAttrType ); } void SwUiWriterTest::testTdf83798() |