summaryrefslogtreecommitdiff
path: root/sw/source/core/txtnode
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/txtnode')
-rw-r--r--sw/source/core/txtnode/fntcache.cxx6
-rw-r--r--sw/source/core/txtnode/fntcap.cxx2
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx4
-rw-r--r--sw/source/core/txtnode/swfont.cxx4
-rw-r--r--sw/source/core/txtnode/txtedt.cxx18
5 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 612d7d011709..83981599c0df 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -551,7 +551,7 @@ void SwFntObj::GuessLeading( const ViewShell&
// Those who lie about their Leading, may lie about their
// Ascent/Descent as well, hence the Font will be lowered a
// litte without changing its height.
- long nDiff = Min( rMet.GetDescent() - aWinMet.GetDescent(),
+ long nDiff = std::min( rMet.GetDescent() - aWinMet.GetDescent(),
aWinMet.GetAscent() - rMet.GetAscent() - nTmpLeading );
if( nDiff > 0 )
{
@@ -1539,7 +1539,7 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
nCnt = 0;
else
nCnt = nCnt - rInf.GetIdx();
- nCnt = Min( nCnt, rInf.GetLen() );
+ nCnt = std::min( nCnt, rInf.GetLen() );
long nKernSum = rInf.GetKern();
sal_Unicode cChPrev = rInf.GetText()[ rInf.GetIdx() ];
@@ -1902,7 +1902,7 @@ Size SwFntObj::GetTextSize( SwDrawTextInfo& rInf )
nCnt=0;
else
nCnt = nCnt - rInf.GetIdx();
- nCnt = Min (nCnt, nLn);
+ nCnt = std::min (nCnt, nLn);
sal_Unicode nChPrev = rInf.GetText()[ rInf.GetIdx() ];
sal_Unicode nCh;
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 58512953a093..e2b48e44b716 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -559,7 +559,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo )
Size aPartSize;
long nKana = 0;
const XubString aTxt( CalcCaseMap( rDo.GetInf().GetText() ) );
- xub_StrLen nMaxPos = Min( sal_uInt16(rDo.GetInf().GetText().getLength() - rDo.GetInf().GetIdx()),
+ xub_StrLen nMaxPos = std::min( sal_uInt16(rDo.GetInf().GetText().getLength() - rDo.GetInf().GetIdx()),
rDo.GetInf().GetLen() );
rDo.GetInf().SetLen( nMaxPos );
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 248255a863ef..a02f8b3b04d1 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2307,8 +2307,8 @@ void SwTxtNode::GCAttr()
&& ( bAll || pHt->Which() == RES_TXTATR_INETFMT ) )
{
bChanged = true;
- nMin = Min( nMin, *pHt->GetStart() );
- nMax = Max( nMax, *pHt->GetEnd() );
+ nMin = std::min( nMin, *pHt->GetStart() );
+ nMax = std::max( nMax, *pHt->GetEnd() );
DestroyAttr( m_pSwpHints->Cut(i) );
--i;
}
diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx
index 52db6ad3732c..02b5addfe2b5 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -189,7 +189,7 @@ sal_uInt16 SwSubFont::CalcEscAscent( const sal_uInt16 nOldAscent ) const
const long nAscent = nOldAscent +
( (long) nOrgHeight * GetEscapement() ) / 100L;
if ( nAscent>0 )
- return ( Max( sal_uInt16 (nAscent), nOrgAscent ));
+ return ( std::max( sal_uInt16 (nAscent), nOrgAscent ));
}
return nOrgAscent;
}
@@ -672,7 +672,7 @@ sal_uInt16 SwSubFont::CalcEscHeight( const sal_uInt16 nOldHeight,
{
long nDescent = nOldHeight - nOldAscent -
( (long) nOrgHeight * GetEscapement() ) / 100L;
- const sal_uInt16 nDesc = ( nDescent>0 ) ? Max ( sal_uInt16(nDescent),
+ const sal_uInt16 nDesc = ( nDescent>0 ) ? std::max ( sal_uInt16(nDescent),
sal_uInt16(nOrgHeight - nOrgAscent) ) : nOrgHeight - nOrgAscent;
return ( nDesc + CalcEscAscent( nOldAscent ) );
}
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index a493996f9dce..3ae2f43408be 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -799,7 +799,7 @@ sal_Bool SwScanner::NextWord()
// #i89042, as discussed with HDU: don't evaluate script changes for word count. Use whole word.
if ( nWordType == i18n::WordType::WORD_COUNT )
{
- nBegin = Max(aBound.startPos, nBegin);
+ nBegin = std::max(aBound.startPos, nBegin);
nLen = 0;
if (aBound.endPos > nBegin)
nLen = aBound.endPos - nBegin;
@@ -816,7 +816,7 @@ sal_Bool SwScanner::NextWord()
OUString aTmpWord = aText.copy( nBegin, aBound.endPos - nBegin );
const sal_Int32 nScriptEnd = nBegin +
g_pBreakIt->GetBreakIter()->endOfScript( aTmpWord, 0, nCurrScript );
- const sal_Int32 nEnd = Min( aBound.endPos, nScriptEnd );
+ const sal_Int32 nEnd = std::min( aBound.endPos, nScriptEnd );
// restrict word start to last script change position
sal_Int32 nScriptBegin = 0;
@@ -830,7 +830,7 @@ sal_Bool SwScanner::NextWord()
nCurrScript );
}
- nBegin = Max( aBound.startPos, nScriptBegin );
+ nBegin = std::max( aBound.startPos, nScriptBegin );
nLen = nEnd - nBegin;
}
else
@@ -840,7 +840,7 @@ sal_Bool SwScanner::NextWord()
aBound.endPos - aBound.startPos );
const sal_Int32 nScriptEnd = aBound.startPos +
g_pBreakIt->GetBreakIter()->endOfScript( aTmpWord, 0, nCurrScript );
- const sal_Int32 nEnd = Min( aBound.endPos, nScriptEnd );
+ const sal_Int32 nEnd = std::min( aBound.endPos, nScriptEnd );
nBegin = aBound.startPos;
nLen = nEnd - nBegin;
}
@@ -849,8 +849,8 @@ sal_Bool SwScanner::NextWord()
// optionally clip the result of getWordBoundaries:
if ( bClip )
{
- aBound.startPos = Max( aBound.startPos, nStartPos );
- aBound.endPos = Min( aBound.endPos, nEndPos );
+ aBound.startPos = std::max( aBound.startPos, nStartPos );
+ aBound.endPos = std::min( aBound.endPos, nEndPos );
nBegin = aBound.startPos;
nLen = aBound.endPos - nBegin;
}
@@ -1388,14 +1388,14 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/
if ( pSmartTagList->GetBeginInv() != STRING_LEN )
{
nBegin = pSmartTagList->GetBeginInv();
- nEnd = Min( pSmartTagList->GetEndInv(), (xub_StrLen)rText.getLength() );
+ nEnd = std::min( pSmartTagList->GetEndInv(), (xub_StrLen)rText.getLength() );
if ( nBegin < nEnd )
{
const LanguageType aCurrLang = pNode->GetLang( nBegin );
const com::sun::star::lang::Locale aCurrLocale = g_pBreakIt->GetLocale( aCurrLang );
nBegin = static_cast< xub_StrLen >(g_pBreakIt->GetBreakIter()->beginOfSentence( rText, nBegin, aCurrLocale ));
- nEnd = static_cast< xub_StrLen >(Min( rText.getLength(), g_pBreakIt->GetBreakIter()->endOfSentence( rText, nEnd, aCurrLocale ) ));
+ nEnd = static_cast< xub_StrLen >(std::min( rText.getLength(), g_pBreakIt->GetBreakIter()->endOfSentence( rText, nEnd, aCurrLocale ) ));
}
}
}
@@ -1436,7 +1436,7 @@ SwRect SwTxtFrm::SmartTagScan( SwCntntNode* /*pActNode*/, xub_StrLen /*nActPos*/
{
const LanguageType nLang = aIter.GetLanguage();
const com::sun::star::lang::Locale aLocale = g_pBreakIt->GetLocale( nLang );
- nLangEnd = Min( nEnd, aIter.GetChgPos() );
+ nLangEnd = std::min( nEnd, aIter.GetChgPos() );
const sal_uInt32 nExpandBegin = aConversionMap.ConvertToViewPosition( nLangBegin );
const sal_uInt32 nExpandEnd = aConversionMap.ConvertToViewPosition( nLangEnd );
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 14:17:16 +0000