Sophie

Sophie

distrib > Fedora > 14 > i386 > by-pkgid > f3943258515968edaa2083c86398696f > files > 49

openoffice.org-3.3.0-9.3.fc14.src.rpm

diff -r 5f77587494c6 editeng/source/editeng/eehtml.cxx
--- a/editeng/source/editeng/eehtml.cxx	Mon Sep 27 20:33:10 2010 +0100
+++ b/editeng/source/editeng/eehtml.cxx	Tue Sep 28 16:23:00 2010 +0100
@@ -633,15 +633,30 @@
 			SfxItemSet aItems( aCurSel.Max().GetNode()->GetContentAttribs().GetItems() );
 
 			aItems.ClearItem( EE_PARA_ULSPACE );
+
 			aItems.ClearItem( EE_CHAR_FONTHEIGHT );
 			aItems.ClearItem( EE_CHAR_FONTINFO );
 			aItems.ClearItem( EE_CHAR_WEIGHT );
 
+			aItems.ClearItem( EE_CHAR_FONTHEIGHT_CJK );
+			aItems.ClearItem( EE_CHAR_FONTINFO_CJK );
+			aItems.ClearItem( EE_CHAR_WEIGHT_CJK );
+
+			aItems.ClearItem( EE_CHAR_FONTHEIGHT_CTL );
+			aItems.ClearItem( EE_CHAR_FONTINFO_CTL );
+			aItems.ClearItem( EE_CHAR_WEIGHT_CTL );
+
 			// Fett in den ersten 3 Headings
 			if ( ( nHLevel >= 1 ) && ( nHLevel <= 3 ) )
 			{
 				SvxWeightItem aWeightItem( WEIGHT_BOLD, EE_CHAR_WEIGHT );
 				aItems.Put( aWeightItem );
+
+				SvxWeightItem aWeightItemCJK( WEIGHT_BOLD, EE_CHAR_WEIGHT_CJK );
+				aItems.Put( aWeightItem );
+
+				SvxWeightItem aWeightItemCTL( WEIGHT_BOLD, EE_CHAR_WEIGHT_CTL );
+				aItems.Put( aWeightItem );
 			}
 
 			// Fonthoehe und Abstaende, wenn LogicToLogic moeglich:
@@ -660,9 +675,16 @@
 					nPoints = 11;
 
 				nPoints = OutputDevice::LogicToLogic( nPoints, MAP_POINT, eUnit );
+
 				SvxFontHeightItem aHeightItem( nPoints, 100, EE_CHAR_FONTHEIGHT );
 				aItems.Put( aHeightItem );
 
+				SvxFontHeightItem aHeightItemCJK( nPoints, 100, EE_CHAR_FONTHEIGHT_CJK );
+				aItems.Put( aHeightItemCJK );
+
+				SvxFontHeightItem aHeightItemCTL( nPoints, 100, EE_CHAR_FONTHEIGHT_CTL );
+				aItems.Put( aHeightItemCTL );
+
 				// Absatzabstaende, wenn Heading:
 				if ( !nHLevel || ((nHLevel >= 1) && (nHLevel <= 6)) )
 				{
@@ -679,6 +701,12 @@
 				Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 );
 				SvxFontItem aFontItem( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO );
 				aItems.Put( aFontItem );
+
+				SvxFontItem aFontItemCJK( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CJK );
+				aItems.Put( aFontItemCJK );
+
+				SvxFontItem aFontItemCTL( aFont.GetFamily(), aFont.GetName(), XubString(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO_CTL );
+				aItems.Put( aFontItemCTL );
 			}
 
 			pImpEditEngine->SetParaAttribs( nNode, aItems );