Author: alg Date: Thu Jun 21 09:08:11 2012 New Revision: 1352464 URL: http://svn.apache.org/viewvc?rev=1352464&view=rev Log: Changed CRLF to Unix 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=1352464&r1=1352463&r2=1352464&view=diff ============================================================================== --- incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx (original) +++ incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx Thu Jun 21 09:08:11 2012 @@ -5761,16 +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 ) ); - - // #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 ) ); - } - } + { + 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 {