svx/source/dialog/_bmpmask.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ed12084d81a2c0ce6cc39577fb2a81597d6d6c55
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Thu Sep 10 18:11:21 2020 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Thu Sep 10 19:51:38 2020 +0200
pTols is an array of sal_uInt8
First it was sal_uIntPtr then it was first converted with:
commit e75abe6e0a4ea250366bb29c0ece697e9b1b80a1
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Dec 12 09:33:14 2017 +0200
convert tolerance params to sal_uInt8
since their range is 0-255
Also drop pTols from ImplColReplaceParam, since it is always nullptr.
then reverted with:
commit 7accac097688832d8682a88a0176c3e1482ffade
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Fri Jan 5 11:12:54 2018 +0200
tdf#114837 FILEOPEN: Image is blank
revert
commit e75abe6e0a4ea250366bb29c0ece697e9b1b80a1
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Tue Dec 12 09:33:14 2017 +0200
convert tolerance params to sal_uInt8
for now.
but redone with:
commit d03c46eba1bd1d3399ee3d4e6af1c9e16c2c1718
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 23 13:13:03 2020 +0000
weld SvxBmpMask
Change-Id: Ied627a0c6b1c85bac8fd0cafc21ae1acceaf2bcc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87281
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Change-Id: I3f38cdc2bd4ea35edea3d95489206a7e68971f42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102396
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Jenkins
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index ca3b0d21ef6c..79bdce07e800 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -589,7 +589,7 @@ sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols,
Color* pDstCols, sal_uI
{
pSrcCols[nCount] = m_xQSet4->GetItemColor( 1 );
pDstCols[nCount] = m_xLbColor4->GetSelectEntryColor();
- pTols[nCount++] =
static_cast<sal_uIntPtr>(m_xSp4->get_value(FieldUnit::PERCENT));
+ pTols[nCount++] =
static_cast<sal_uInt8>(m_xSp4->get_value(FieldUnit::PERCENT));
}
return nCount;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
