[Libreoffice-commits] .: sw/source

[Michael Stahl]

 sw/source/core/fields/docufld.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 49e07aa0de601dfa43820f3ff1d54d0c80054016
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Mar 8 16:50:32 2012 +0100

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

diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 1f2e16e..79233a1 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,