diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 13:19:30 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-01 13:19:30 +0000 |
| commit | 55ba9d5d77a62bcf8bce8c4843efbc4d9e9be94c (patch) | |
| tree | f526b3c049d3cb911803fc6d287adb08c5894ccf /svx | |
| parent | 00416fde0c20fda2671b93b04142f068a82d5186 (diff) | |
INTEGRATION: CWS impress109 (1.136.28); FILE MERGED
2006/10/19 14:07:19 sj 1.136.28.2: RESYNC: (1.136-1.139); FILE MERGED
2006/10/12 09:49:11 sj 1.136.28.1: #70290# fixed fontwork font problem
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/msfilter/msdffimp.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/svx/source/msfilter/msdffimp.cxx b/svx/source/msfilter/msdffimp.cxx index ff1068eaa8b4..277ba812f38d 100644 --- a/svx/source/msfilter/msdffimp.cxx +++ b/svx/source/msfilter/msdffimp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: msdffimp.cxx,v $ * - * $Revision: 1.140 $ + * $Revision: 1.141 $ * - * last change: $Author: hr $ $Date: 2006-10-24 13:42:43 $ + * last change: $Author: vg $ $Date: 2006-11-01 14:19:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -4923,6 +4923,10 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r MSDFFReadZString( rSt, aFontName, GetPropertyValue( DFF_Prop_gtextFont ), TRUE ); aSet.Put( SvxFontItem( aLatin.GetFamily(), aFontName, aLatin.GetStyleName() ) ); + aSet.Put( SvxFontItem( aLatin.GetFamily(), aFontName, aLatin.GetStyleName(), + PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO_CJK ) ); + aSet.Put( SvxFontItem( aLatin.GetFamily(), aFontName, aLatin.GetStyleName(), + PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO_CTL ) ); } // SJ: applying fontattributes for Fontwork : |