diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-08-30 15:21:05 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-08-30 15:21:05 +0000 |
| commit | 97207822a7bc73a3ea4bd24fc2d690d31c807eba (patch) | |
| tree | 878e2ba3c31b8477e550186ca5b8389290744d60 /vcl/source/gdi/fontcvt.cxx | |
| parent | a86d119735cd094b0e6aef57a49d40aefd52b45e (diff) | |
INTEGRATION: CWS fontlists03 (1.15.14); FILE MERGED
2004/08/03 15:04:42 hdu 1.15.14.1: #i32490# default symbol conversion is 1:1 conversion
Diffstat (limited to 'vcl/source/gdi/fontcvt.cxx')
| -rw-r--r-- | vcl/source/gdi/fontcvt.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/vcl/source/gdi/fontcvt.cxx b/vcl/source/gdi/fontcvt.cxx index fcfc454ae1cc..d99d373fd8c8 100644 --- a/vcl/source/gdi/fontcvt.cxx +++ b/vcl/source/gdi/fontcvt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fontcvt.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2004-07-13 09:27:19 $ + * last change: $Author: kz $ $Date: 2004-08-30 16:21:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1484,14 +1484,13 @@ const ImplCvtChar* ImplGetRecodeData( const String& rOrgFontName, if( aOrgName.EqualsAscii( r.pOrgName ) ) { pCvt = &r.aCvt; break; } } - - if( !pCvt ) // unknown symbol font => use Unicode DingBats/Adobe Symbols - pCvt = &aImplDingBatsCvt; } else if( aMapName.EqualsAscii( "starbats" ) ) { - if( aOrgName.EqualsAscii( "starsymbol" ) ) pCvt = &aImplStarSymbolCvt; - else if( aOrgName.EqualsAscii( "opensymbol" ) ) pCvt = &aImplStarSymbolCvt; + if( aOrgName.EqualsAscii( "starsymbol" ) ) + pCvt = &aImplStarSymbolCvt; + else if( aOrgName.EqualsAscii( "opensymbol" ) ) + pCvt = &aImplStarSymbolCvt; } return pCvt; |