diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-03-08 16:50:32 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-03-08 16:51:53 +0100 |
| commit | 49e07aa0de601dfa43820f3ff1d54d0c80054016 (patch) | |
| tree | 74bdba2604d05799679c2976e3aa240e159f8324 /sw | |
| parent | 274b4272fa5e819e484935e9c65676d8d3f7ff3a (diff) | |
docufld.cxx: Apple gcc can't find min(sal_Int32, int)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/fields/docufld.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 1f2e16e7e994..79233a1a3b0c 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -2566,7 +2566,8 @@ const rtl::OUString& SwCombinedCharField::GetPar1() const 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, |