summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-02-27 20:47:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-02-27 20:47:58 +0100
commit871e686802b901e1a7220c1739b5857f4fdbf6e3 (patch)
tree3bc877f517d358feacae09ed16060fa6c69cd86f
parent8d6afde106f3b9ba4eab0fa00cb6ddd28494a258 (diff)
Better fix not causing unrelated loplugin:loopvartoosmall
...for e7aab255c1595c8cc54e0eab3d8d1059fb3d00f1 "warning C4018: '<' : signed/unsigned mismatch" Change-Id: I9a91244f2136e2cd31c480511e3b08c721b478e4
-rw-r--r--sd/source/core/drawdoc3.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 08366034de74..aade5d7cbdae 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)