diff options
| author | Istvan Turi <turipista@freemail.hu> | 2012-08-16 17:38:03 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-08-16 17:45:36 +0200 |
| commit | 1b0f7ee1e04d7b0fe81f7458ae2116615e0f6889 (patch) | |
| tree | 655598252c1ae8d147b274bafb917a83b8d235ef /sw/source/filter/html/css1atr.cxx | |
| parent | cecff561687865359a695f1cf6ecb99300ce121b (diff) | |
idxexample.odt and html.stw cleanup (fdo#49101, fdo#49098)
idxexample.odt will be localized through the standard l10n
framework, i.e. with use of .po files, because now strings
are read from resources.
html.stw is language independent now, defaults for different
scripts are handled in the code.
Change-Id: Ie20cafc6191721a959b33e2559b9866e3762a146
Diffstat (limited to 'sw/source/filter/html/css1atr.cxx')
| -rw-r--r-- | sw/source/filter/html/css1atr.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 03584cd28a6d..c9d36f7bbd66 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1356,14 +1356,11 @@ sal_Bool SwHTMLWriter::HasScriptDependentItems( const SfxItemSet& rItemSet, const SwCharFmt *pDCCharFmt = pDrop->GetCharFmt(); if( pDCCharFmt ) { + //Some items occured twice, and I have no idea why. SfxItemSet aTstItemSet( *pDCCharFmt->GetAttrSet().GetPool(), - RES_CHRATR_FONT, RES_CHRATR_FONT, - RES_CHRATR_POSTURE, RES_CHRATR_POSTURE, - RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT, - RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONT, - RES_CHRATR_CJK_POSTURE, RES_CHRATR_CJK_WEIGHT, - RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONT, - RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT, + RES_CHRATR_FONT, RES_CHRATR_POSTURE, RES_CHRATR_WEIGHT, + RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_POSTURE, RES_CHRATR_CJK_WEIGHT, + RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_POSTURE, RES_CHRATR_CTL_WEIGHT, 0 ); aTstItemSet.Set( pDCCharFmt->GetAttrSet(), sal_True ); return HasScriptDependentItems( aTstItemSet, sal_False ); @@ -1408,8 +1405,13 @@ static sal_Bool OutCSS1Rule( SwHTMLWriter& rHTMLWrt, const String& rSelector, SfxItemSet aScriptItemSet( *rItemSet.GetPool(), RES_CHRATR_FONT, RES_CHRATR_FONTSIZE, RES_CHRATR_LANGUAGE, RES_CHRATR_POSTURE, - RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT, - RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT, + RES_CHRATR_WEIGHT, + RES_CHRATR_CJK_FONT, RES_CHRATR_CJK_FONTSIZE, + RES_CHRATR_CJK_LANGUAGE, RES_CHRATR_CJK_POSTURE, + RES_CHRATR_CJK_WEIGHT, + RES_CHRATR_CTL_FONT, RES_CHRATR_CTL_FONTSIZE, + RES_CHRATR_CTL_LANGUAGE, RES_CHRATR_CTL_POSTURE, + RES_CHRATR_CTL_WEIGHT, 0 ); aScriptItemSet.Put( rItemSet ); |