From cd8a295444690b9c0dfb43ee4de01bf6ffeb1aa1 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 30 Nov 2015 20:16:53 +0100 Subject: loplugin:vclwidgets Change-Id: I520e27de82f11cc3c44c0e059ad60f3edaa4c370 --- desktop/source/lib/init.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'desktop/source') diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 49a1ef1b0462..c6da34c647dc 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1566,12 +1566,14 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* /*pThis*/, if (!aSearchedFontName.equals(aFontName.toUtf8().getStr())) continue; - VirtualDevice aDevice(nullptr, Size(1, 1), DeviceFormat::DEFAULT); + auto aDevice( + VclPtr::Create( + nullptr, Size(1, 1), DeviceFormat::DEFAULT)); ::Rectangle aRect; vcl::Font aFont(rInfo); aFont.SetSize(Size(0, 25)); - aDevice.SetFont(aFont); - aDevice.GetTextBoundRect(aRect, aFontName); + aDevice->SetFont(aFont); + aDevice->GetTextBoundRect(aRect, aFontName); int nFontWidth = aRect.BottomRight().X() + 1; *pFontWidth = nFontWidth; int nFontHeight = aRect.BottomRight().Y() + 1; @@ -1581,11 +1583,11 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* /*pThis*/, memset(pBuffer, 0, nFontWidth * nFontHeight * 4); boost::shared_array aBuffer(pBuffer, NoDelete< sal_uInt8 >()); - aDevice.SetBackground(Wallpaper(COL_TRANSPARENT)); - aDevice.SetOutputSizePixelScaleOffsetAndBuffer( + aDevice->SetBackground(Wallpaper(COL_TRANSPARENT)); + aDevice->SetOutputSizePixelScaleOffsetAndBuffer( Size(nFontWidth, nFontHeight), Fraction(1.0), Point(), aBuffer, nullptr); - aDevice.DrawText(Point(0,0), aFontName); + aDevice->DrawText(Point(0,0), aFontName); return pBuffer; } -- cgit