summaryrefslogtreecommitdiffstats
path: root/cui
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-02-16 16:13:38 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-02-19 10:13:00 +0100
commit6fbb6d80fe6203ff6f84ee85ca625b6e60bf5bae (patch)
tree1482de217efaafface8b1fa82ecd2320b82a1a68 /cui
parentsw: prefix members of SwPostItField, SwRefPageGetField and SwRefPageSetField (diff)
downloadcore-6fbb6d80fe6203ff6f84ee85ca625b6e60bf5bae.tar.gz
core-6fbb6d80fe6203ff6f84ee85ca625b6e60bf5bae.zip
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 'cui')
-rw-r--r--cui/source/tabpages/tppattern.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 443f5d95f7f0..8933c5fbe18c 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -60,7 +60,7 @@ class SvxBitmapCtl
{
private:
Color aPixelColor, aBackgroundColor;
- const sal_uInt16* pBmpArray;
+ std::array<sal_uInt8,64> const * pBmpArray;
public:
// Constructor: BitmapCtl for SvxPixelCtl
@@ -74,10 +74,10 @@ public:
{
if (!pBmpArray)
return BitmapEx();
- return createHistorical8x8FromArray(pBmpArray, aPixelColor, aBackgroundColor);
+ return createHistorical8x8FromArray(*pBmpArray, aPixelColor, aBackgroundColor);
}
- void SetBmpArray( const sal_uInt16* pPixel ) { pBmpArray = pPixel; }
+ void SetBmpArray( std::array<sal_uInt8,64> const & pPixel ) { pBmpArray = &pPixel; }
void SetPixelColor( Color aColor ) { aPixelColor = aColor; }
void SetBackgroundColor( Color aColor ) { aBackgroundColor = aColor; }
};