Skip to content

C
core
Kaydet (Commit) 49e07aa0 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

docufld.cxx: Apple gcc can't find min(sal_Int32, int)

üst 274b4272
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
sw/source/core/fields/docufld.cxx
Dosyayı görüntüle @ 49e07aa0
...@@ -2566,7 +2566,8 @@ const rtl::OUString& SwCombinedCharField::GetPar1() const ...@@ -2566,7 +2566,8 @@ 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(), MAX_COMBINED_CHARACTERS)); sCharacters = rStr.copy(0, std::min(rStr.getLength(),
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