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

[Michael Stahl]

 sw/source/core/edit/acorrect.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 961ffaa787aa353c2fb48c8b1c34026a06929cfd
Author: Michael Stahl <mst...@redhat.com>
Date:   Mon Feb 18 23:17:44 2013 +0100

    acorrect.cxx: try to make even MSVC happy
    
    Change-Id: Ie17347cc0a90bf93399027f6e816f56cd89c1678

diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index 7acc7f5..afcf9ee 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -190,8 +190,8 @@ sal_Bool SwAutoCorrDoc::ReplaceRange( xub_StrLen nPos, 
xub_StrLen nSourceLength,
                 _PaMIntoCrsrShellRing aTmp( rEditSh, rCrsr, *pPam );
 
                 pPam->SetMark();
-                pPam->GetPoint()->nContent =
-                    std::min(pNd->GetTxt().getLength(), nPos + nSourceLength);
+                pPam->GetPoint()->nContent = std::min<sal_Int32>(
+                        pNd->GetTxt().getLength(), nPos + nSourceLength);
                 pDoc->ReplaceRange( *pPam, rTxt, false );
                 pPam->Exchange();
                 pPam->DeleteMark();
@@ -202,8 +202,8 @@ sal_Bool SwAutoCorrDoc::ReplaceRange( xub_StrLen nPos, 
xub_StrLen nSourceLength,
             if( nSourceLength != rTxt.Len() )
             {
                 pPam->SetMark();
-                pPam->GetPoint()->nContent =
-                    std::min(pNd->GetTxt().getLength(), nPos + nSourceLength);
+                pPam->GetPoint()->nContent = std::min<sal_Int32>(
+                        pNd->GetTxt().getLength(), nPos + nSourceLength);
                 pDoc->ReplaceRange( *pPam, rTxt, false );
                 pPam->Exchange();
                 pPam->DeleteMark();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits