summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2014-07-19 11:03:04 +0200
committerMatteo Casalin <matteo.casalin@yahoo.com>2014-07-22 23:50:41 +0200
commit941babb7d32d4eebf1b616a4c1cf02e3f6517532 (patch)
treef80ecf971f4f8c9cf06d8046f291b4b7f4719540
parent1c8784e33677f1112bb38a15041a9aaef2db8c61 (diff)
sal_uInt16 to sal_Int32/size_t
Change-Id: I70e4f757696c370eb2243617e9bfb14d219b4782
-rw-r--r--sw/source/core/txtnode/txatritr.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx
index e8499ac664c5..7a5d7c61f4ab 100644
--- a/sw/source/core/txtnode/txatritr.cxx
+++ b/sw/source/core/txtnode/txatritr.cxx
@@ -113,7 +113,7 @@ bool SwTxtAttrIterator::Next()
{
do {
const SwTxtAttr* pHt = aStack.front();
- sal_uInt16 nEndPos = *pHt->End();
+ const sal_Int32 nEndPos = *pHt->End();
if( nChgPos >= nEndPos )
aStack.pop_front();
else
@@ -128,7 +128,7 @@ bool SwTxtAttrIterator::Next()
if( !aStack.empty() )
{
const SwTxtAttr* pHt = aStack.front();
- const sal_uInt16 nEndPos = *pHt->End();
+ const sal_Int32 nEndPos = *pHt->End();
if( nChgPos >= nEndPos )
{
nChgPos = nEndPos;
@@ -156,7 +156,8 @@ bool SwTxtAttrIterator::Next()
void SwTxtAttrIterator::AddToStack( const SwTxtAttr& rAttr )
{
- sal_uInt16 nIns = 0, nEndPos = *rAttr.End();
+ size_t nIns = 0;
+ const sal_Int32 nEndPos = *rAttr.End();
for( ; nIns < aStack.size(); ++nIns )
if( *aStack[ nIns ]->End() > nEndPos )
break;