mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:vclwidgets

Browse Source 
Change-Id: I520e27de82f11cc3c44c0e059ad60f3edaa4c370
This commit is contained in:
Stephan Bergmann
2015-11-30 20:16:53 +01:00
parent 5adaf30d74
commit cd8a295444
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
desktop/source/lib/init.cxx
View File

@@ -1566,12 +1566,14 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* /*pThis*/,
if (!aSearchedFontName.equals(aFontName.toUtf8().getStr())) if (!aSearchedFontName.equals(aFontName.toUtf8().getStr()))
continue; continue;
VirtualDevice aDevice(nullptr, Size(1, 1), DeviceFormat::DEFAULT); auto aDevice(
VclPtr<VirtualDevice>::Create(
nullptr, Size(1, 1), DeviceFormat::DEFAULT));
::Rectangle aRect; ::Rectangle aRect;
vcl::Font aFont(rInfo); vcl::Font aFont(rInfo);
aFont.SetSize(Size(0, 25)); aFont.SetSize(Size(0, 25));
aDevice.SetFont(aFont); aDevice->SetFont(aFont);
aDevice.GetTextBoundRect(aRect, aFontName); aDevice->GetTextBoundRect(aRect, aFontName);
int nFontWidth = aRect.BottomRight().X() + 1; int nFontWidth = aRect.BottomRight().X() + 1;
*pFontWidth = nFontWidth; *pFontWidth = nFontWidth;
int nFontHeight = aRect.BottomRight().Y() + 1; int nFontHeight = aRect.BottomRight().Y() + 1;
@@ -1581,11 +1583,11 @@ unsigned char* doc_renderFont(LibreOfficeKitDocument* /*pThis*/,
memset(pBuffer, 0, nFontWidth * nFontHeight * 4); memset(pBuffer, 0, nFontWidth * nFontHeight * 4);
boost::shared_array<sal_uInt8> aBuffer(pBuffer, NoDelete< sal_uInt8 >()); boost::shared_array<sal_uInt8> aBuffer(pBuffer, NoDelete< sal_uInt8 >());
aDevice.SetBackground(Wallpaper(COL_TRANSPARENT)); aDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
aDevice.SetOutputSizePixelScaleOffsetAndBuffer( aDevice->SetOutputSizePixelScaleOffsetAndBuffer(
Size(nFontWidth, nFontHeight), Fraction(1.0), Point(), Size(nFontWidth, nFontHeight), Fraction(1.0), Point(),
aBuffer, nullptr); aBuffer, nullptr);
aDevice.DrawText(Point(0,0), aFontName); aDevice->DrawText(Point(0,0), aFontName);
return pBuffer; return pBuffer;
} }