From b25f5413004ee68382a8d2dda8bfcb6e194442ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Fri, 26 Nov 2004 20:01:11 +0000
Subject: [PATCH] INTEGRATION: CWS presentationengine01 (1.2.2); FILE MERGED
 2004/07/20 19:09:06 thb 1.2.2.3: #110496# Unified include statements; removed
 external prefix from boost includes 2004/04/12 15:13:21 thb 1.2.2.2: #110496#
 Adaptions after canvas01 merge 2004/04/05 15:58:53 thb 1.2.2.1: Resync with
 canvas01 changes

---
 cppcanvas/source/wrapper/implfont.cxx | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/cppcanvas/source/wrapper/implfont.cxx b/cppcanvas/source/wrapper/implfont.cxx
index 23ace7fd3206..77e42444f15c 100644
--- a/cppcanvas/source/wrapper/implfont.cxx
+++ b/cppcanvas/source/wrapper/implfont.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implfont.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: thb $ $Date: 2004-03-18 10:41:11 $
+ *  last change: $Author: rt $ $Date: 2004-11-26 21:01:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,7 +59,8 @@
  *
  ************************************************************************/
 
-#include "implfont.hxx"
+#include <implfont.hxx>
+#include <canvas/canvastools.hxx>
 
 
 using namespace ::drafts::com::sun::star;
@@ -81,10 +82,15 @@ namespace cppcanvas
             OSL_ENSURE( mxCanvas.is(), "ImplFont::ImplFont(): Invalid Canvas" );
 
             rendering::FontRequest aFontRequest;
-            aFontRequest.FamilyName = rFontName;
+            aFontRequest.FontDescription.FamilyName = rFontName;
             aFontRequest.CellSize = rCellSize;
 
-            mxFont = mxCanvas->queryFont( aFontRequest );
+            geometry::Matrix2D aFontMatrix;
+            ::canvas::tools::setIdentityMatrix2D( aFontMatrix );
+
+            mxFont = mxCanvas->createFont( aFontRequest,
+                                           uno::Sequence< beans::PropertyValue >(),
+                                           aFontMatrix );
         }
 
 
@@ -96,7 +102,7 @@ namespace cppcanvas
         {
             OSL_ENSURE( mxFont.is(), "ImplFont::getName(): Invalid Font" );
 
-            return mxFont->getFontRequest().FamilyName;
+            return mxFont->getFontRequest().FontDescription.FamilyName;
         }
 
         double ImplFont::getCellSize() const