desktop/source/lib/init.cxx | 10 ++++------
sc/qa/unit/tiledrendering/tiledrendering.cxx | 6 +++---
sw/qa/extras/tiledrendering/tiledrendering.cxx | 4 ++--
3 files changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 7d2497be7d4068a0cf40911e522fe0848d399c6d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Oct 3 17:00:40 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 4 13:10:37 2019 +0200
use normal VirtualDevice ctor, not the obscure SystemGraphicsData variant
Change-Id: I4be43f692a29b1b1ee3f96bb34133f3ef0cf4eb7
Reviewed-on: https://gerrit.libreoffice.org/80151
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fe11dbaeccee..b9aca6845c22 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2690,7 +2690,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
#if defined(IOS)
paintTileIOS(pThis, pBuffer, nCanvasWidth, nCanvasHeight, fDPIScaleX,
nTilePosX, nTilePosY, nTileWidth, nTileHeight);
#else
- ScopedVclPtrInstance< VirtualDevice > pDevice(nullptr, Size(1, 1),
DeviceFormat::DEFAULT) ;
+ ScopedVclPtrInstance< VirtualDevice > pDevice(DeviceFormat::DEFAULT);
#if defined(ANDROID)
if (!android_lok_from_jni)
@@ -4008,7 +4008,7 @@ static char* getFontSubset (const OString& aFontName)
if ( nItFont < nFontCount )
{
FontCharMapRef xFontCharMap (new FontCharMap());
- auto aDevice(VclPtr<VirtualDevice>::Create(nullptr, Size(1, 1),
DeviceFormat::DEFAULT));
+ auto aDevice(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));
const vcl::Font& aFont(pList->GetFontName(nItFont));
aDevice->SetFont(aFont);
@@ -4620,9 +4620,7 @@ unsigned char* doc_renderFont(SAL_UNUSED_PARAMETER
LibreOfficeKitDocument* /*pTh
if (aText.isEmpty())
aText = rFontMetric.GetFamilyName();
- auto aDevice(
- VclPtr<VirtualDevice>::Create(
- nullptr, Size(1, 1), DeviceFormat::DEFAULT));
+ auto aDevice(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));
::tools::Rectangle aRect;
vcl::Font aFont(rFontMetric);
aFont.SetFontSize(Size(0, nDefaultFontSize));
@@ -4751,7 +4749,7 @@ static void doc_paintWindowDPI(LibreOfficeKitDocument*
/*pThis*/, unsigned nLOKW
#else
- ScopedVclPtrInstance<VirtualDevice> pDevice(nullptr, Size(1, 1),
DeviceFormat::DEFAULT);
+ ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nWidth, nHeight),
Fraction(1.0), Point(), pBuffer);
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 2dd5dcfbb2cd..9af67980b512 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -1267,7 +1267,7 @@ void
ScTiledRenderingTest::testInsertGraphicInvalidations()
int nCanvasWidth = 256;
int nCanvasHeight = 256;
std::vector<unsigned char> aBuffer(nCanvasWidth * nCanvasHeight * 4);
- ScopedVclPtrInstance<VirtualDevice> pDevice(nullptr, Size(1, 1),
DeviceFormat::DEFAULT);
+ ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth,
nCanvasHeight), Fraction(1.0), Point(), aBuffer.data());
pModelObj->paintTile(*pDevice, nCanvasWidth, nCanvasHeight,
/*nTilePosX=*/0, /*nTilePosY=*/0, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
Scheduler::ProcessEventsToIdle();
@@ -1305,7 +1305,7 @@ void ScTiledRenderingTest::testDocumentSizeWithTwoViews()
int nCanvasWidth = 256;
int nCanvasHeight = 256;
std::vector<unsigned char> aBuffer1(nCanvasWidth * nCanvasHeight * 4);
- ScopedVclPtrInstance<VirtualDevice> pDevice1(nullptr, Size(1, 1),
DeviceFormat::DEFAULT);
+ ScopedVclPtrInstance<VirtualDevice> pDevice1(DeviceFormat::DEFAULT);
pDevice1->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth,
nCanvasHeight), Fraction(1.0), Point(), aBuffer1.data());
pModelObj->paintTile(*pDevice1, nCanvasWidth, nCanvasHeight,
/*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840,
/*nTileHeight=*/3840);
Scheduler::ProcessEventsToIdle();
@@ -1315,7 +1315,7 @@ void ScTiledRenderingTest::testDocumentSizeWithTwoViews()
SfxLokHelper::createView();
std::vector<unsigned char> aBuffer2(nCanvasWidth * nCanvasHeight * 4);
- ScopedVclPtrInstance<VirtualDevice> pDevice2(nullptr, Size(1, 1),
DeviceFormat::DEFAULT);
+ ScopedVclPtrInstance<VirtualDevice> pDevice2(DeviceFormat::DEFAULT);
pDevice2->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth,
nCanvasHeight), Fraction(1.0), Point(), aBuffer2.data());
pModelObj->paintTile(*pDevice2, nCanvasWidth, nCanvasHeight,
/*nTilePosX=*/0, /*nTilePosY=*/291840, /*nTileWidth=*/3840,
/*nTileHeight=*/3840);
Scheduler::ProcessEventsToIdle();
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 35eca8185934..e6b624a5cb1e 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1723,7 +1723,7 @@ void SwTiledRenderingTest::testPaintCallbacks()
int nCanvasWidth = 256;
int nCanvasHeight = 256;
std::vector<unsigned char> aBuffer(nCanvasWidth * nCanvasHeight * 4);
- ScopedVclPtrInstance<VirtualDevice> pDevice(nullptr, Size(1, 1),
DeviceFormat::DEFAULT);
+ ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth,
nCanvasHeight), Fraction(1.0), Point(), aBuffer.data());
// Make sure that painting a tile in the second view doesn't invoke
// callbacks on the first view.
@@ -2402,7 +2402,7 @@ void SwTiledRenderingTest::testSemiTransparent()
size_t nCanvasHeight = 512;
size_t nTileSize = 256;
std::vector<unsigned char> aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
- ScopedVclPtrInstance<VirtualDevice> pDevice(nullptr, Size(1, 1),
DeviceFormat::DEFAULT);
+ ScopedVclPtrInstance<VirtualDevice> pDevice(DeviceFormat::DEFAULT);
pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth,
nCanvasHeight),
Fraction(1.0), Point(),
aPixmap.data());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
