diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-16 16:13:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-02-19 10:13:00 +0100 |
| commit | 6fbb6d80fe6203ff6f84ee85ca625b6e60bf5bae (patch) | |
| tree | 1482de217efaafface8b1fa82ecd2320b82a1a68 /svx/source/xoutdev | |
| parent | 2ab300bfa18cdcc91a9311c4c9710254b0ad7753 (diff) | |
use std::array in createHistorical8x8FromArray
to make the assumption about the size of the array obvious in the code.
Change-Id: I7ebe0b037e3be38f7e33c0160742f829288bb474
Reviewed-on: https://gerrit.libreoffice.org/49938
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source/xoutdev')
| -rw-r--r-- | svx/source/xoutdev/xattrbmp.cxx | 2 | ||||
| -rw-r--r-- | svx/source/xoutdev/xtabptrn.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 336f84d9c2a8..8e28d1ab2646 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -144,7 +144,7 @@ XFillBitmapItem::XFillBitmapItem(const XFillBitmapItem& rItem) { } -BitmapEx createHistorical8x8FromArray(sal_uInt16 const *pArray, Color aColorPix, Color aColorBack) +BitmapEx createHistorical8x8FromArray(std::array<sal_uInt8,64> const & pArray, Color aColorPix, Color aColorBack) { vcl::bitmap::RawBitmap aBitmap(Size(8, 8)); diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx index 40e38cb3e331..a42be9e1e6b5 100644 --- a/svx/source/xoutdev/xtabptrn.cxx +++ b/svx/source/xoutdev/xtabptrn.cxx @@ -48,11 +48,11 @@ uno::Reference< container::XNameContainer > XPatternList::createInstance() bool XPatternList::Create() { OUStringBuffer aStr(SvxResId(RID_SVXSTR_PATTERN)); - sal_uInt16 aArray[64]; + std::array<sal_uInt8,64> aArray; BitmapEx aBitmap; const sal_Int32 nLen(aStr.getLength() - 1); - memset(aArray, 0, sizeof(aArray)); + aArray.fill(0); // white/white bitmap aStr.append(" 1"); |