incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1352206 - /incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx
Date Wed, 20 Jun 2012 16:40:52 GMT
Author: alg
Date: Wed Jun 20 16:40:51 2012
New Revision: 1352206

URL: http://svn.apache.org/viewvc?rev=1352206&view=rev
Log:
#119475 bullet font info for CJK and CTL, Patch by Sun Ying, Review by alg

Modified:
    incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx

Modified: incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx?rev=1352206&r1=1352205&r2=1352206&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx Wed Jun 20 16:40:51 2012
@@ -5761,7 +5761,16 @@ void PPTPortionObj::ApplyTo(  SfxItemSet
 	{
 		PptFontEntityAtom* pFontEnityAtom = rManager.GetFontEnityAtom( nVal );
 		if ( pFontEnityAtom )
-            rSet.Put( SvxFontItem( pFontEnityAtom->eFamily, pFontEnityAtom->aName,
String(), pFontEnityAtom->ePitch, pFontEnityAtom->eCharSet, EE_CHAR_FONTINFO ) );
+		{
+			rSet.Put( SvxFontItem( pFontEnityAtom->eFamily, pFontEnityAtom->aName, String(),
pFontEnityAtom->ePitch, pFontEnityAtom->eCharSet, EE_CHAR_FONTINFO ) );
+
+            // #119475# 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
 	{



Mime
View raw message