diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-07-22 17:14:17 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-07-22 23:50:43 +0200 |
| commit | 2a6b9c93af295a6746372bc6ce462a02492f616d (patch) | |
| tree | 743607c6395ab97935c5110a137521c5f734c8c5 /sw/source/core/text/redlnitr.cxx | |
| parent | 1a6bc665eb727763265483132db43aee87288deb (diff) | |
Massive KSHORT/MSHORT to sal_uInt16
Change-Id: I82a899ef0cad19d62c41753ffdce07d8e33d6c9d
Diffstat (limited to 'sw/source/core/text/redlnitr.cxx')
| -rw-r--r-- | sw/source/core/text/redlnitr.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 7fdc70127cf7..15917b888a6a 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -248,7 +248,7 @@ short SwRedlineItr::_Seek(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld) FillHints( pRed->GetAuthor(), pRed->GetType() ); SfxWhichIter aIter( *pSet ); - MSHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while( nWhich ) { const SfxPoolItem* pItem; @@ -278,7 +278,7 @@ short SwRedlineItr::_Seek(SwFont& rFnt, sal_Int32 nNew, sal_Int32 nOld) return nRet + EnterExtend( rFnt, nNew ); } -void SwRedlineItr::FillHints( MSHORT nAuthor, RedlineType_t eType ) +void SwRedlineItr::FillHints( sal_uInt16 nAuthor, RedlineType_t eType ) { switch ( eType ) { @@ -363,7 +363,7 @@ bool SwRedlineItr::_ChkSpecialUnderline() const // below the base line for (size_t i = 0; i < m_Hints.size(); ++i) { - MSHORT nWhich = m_Hints[i]->Which(); + sal_uInt16 nWhich = m_Hints[i]->Which(); if( RES_CHRATR_UNDERLINE == nWhich || RES_CHRATR_ESCAPEMENT == nWhich ) return true; @@ -441,11 +441,11 @@ short SwExtend::Enter(SwFont& rFnt, sal_Int32 nNew) bool SwExtend::_Leave(SwFont& rFnt, sal_Int32 nNew) { OSL_ENSURE( Inside(), "SwExtend: Leave without Enter" ); - MSHORT nOldAttr = rArr[ nPos - nStart ]; + sal_uInt16 nOldAttr = rArr[ nPos - nStart ]; nPos = nNew; if( Inside() ) { // We stayed within the ExtendText-section - MSHORT nAttr = rArr[ nPos - nStart ]; + sal_uInt16 nAttr = rArr[ nPos - nStart ]; if( nOldAttr != nAttr ) // Is there an (inner) change of attributes? { rFnt = *pFnt; @@ -472,7 +472,7 @@ sal_Int32 SwExtend::Next( sal_Int32 nNext ) else if( nPos < nEnd ) { sal_Int32 nIdx = nPos - nStart; - MSHORT nAttr = rArr[ nIdx ]; + sal_uInt16 nAttr = rArr[ nIdx ]; while( ++nIdx < (sal_Int32)rArr.size() && nAttr == rArr[ nIdx ] ) ; //nothing nIdx = nIdx + nStart; |