diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-09-30 20:28:43 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-09-30 20:28:43 +0100 |
| commit | eb53231445d00a3d3b0740f07135e9b1b74a8738 (patch) | |
| tree | 5b71aa6e20ff56de1feee1d6558a5688e7d2ca3e | |
| parent | 510da29131e56ba0e1783e505e7131e6f7e0d6b4 (diff) | |
if you force the sizes of western text, you need to force the other ones too
| -rw-r--r-- | editeng/source/editeng/eehtml.cxx | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index e8a2aaad22e2..ff04c7e16458 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -633,15 +633,30 @@ void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel ) 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 @@ void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel ) 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 @@ void EditHTMLParser::ImpSetStyleSheet( USHORT nHLevel ) 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 ); |