summaryrefslogtreecommitdiff
path: root/sw/source/core/text/porlay.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/text/porlay.cxx')
-rw-r--r--sw/source/core/text/porlay.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 3cd2b6bc054c..b820b8bbb3eb 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -577,14 +577,14 @@ void SwLineLayout::MaxAscentDescent( SwTwips& _orAscent,
if ( bFlyCmp )
{
- _orObjAscent = Max( _orObjAscent, nPortionAsc );
- _orObjDescent = Max( _orObjDescent, nPortionDesc );
+ _orObjAscent = std::max( _orObjAscent, nPortionAsc );
+ _orObjDescent = std::max( _orObjDescent, nPortionDesc );
}
if ( !pTmpPortion->IsFlyCntPortion() && !pTmpPortion->IsGrfNumPortion() )
{
- _orAscent = Max( _orAscent, nPortionAsc );
- _orDescent = Max( _orDescent, nPortionDesc );
+ _orAscent = std::max( _orAscent, nPortionAsc );
+ _orDescent = std::max( _orDescent, nPortionDesc );
}
}
pTmpPortion = pTmpPortion->GetPortion();
@@ -883,7 +883,7 @@ void SwScriptInfo::InitScriptInfo( const SwTxtNode& rNode, sal_Bool bRTL )
else
break;
}
- nChg = Min( nChg, nNextCTLScriptStart );
+ nChg = std::min( nChg, nNextCTLScriptStart );
}
// special case for dotted circle since it can be used with complex