[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

[Miklos Vajna]

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

New commits:
commit 54b26b23cef7ae11006244d0d1479c81b99b4619
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Sep 23 17:06:58 2014 +0200

    error C2782: template parameter '_Ty' is ambiguous
    
    Change-Id: Ieb8f91a629b9e14480c0372e747fea326c549833
    (cherry picked from commit 02e0bac73be8d11abf539130f3d3541fa72af93a)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 8a4c40e..0e3aeea 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -175,7 +175,7 @@ sal_Int32 SwBreakIt::getGraphemeCount(const OUString& rText,
 {
     sal_Int32 nGraphemeCount = 0;
 
-    sal_Int32 nCurPos = std::max(0, nStart);
+    sal_Int32 nCurPos = std::max(static_cast<sal_Int32>(0), nStart);
     while (nCurPos < nEnd)
     {
         // fdo#49208 cheat and assume that nothing can combine with a space