[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/core/doc/doccomp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 56368292012a0521d663361d53c70267fdb7b0d1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 14 09:20:49 2013 +0000

    conflicting types for parameter
    
    Change-Id: I97275e191a0f6d5dd00bf6cbbd906a662190f5ee

diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 14ec7ce..aaefd2a 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;