diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-08 16:01:09 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-08 16:04:01 +0000 |
| commit | 2a48994be5501d2204793700f4a169ae455c6658 (patch) | |
| tree | 47f6af621d9ffb502024ebea3940beeed00d14df /sw | |
| parent | Resolves: fdo#46923 uninitialized iterators are invalid (diff) | |
| download | core-2a48994be5501d2204793700f4a169ae455c6658.tar.gz core-2a48994be5501d2204793700f4a169ae455c6658.zip | |
different types in std::min on 32bit
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/fields/docufld.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 79233a1a3b0c..b146f55a2c66 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -2566,8 +2566,7 @@ const rtl::OUString& SwCombinedCharField::GetPar1() const void SwCombinedCharField::SetPar1(const rtl::OUString& rStr) { - sCharacters = rStr.copy(0, std::min(rStr.getLength(), - static_cast<sal_Int32>(MAX_COMBINED_CHARACTERS))); + sCharacters = rStr.copy(0, std::min<sal_Int32>(rStr.getLength(), MAX_COMBINED_CHARACTERS)); } bool SwCombinedCharField::QueryValue( uno::Any& rAny, |