diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-08-05 11:54:45 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-08-05 11:54:45 +0000 |
| commit | 11324283ae81bb39b2cb6a982b5160be927a37c5 (patch) | |
| tree | 4515b87b32bc498bc17afeac976110ecb3fb81f5 /vcl/source/glyphs | |
| parent | f19028e22c41765398f94d88fa946ddcaf3a1b09 (diff) | |
INTEGRATION: CWS gslpatches2 (1.34.144); FILE MERGED
2005/06/13 14:14:29 hdu 1.34.144.1: #i50571# fix scale factors to 1.0
Diffstat (limited to 'vcl/source/glyphs')
| -rwxr-xr-x | vcl/source/glyphs/gcach_layout.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/vcl/source/glyphs/gcach_layout.cxx b/vcl/source/glyphs/gcach_layout.cxx index 5d4dfb43e515..5436e82db92c 100755 --- a/vcl/source/glyphs/gcach_layout.cxx +++ b/vcl/source/glyphs/gcach_layout.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gcach_layout.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: rt $ $Date: 2005-01-31 09:18:58 $ + * last change: $Author: hr $ $Date: 2005-08-05 12:54:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -290,19 +290,14 @@ float IcuFontFromServerFont::getYPixelsPerEm() const float IcuFontFromServerFont::getScaleFactorX() const { - const ImplFontSelectData& r = mrServerFont.GetFontSelData(); - float fXScale = r.mnWidth ? r.mnWidth : r.mnHeight; - fXScale /= mrServerFont.GetEmUnits(); - return fXScale; + return 1.0; } // ----------------------------------------------------------------------- float IcuFontFromServerFont::getScaleFactorY() const { - float fYScale = mrServerFont.GetFontSelData().mnHeight; - fYScale /= mrServerFont.GetEmUnits(); - return fYScale; //TODO + return 1.0; } // ----------------------------------------------------------------------- |