diff options
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/edit/edattr.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/itrcrsr.cxx | 12 | ||||
-rw-r--r-- | sw/source/core/text/porglue.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/porlin.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/porlin.hxx | 4 | ||||
-rw-r--r-- | sw/source/core/text/pormulti.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/text/pormulti.hxx | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index 4df2c7db6e47..c6bb80b318cb 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -533,10 +533,10 @@ bool SwEditShell::IsMoveLeftMargin( bool bRight, bool bModulus ) const SwFrame* pFrame = pCNd->getLayoutFrame( GetLayout() ); if ( pFrame ) { - const sal_uInt16 nFrameWidth = o3tl::narrowing<sal_uInt16>( pFrame->IsVertical() ? + const sal_uInt32 nFrameWidth = o3tl::narrowing<sal_uInt32>( pFrame->IsVertical() ? pFrame->getFrameArea().Height() : pFrame->getFrameArea().Width() ); - bRet = nFrameWidth > ( nNext + MM50 ); + bRet = o3tl::narrowing<SwTwips>(nFrameWidth) > ( nNext + MM50 ); } else bRet = false; diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 138359e68c41..2974826154bb 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -1266,7 +1266,7 @@ void SwTextCursor::GetCharRect( SwRect* pOrig, TextFrameIndex const nOfst, * Determines if SwTextCursor::GetModelPositionForViewPoint() should consider the next portion when calculating the * doc model position from a Point. */ -static bool ConsiderNextPortionForCursorOffset(const SwLinePortion* pPor, sal_uInt16 nWidth30, sal_uInt16 nX) +static bool ConsiderNextPortionForCursorOffset(const SwLinePortion* pPor, sal_uInt32 nWidth30, sal_uInt16 nX) { if (!pPor->GetNextPortion() || pPor->IsBreakPortion()) { @@ -1323,7 +1323,7 @@ TextFrameIndex SwTextCursor::GetModelPositionForViewPoint( SwPosition *pPos, con // Until here everything in document coordinates. x -= nLeftMargin; - sal_uInt16 nX = sal_uInt16( x ); + sal_uInt32 nX = sal_uInt16( x ); // If there are attribute changes in the line, search for the paragraph, // in which nX is situated. @@ -1342,7 +1342,7 @@ TextFrameIndex SwTextCursor::GetModelPositionForViewPoint( SwPosition *pPos, con // nWidth is the width of the line, or the width of // the paragraph with the font change, in which nX is situated. - sal_uInt16 nWidth = pPor->Width(); + sal_uInt32 nWidth = pPor->Width(); if ( m_pCurr->IsSpaceAdd() || pKanaComp ) { if ( pPor->InSpaceGrp() && nSpaceAdd ) @@ -1372,7 +1372,7 @@ TextFrameIndex SwTextCursor::GetModelPositionForViewPoint( SwPosition *pPos, con } } - sal_uInt16 nWidth30; + sal_uInt32 nWidth30; if ( pPor->IsPostItsPortion() ) nWidth30 = 0; else @@ -1691,12 +1691,12 @@ TextFrameIndex SwTextCursor::GetModelPositionForViewPoint( SwPosition *pPos, con } pCurrPart = pCurrPart->GetFollow(); } - nX = std::max(0, nX - nSumBorderWidth); + nX = std::max(o3tl::narrowing<sal_uInt32>(0), nX - nSumBorderWidth); } // Shift the offset with the left border width else if( GetInfo().GetFont()->GetLeftBorder() && !pPor->GetJoinBorderWithPrev() ) { - nX = std::max(0, nX - GetInfo().GetFont()->GetLeftBorderSpace()); + nX = std::max(o3tl::narrowing<sal_uInt32>(0), nX - GetInfo().GetFont()->GetLeftBorderSpace()); } aDrawInf.SetOffset( nX ); diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx index 7c09ded23a2f..4ccfbbb62172 100644 --- a/sw/source/core/text/porglue.cxx +++ b/sw/source/core/text/porglue.cxx @@ -215,7 +215,7 @@ void SwMarginPortion::AdjustRight( const SwLineLayout *pCurr ) } while( pPrev != pLeft ) { - if( bNoMove || pPrev->PrtWidth() >= nRightGlue || + if( bNoMove || o3tl::narrowing<SwTwips>(pPrev->PrtWidth()) >= nRightGlue || pPrev->InHyphGrp() || pPrev->IsKernPortion() ) { // The portion before the pRight cannot be moved diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx index e0a157d9d579..c5dc41ff3db5 100644 --- a/sw/source/core/text/porlin.cxx +++ b/sw/source/core/text/porlin.cxx @@ -290,7 +290,7 @@ void SwLinePortion::Move( SwTextPaintInfo &rInf ) rInf.IncKanaIdx(); } if( rInf.IsRotated() ) - rInf.Y( rInf.Y() + ( bB2T ? -PrtWidth() : PrtWidth() ) ); + rInf.Y( rInf.Y() + ( bB2T ? -o3tl::narrowing<SwTwips>(PrtWidth()) : o3tl::narrowing<SwTwips>(PrtWidth()) ) ); else if ( bCounterDir ) rInf.X( rInf.X() - PrtWidth() ); else diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx index 2648dbbdf6c5..f0efc86e5888 100644 --- a/sw/source/core/text/porlin.hxx +++ b/sw/source/core/text/porlin.hxx @@ -77,8 +77,8 @@ public: sal_uInt32 GetAscent() const { return mnAscent; } void SetAscent( const sal_uInt32 nNewAsc ) { mnAscent = nNewAsc; } void PrtWidth( sal_uInt16 nNewWidth ) { Width( nNewWidth ); } - sal_uInt16 PrtWidth() const { return Width(); } - void AddPrtWidth( const sal_uInt16 nNew ) { Width( Width() + nNew ); } + sal_uInt32 PrtWidth() const { return Width(); } + void AddPrtWidth( const sal_uInt32 nNew ) { Width( Width() + nNew ); } void SubPrtWidth( const sal_uInt16 nNew ) { Width( Width() - nNew ); } // Insert methods diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx index 55cb637e34ea..b94302bd8ed7 100644 --- a/sw/source/core/text/pormulti.cxx +++ b/sw/source/core/text/pormulti.cxx @@ -2511,7 +2511,7 @@ SwLinePortion* SwTextFormatter::MakeRestPortion( const SwLineLayout* pLine, SwTextCursorSave::SwTextCursorSave( SwTextCursor* pCursor, SwMultiPortion* pMulti, SwTwips nY, - sal_uInt16& nX, + sal_uInt32& nX, TextFrameIndex const nCurrStart, tools::Long nSpaceAdd ) : pTextCursor(pCursor), diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx index c94dd3125629..7c17df2e175c 100644 --- a/sw/source/core/text/pormulti.hxx +++ b/sw/source/core/text/pormulti.hxx @@ -241,7 +241,7 @@ class SwTextCursorSave bool bSpaceChg; public: SwTextCursorSave( SwTextCursor* pTextCursor, SwMultiPortion* pMulti, - SwTwips nY, sal_uInt16& nX, TextFrameIndex nCurrStart, tools::Long nSpaceAdd); + SwTwips nY, sal_uInt32& nX, TextFrameIndex nCurrStart, tools::Long nSpaceAdd); ~SwTextCursorSave(); }; |