summaryrefslogtreecommitdiffstats
path: root/cui
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-02-16 14:26:14 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-02-19 07:12:56 +0100
commitccd316d1cb310734848bd20244f509024b549b8c (patch)
tree3f942f2c44c42f4422e8889e94100684e25cf5c4 /cui
parentloplugin:useuniqueptr in swf::Writer (diff)
downloadcore-ccd316d1cb310734848bd20244f509024b549b8c.tar.gz
core-ccd316d1cb310734848bd20244f509024b549b8c.zip
use VirtualDevice in createHistorical8x8FromArray
part of making BitmapWriteAccess an internal detail of vcl/ Change-Id: I8b3aa2fdd3c26db0e48b228640cd31b0bd31543c Reviewed-on: https://gerrit.libreoffice.org/49937 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 141bd052cc66..443f5d95f7f0 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -72,9 +72,9 @@ public:
// BitmapCtl: Returns the Bitmap
BitmapEx GetBitmapEx()
{
- const Bitmap aRetval(createHistorical8x8FromArray(pBmpArray, aPixelColor, aBackgroundColor));
-
- return (pBmpArray != nullptr) ? BitmapEx(aRetval) : BitmapEx();
+ if (!pBmpArray)
+ return BitmapEx();
+ return createHistorical8x8FromArray(pBmpArray, aPixelColor, aBackgroundColor);
}
void SetBmpArray( const sal_uInt16* pPixel ) { pBmpArray = pPixel; }