diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-11-14 09:20:49 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-14 09:21:01 +0000 |
| commit | 56368292012a0521d663361d53c70267fdb7b0d1 (patch) | |
| tree | c2b2132231e893f8d321fadeac932bab5494b9e4 | |
| parent | 7377aaa1aec90f105b6c5d56a2c9453081b2b8ba (diff) | |
conflicting types for parameter
Change-Id: I97275e191a0f6d5dd00bf6cbbd906a662190f5ee
| -rw-r--r-- | sw/source/core/doc/doccomp.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 14ec7ce5cdd7..aaefd2a674f9 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -2119,7 +2119,7 @@ bool LineArrayComparator::Compare( int nIdx1, int nIdx2 ) const if( nBorderLen < 3 ) { - nBorderLen = std::min( 3, std::min( nPar1Len, nPar2Len ) ); + nBorderLen = std::min<sal_Int32>( 3, std::min( nPar1Len, nPar2Len ) ); } std::set<unsigned> aHashes; |