diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-03 17:00:40 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-04 13:10:37 +0200 |
| commit | 7d2497be7d4068a0cf40911e522fe0848d399c6d (patch) | |
| tree | 4066357671d739de5090696ce94076e200880c34 /desktop | |
| parent | 8eb0d8daa526d1c53363954d4d8730cad55f1910 (diff) | |
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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/init.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
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); |