diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-06-19 22:29:10 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-06-20 11:42:36 +0200 |
commit | 558352495a79a7db644c21b4581409f172996c24 (patch) | |
tree | 3a8d05b3c86028868311b4dce3a3f1b65403c9d8 /sw/source/filter/ww8/wrtw8nds.cxx | |
parent | sw: WW8 export: RawText parameter bForceUnicode is obsolete (diff) | |
download | core-558352495a79a7db644c21b4581409f172996c24.tar.gz core-558352495a79a7db644c21b4581409f172996c24.zip |
sw: WW8 export: remove WW6 export, part2: SupportsUnicode()
Change-Id: Ib33539d19df17455588e51ca77a612546e269e20
Diffstat (limited to 'sw/source/filter/ww8/wrtw8nds.cxx')
-rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 6d5a32838075..62946c8ab15b 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -179,7 +179,7 @@ void SwWW8AttrIter::IterToCurrent() SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const SwTextNode& rTextNd) : MSWordAttrIter(rWr), rNd(rTextNd), - maCharRuns(GetPseudoCharRuns(rTextNd, 0, !rWr.SupportsUnicode())), + maCharRuns(GetPseudoCharRuns(rTextNd, 0, false)), pCurRedline(0), nAktSwPos(0), nCurRedlinePos(USHRT_MAX), @@ -208,7 +208,7 @@ SwWW8AttrIter::SwWW8AttrIter(MSWordExportBase& rWr, const SwTextNode& rTextNd) : only be supported by word anchored inline ("as character"), so force this in the supportable case. */ - if (rWr.SupportsUnicode() && rWr.m_bInWriteEscher) + if (rWr.m_bInWriteEscher) { std::for_each(maFlyFrms.begin(), maFlyFrms.end(), std::mem_fun_ref(&sw::Frame::ForceTreatAsInline)); @@ -499,19 +499,6 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby ) { SvxFontItem aFont( *pFont ); - /* - If we are a nonunicode aware format then we set the charset we want to - use for export of this range. If necessary this will generate a pseudo - font to use for this range. - - So now we are guaranteed to have a font with the correct charset set - for WW6/95 which will match the script we have exported this range in, - this makes older nonunicode aware versions of word display the correct - characters. - */ - if ( !m_rExport.SupportsUnicode() ) - aFont.SetCharSet( GetCharSet() ); - if ( rParentFont != aFont ) m_rExport.AttrOutput().OutputItem( aFont ); } |