diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-19 17:26:29 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-19 17:26:29 +0100 |
commit | 76ff4c5366fd89f2736dfc7b58d5a38e43ad7062 (patch) | |
tree | 691bccc887cb3d36db4641fa6fe0ea11638b70b1 | |
parent | 87e407f68876b196704e595ff841b2a01bf1bbb9 (diff) |
Disambiguate std::max call
Change-Id: Ie389d52f5914f49dcd61d5543ed9413ab82101f9
-rw-r--r-- | sw/source/core/txtnode/atrfld.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/txtnode/atrfld.cxx b/sw/source/core/txtnode/atrfld.cxx index 4307fc2c95d6..581006712c1d 100644 --- a/sw/source/core/txtnode/atrfld.cxx +++ b/sw/source/core/txtnode/atrfld.cxx @@ -482,7 +482,7 @@ void SwTxtInputFld::UpdateFieldContent() // skip CH_TXT_ATR_INPUTFIELDSTART character const xub_StrLen nIdx = (*GetStart()) + 1; // skip CH_TXT_ATR_INPUTFIELDEND character - const xub_StrLen nLen = static_cast<xub_StrLen>(std::max( 0, ( (*End()) - 1 - nIdx ) )); + const xub_StrLen nLen = static_cast<xub_StrLen>(std::max<sal_Int32>( 0, ( (*End()) - 1 - nIdx ) )); const OUString aNewFieldContent = GetTxtNode().GetExpandTxt( nIdx, nLen ); const SwInputField* pInputFld = dynamic_cast<const SwInputField*>(GetFmtFld().GetField()); |