filter/source/msfilter/svdfppt.cxx | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 4cbce6f183a8ecda72b8071417615c5b8057b8bd
Author: Armin Le Grand <a...@apache.org>
Date: Wed Jun 20 15:40:51 2012 +0000
Resolves: #i119475# bullet font info for CJK and CTL
Patch by Sun Ying
Review by alg
Change-Id: I17940e1a26696e416e5febd0be1645a1a4c580a6
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 0ffdd0a..ba10637 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
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
