diff options
| author | Armin Le Grand <alg@apache.org> | 2012-06-20 15:40:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-07 18:20:44 +0000 |
| commit | 4cbce6f183a8ecda72b8071417615c5b8057b8bd (patch) | |
| tree | 6b33dc62718211b896274ccf940f228c5210f496 /filter | |
| parent | 9a93475d6eba53b2e1fba1585dbd11c94ea4b4a3 (diff) | |
Resolves: #i119475# bullet font info for CJK and CTL
Patch by Sun Ying
Review by alg
Change-Id: I17940e1a26696e416e5febd0be1645a1a4c580a6
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 0ffdd0ad0876..ba1063786ed7 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5447,7 +5447,16 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, s { PptFontEntityAtom* pFontEnityAtom = rManager.GetFontEnityAtom( nVal ); if ( pFontEnityAtom ) + { rSet.Put( SvxFontItem( pFontEnityAtom->eFamily, pFontEnityAtom->aName, String(), pFontEnityAtom->ePitch, pFontEnityAtom->eCharSet, EE_CHAR_FONTINFO ) ); + + // #i119475# bullet font info for CJK and CTL + if ( RTL_TEXTENCODING_SYMBOL == pFontEnityAtom->eCharSet ) + { + rSet.Put( SvxFontItem( pFontEnityAtom->eFamily, pFontEnityAtom->aName, String(), pFontEnityAtom->ePitch, pFontEnityAtom->eCharSet, EE_CHAR_FONTINFO_CJK ) ); + rSet.Put( SvxFontItem( pFontEnityAtom->eFamily, pFontEnityAtom->aName, String(), pFontEnityAtom->ePitch, pFontEnityAtom->eCharSet, EE_CHAR_FONTINFO_CTL ) ); + } + } } if ( GetAttrib( PPT_CharAttr_FontHeight, nVal, nDestinationInstance ) ) // Schriftgrad in Point { |