sw/source/core/doc/CntntIdxStore.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b2b9eafa41280a3f8da49a94bf1c31239c7df700
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jul 25 18:59:29 2018 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jul 25 22:45:13 2018 +0200
-Wc++11-narrowing (clang-cl)
...from vector difference_type (aka 'long long') to 'long'
Change-Id: I2a1569760ef219655936fa5c10f0e6fb85b5a504
Reviewed-on: https://gerrit.libreoffice.org/58004
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sw/source/core/doc/CntntIdxStore.cxx
b/sw/source/core/doc/CntntIdxStore.cxx
index ffdf2ff15764..548800a3fc59 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -234,7 +234,7 @@ void ContentIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong
nNode, sal_Int32 nCon
{
if(pBkmk->GetMarkPos().nContent.GetIndex() < nContent)
{
- const MarkEntry aEntry = { ppBkmk -
pMarkAccess->getAllMarksBegin(), false, pBkmk->GetMarkPos().nContent.GetIndex()
};
+ const MarkEntry aEntry = { static_cast<long>(ppBkmk -
pMarkAccess->getAllMarksBegin()), false,
pBkmk->GetMarkPos().nContent.GetIndex() };
m_aBkmkEntries.push_back(aEntry);
}
else // if a bookmark position is equal nContent, the other
position
@@ -246,10 +246,10 @@ void ContentIdxStoreImpl::SaveBkmks(SwDoc* pDoc,
sal_uLong nNode, sal_Int32 nCon
{
if(bMarkPosEqual)
{ // the other position is before, the (main) position is equal
- const MarkEntry aEntry = { ppBkmk -
pMarkAccess->getAllMarksBegin(), false, pBkmk->GetMarkPos().nContent.GetIndex()
};
+ const MarkEntry aEntry = { static_cast<long>(ppBkmk -
pMarkAccess->getAllMarksBegin()), false,
pBkmk->GetMarkPos().nContent.GetIndex() };
m_aBkmkEntries.push_back(aEntry);
}
- const MarkEntry aEntry = { ppBkmk -
pMarkAccess->getAllMarksBegin(), true,
pBkmk->GetOtherMarkPos().nContent.GetIndex() };
+ const MarkEntry aEntry = { static_cast<long>(ppBkmk -
pMarkAccess->getAllMarksBegin()), true,
pBkmk->GetOtherMarkPos().nContent.GetIndex() };
m_aBkmkEntries.push_back(aEntry);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
