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

[Stephan Bergmann]

 sd/source/core/drawdoc3.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 871e686802b901e1a7220c1739b5857f4fdbf6e3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Feb 27 20:47:58 2017 +0100

    Better fix not causing unrelated loplugin:loopvartoosmall
    
    ...for e7aab255c1595c8cc54e0eab3d8d1059fb3d00f1 "warning C4018: '<' :
    signed/unsigned mismatch"
    
    Change-Id: I9a91244f2136e2cd31c480511e3b08c721b478e4

diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 0836603..aade5d7 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -408,7 +408,7 @@ bool SdDrawDocument::InsertBookmarkAsPage(
     }
 
     const sal_uInt16 nSdPageCount = GetSdPageCount(PageKind::Standard);
-    const sal_uInt32 nBMSdPageCount = pBookmarkDoc->GetSdPageCount(PageKind::Standard);
+    const sal_uInt16 nBMSdPageCount = pBookmarkDoc->GetSdPageCount(PageKind::Standard);
     const sal_uInt16 nMPageCount = GetMasterPageCount();
 
     if (nSdPageCount==0 || nBMSdPageCount==0 || nMPageCount==0)
@@ -932,7 +932,7 @@ bool SdDrawDocument::InsertBookmarkAsPage(
     {
         try
         {
-            for(sal_uInt32 p = nInsertPos; p < (nInsertPos + nBMSdPageCount); p++)
+            for(sal_uInt32 p = nInsertPos; p < sal_uInt32(nInsertPos) + sal_uInt32(nBMSdPageCount); p++)
             {
                 SdPage *pPg = static_cast<SdPage *>( GetPage(p) );
                 for(size_t i = 0; pPg && (i < pPg->GetObjCount()); ++i)