diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-05-18 09:45:15 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-05-18 09:45:15 +0000 |
| commit | f52978283d42c30c2b69e22ba0dbf67f836c485e (patch) | |
| tree | 35494c309b20351b524bce3ae3c0aa352f78a37a /psprint | |
| parent | a55f3dd81682516b033c11ba2a4ffbf5fb011b63 (diff) | |
INTEGRATION: CWS vcl21 (1.2.2); FILE MERGED
2004/03/25 17:54:43 pl 1.2.2.1: #i23601# merge from CWS vclpp3bugs
Diffstat (limited to 'psprint')
| -rw-r--r-- | psprint/source/fontmanager/fontconfig.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/psprint/source/fontmanager/fontconfig.cxx b/psprint/source/fontmanager/fontconfig.cxx index 3922528252c0..c44fbf354d8b 100644 --- a/psprint/source/fontmanager/fontconfig.cxx +++ b/psprint/source/fontmanager/fontconfig.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fontconfig.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2004-03-15 12:03:24 $ + * last change: $Author: kz $ $Date: 2004-05-18 10:45:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -302,7 +302,7 @@ bool PrintFontManager::initFontconfig() , family, file , eWeightRes == FcResultMatch ? weight : -1 , eSpacRes == FcResultMatch ? slant : -1 - , eStyleRes == FcResultMatch ? style : "<nil>" + , eStyleRes == FcResultMatch ? (const char*)style : "<nil>" , eSpacRes == FcResultMatch ? spacing : -1 , eOutRes == FcResultMatch ? outline : -1 ); |