diff options
| author | Sven Jacobi <sj@openoffice.org> | 2002-11-12 10:22:20 +0000 |
|---|---|---|
| committer | Sven Jacobi <sj@openoffice.org> | 2002-11-12 10:22:20 +0000 |
| commit | f699b67a766958bff8852ae17024cf3b3ad72121 (patch) | |
| tree | a104bed1f8a1fad22fa05f5c17abc54d440dca6e /svtools | |
| parent | f64541afcfa45dd9e3b55dae4d401454d2250a46 (diff) | |
#95756# font has not always been updated
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/filter.vcl/wmf/wmfwr.cxx | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx index 72984b25d27e..8b82e5ea21fd 100644 --- a/svtools/source/filter.vcl/wmf/wmfwr.cxx +++ b/svtools/source/filter.vcl/wmf/wmfwr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: wmfwr.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: sj $ $Date: 2002-11-01 13:50:16 $ + * last change: $Author: sj $ $Date: 2002-11-12 11:22:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1082,16 +1082,19 @@ void WMFWriter::SetAllAttr() eDstTextAlign = eSrcTextAlign; WMFRecord_SetTextAlign( eDstTextAlign ); } - if ( aDstFont.GetName() != aSrcFont.GetName() ) + if ( aDstFont != aSrcFont ) { pVirDev->SetFont(aSrcFont); - FontCharMap aFontCharMap; - if ( pVirDev->GetFontCharMap( aFontCharMap ) ) + if ( aDstFont.GetName() != aSrcFont.GetName() ) { - if ( ( aFontCharMap.GetFirstChar() & 0xff00 ) == 0xf000 ) - aSrcFont.SetCharSet( RTL_TEXTENCODING_SYMBOL ); - else if ( aSrcFont.GetCharSet() == RTL_TEXTENCODING_SYMBOL ) - aSrcFont.SetCharSet( RTL_TEXTENCODING_MS_1252 ); + FontCharMap aFontCharMap; + if ( pVirDev->GetFontCharMap( aFontCharMap ) ) + { + if ( ( aFontCharMap.GetFirstChar() & 0xff00 ) == 0xf000 ) + aSrcFont.SetCharSet( RTL_TEXTENCODING_SYMBOL ); + else if ( aSrcFont.GetCharSet() == RTL_TEXTENCODING_SYMBOL ) + aSrcFont.SetCharSet( RTL_TEXTENCODING_MS_1252 ); + } } aDstFont = aSrcFont; CreateSelectDeleteFont(aDstFont); |