[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - canvas/source

Caolán McNamara caolanm at redhat.com
Thu Dec 11 13:09:20 PST 2014


 canvas/source/directx/dx_textlayout_drawhelper.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 779c32be3e1f3ce2a2821c31c2992897078aef6b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 11 21:07:53 2014 +0000

    only checked for new VirtualDevice
    
    Change-Id: I64d7a3c6c0894e231cb0644922675dcce0db89fa
    (cherry picked from commit f5607f7a440cc54a0a48582ae05c817c8c306b71)

diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index ec20731..15883c6 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -86,7 +86,7 @@ namespace dxcanvas
         SystemGraphicsData aSystemGraphicsData;
         aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
         aSystemGraphicsData.hDC = reinterpret_cast< ::HDC >(hdc);
-        VirtualDevice aVirtualDevice(&aSystemGraphicsData, 0);
+        VirtualDevice aVirtualDevice(&aSystemGraphicsData, Size(1, 1), 0);
 
         // disable font antialiasing - GDI does not handle alpha
         // surfaces properly.
@@ -242,7 +242,7 @@ namespace dxcanvas
         SystemGraphicsData aSystemGraphicsData;
         aSystemGraphicsData.nSize = sizeof(SystemGraphicsData);
         aSystemGraphicsData.hDC = reinterpret_cast< ::HDC >(GetDC( NULL ));
-        VirtualDevice aVirtualDevice(&aSystemGraphicsData, 0);
+        VirtualDevice aVirtualDevice(&aSystemGraphicsData, Size(1, 1), 0);
 
         // create the font
         const ::com::sun::star::rendering::FontRequest& rFontRequest = rCanvasFont->getFontRequest();


More information about the Libreoffice-commits mailing list