diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-10-27 14:51:30 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-10-27 14:51:30 +0000 |
| commit | c8c9c13db8b914b0f371f82ca55ee4014f8dcdc6 (patch) | |
| tree | 30d3658459fcaf0356ca2cb4c0331d86056f916f /svtools/source/control | |
| parent | 01005d6976ce5085fa4006c7fc11d30be32948f6 (diff) | |
INTEGRATION: CWS os36 (1.9.276); FILE MERGED
2004/09/01 10:06:33 os 1.9.276.1: #i30732# screenfonts should not warn about different printout as long as the font isn't of TYPE_RASTER
Diffstat (limited to 'svtools/source/control')
| -rw-r--r-- | svtools/source/control/ctrltool.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 8a11e4ac7546..ecddbea9ba17 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ctrltool.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: vg $ $Date: 2004-01-06 19:22:38 $ + * last change: $Author: pjunck $ $Date: 2004-10-27 15:51:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -614,7 +614,8 @@ XubString FontList::GetFontMapText( const FontInfo& rInfo ) const return maMapPrinterOnly; } // Only Screen-Font? - else if ( (nType & (FONTLIST_FONTNAMETYPE_PRINTER | FONTLIST_FONTNAMETYPE_SCREEN)) == FONTLIST_FONTNAMETYPE_SCREEN ) + else if ( (nType & (FONTLIST_FONTNAMETYPE_PRINTER | FONTLIST_FONTNAMETYPE_SCREEN)) == FONTLIST_FONTNAMETYPE_SCREEN + && rInfo.GetType() == TYPE_RASTER ) { if ( !maMapScreenOnly.Len() ) ((FontList*)this)->maMapScreenOnly = XubString( SvtResId( STR_SVT_FONTMAP_SCREENONLY ) ); |