From e7119701583fda213d9f2dc01a86ed49f783d35c Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 26 Nov 2004 16:05:43 +0000 Subject: INTEGRATION: CWS presentationengine01 (1.2.2); FILE MERGED 2004/07/28 10:44:58 thb 1.2.2.2: #110496# Brought javacanvas to comply with recent API changes 2004/04/12 15:12:22 thb 1.2.2.1: #110496# Adaptions after canvas01 merge --- canvas/source/java/CanvasFont.java | 49 +++++++++----------------------------- 1 file changed, 11 insertions(+), 38 deletions(-) (limited to 'canvas/source/java') diff --git a/canvas/source/java/CanvasFont.java b/canvas/source/java/CanvasFont.java index e55247afc93f..dd65c7e132c3 100644 --- a/canvas/source/java/CanvasFont.java +++ b/canvas/source/java/CanvasFont.java @@ -90,7 +90,7 @@ public class CanvasFont fontRequest = _fontRequest; // TODO: Use proper attributes here, first of all, use fractional point font size - font = new java.awt.Font( fontRequest.FamilyName, java.awt.Font.PLAIN, (int)(fontRequest.CellSize + .5) ); + font = new java.awt.Font( fontRequest.FontDescription.FamilyName, java.awt.Font.PLAIN, (int)(fontRequest.CellSize + .5) ); } public java.awt.Font getFont() @@ -105,61 +105,34 @@ public class CanvasFont // =========================== // - public XPolyPolygon2D[] queryTextShapes( StringContext text, - ViewState viewState, - RenderState renderState, - byte direction ) throws com.sun.star.lang.IllegalArgumentException + public XTextLayout createTextLayout( StringContext aText, byte nDirection, long nRandomSeed ) { - return null; + return new TextLayout( aText, nDirection, nRandomSeed, this, associatedCanvas ); } - public RealRectangle2D[] queryTightMeasures( StringContext text, - ViewState viewState, - RenderState renderState, - byte direction ) throws com.sun.star.lang.IllegalArgumentException + public FontRequest getFontRequest( ) { - return null; - } - - public RealRectangle2D[] queryTextMeasures( StringContext text, - ViewState viewState, - RenderState renderState, - byte direction ) throws com.sun.star.lang.IllegalArgumentException - { - return null; + return fontRequest; } - public double[] queryTextOffsets( StringContext text, - ViewState viewState, - RenderState renderState, - byte direction ) throws com.sun.star.lang.IllegalArgumentException + public FontMetrics getFontMetrics( ) { + // TODO return null; } - public RealRectangle2D queryTextBounds( StringContext text, - ViewState viewState, - RenderState renderState, - byte direction ) throws com.sun.star.lang.IllegalArgumentException + public double[] getAvailableSizes( ) { + // TODO return null; } - public FontRequest getFontRequest() - { - return fontRequest; - } - - public FontMetrics getFontMetrics() + public com.sun.star.beans.PropertyValue[] getExtraFontProperties( ) { + // TODO return null; } - public XCanvas getAssociatedCanvas() - { - return associatedCanvas; - } - //---------------------------------------------------------------------------------- // -- cgit