mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid storing potentially negative and unused value in sal_uInt16 var

Browse Source 
At least during CppunitTest_sd_misc_tests, when bReplace is true the value
initially calculated for nSdPageEnd (and later overwritten) was -1, so caused a
warning with Clang's implicit-signed-integer-truncation.

Change-Id: I69be2649e431590fc79808908470c9c2e3cf3c74
Reviewed-on: https://gerrit.libreoffice.org/68663
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2019-03-04 08:46:52 +01:00
parent f4a55b6bca
commit de1e3a4d78
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sd/source/core/drawdoc3.cxx
View File

@@ -789,17 +789,13 @@ bool SdDrawDocument::InsertBookmarkAsPage(
if (nInsertPos > 0)
{
sal_uInt16 nSdPageStart = (nInsertPos - 1) / 2;
sal_uInt16 nSdPageEnd = GetSdPageCount(PageKind::Standard) - nSdPageCount +
nSdPageStart - 1;
sal_uInt16 nSdPageEnd = bReplace
? nSdPageStart + nReplacedStandardPages - 1
: GetSdPageCount(PageKind::Standard) - nSdPageCount + nSdPageStart - 1;
const bool bRemoveEmptyPresObj =
(pBookmarkDoc->GetDocumentType() == DocumentType::Impress) &&
(GetDocumentType() == DocumentType::Draw);
if( bReplace )
{
nSdPageEnd = nSdPageStart + nReplacedStandardPages - 1;
}
std::vector<OUString>::iterator pExchangeIter;
if (pExchangeList)