Skip to content

C
core
Kaydet (Commit) 2a48994b authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

different types in std::min on 32bit

üst a3f1614c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
sw/source/core/fields/docufld.cxx
Dosyayı görüntüle @ 2a48994b
...@@ -2566,8 +2566,7 @@ const rtl::OUString& SwCombinedCharField::GetPar1() const ...@@ -2566,8 +2566,7 @@ const rtl::OUString& SwCombinedCharField::GetPar1() const
void SwCombinedCharField::SetPar1(const rtl::OUString& rStr) void SwCombinedCharField::SetPar1(const rtl::OUString& rStr)
{ {
sCharacters = rStr.copy(0, std::min(rStr.getLength(), sCharacters = rStr.copy(0, std::min<sal_Int32>(rStr.getLength(), MAX_COMBINED_CHARACTERS));
static_cast<sal_Int32>(MAX_COMBINED_CHARACTERS)));
} }
bool SwCombinedCharField::QueryValue( uno::Any& rAny, bool SwCombinedCharField::QueryValue( uno::Any& rAny,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment