[Libreoffice-commits] core.git: canvas/source

[Noel Grandin]

 canvas/source/directx/dx_textlayout_drawhelper.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e1ba582605e30a0d99c4e461205f49805ad37f80
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Sep 18 09:34:13 2014 +0200

    fix windows build
    
    after my commit 60e78fbb806bb "fdo#82577: Handle Font"
    
    Author: Noel Grandin <noel at peralex.com>
    Date:   Tue Sep 16 10:09:58 2014 +0200
    
        fdo#82577: Handle Font
    be ignored, and an empty message aborts the commit.
    
    Change-Id: Id87e9ac86b457962fa156fdb1607dfe779b8564d

diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 23f5ab6..19345b6 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -246,7 +246,7 @@ namespace dxcanvas
 
         // create the font
         const ::com::sun::star::rendering::FontRequest& rFontRequest = rCanvasFont->getFontRequest();
-        Font aFont(
+        vcl::Font aFont(
             rFontRequest.FontDescription.FamilyName,
             rFontRequest.FontDescription.StyleName,
             Size( 0, ::basegfx::fround(rFontRequest.CellSize)));