diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-04-06 13:22:26 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-04-06 13:51:42 +0200 |
commit | e4f53484d255f844169957c411dc3e872af7d3bb (patch) | |
tree | 3eda6b7efe197c71d83ba10335fffba479249649 /sw/source/filter/html | |
parent | 2f4d577e60a934e2845c90e00bac06072351ec65 (diff) |
tdf#148413: Drop HTML export encoding configuration; use UTF-8
Anything else is just a joke today.
Change-Id: Ie6a0cec1edcd257cbadef702018e6a919e6a0b44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132628
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/filter/html')
-rw-r--r-- | sw/source/filter/html/css1atr.cxx | 10 | ||||
-rw-r--r-- | sw/source/filter/html/htmlatr.cxx | 61 | ||||
-rw-r--r-- | sw/source/filter/html/htmlbas.cxx | 6 | ||||
-rw-r--r-- | sw/source/filter/html/htmldrawwriter.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlfldw.cxx | 22 | ||||
-rw-r--r-- | sw/source/filter/html/htmlflywriter.cxx | 19 | ||||
-rw-r--r-- | sw/source/filter/html/htmlforw.cxx | 33 | ||||
-rw-r--r-- | sw/source/filter/html/htmlftn.cxx | 20 | ||||
-rw-r--r-- | sw/source/filter/html/htmlplug.cxx | 23 | ||||
-rw-r--r-- | sw/source/filter/html/htmltabw.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 29 | ||||
-rw-r--r-- | sw/source/filter/html/wrthtml.hxx | 3 |
12 files changed, 100 insertions, 132 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 9e4de8c52527..731381f1a071 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -329,7 +329,7 @@ void SwHTMLWriter::OutCSS1_Property( const char *pProp, case CSS1_OUTMODE_RULE_ON: { OutNewLine(); - sOut.append(OUStringToOString(m_aCSS1Selector, m_eDestEnc) + " { "); + sOut.append(OUStringToOString(m_aCSS1Selector, RTL_TEXTENCODING_UTF8) + " { "); } break; @@ -351,9 +351,9 @@ void SwHTMLWriter::OutCSS1_Property( const char *pProp, Strm().WriteOString( sOut.makeStringAndClear() ); if( !sVal.empty() ) HTMLOutFuncs::Out_String( Strm(), OUString::createFromAscii(sVal), - m_eDestEnc, &m_aNonConvertableCharacters ); + &m_aNonConvertableCharacters ); else if( pSVal ) - HTMLOutFuncs::Out_String( Strm(), *pSVal, m_eDestEnc, &m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( Strm(), *pSVal, &m_aNonConvertableCharacters ); } else { @@ -361,7 +361,7 @@ void SwHTMLWriter::OutCSS1_Property( const char *pProp, if( !sVal.empty() ) sOut.append(sVal); else if( pSVal ) - sOut.append(OUStringToOString(*pSVal, m_eDestEnc)); + sOut.append(OUStringToOString(*pSVal, RTL_TEXTENCODING_UTF8)); } if (!sOut.isEmpty()) @@ -1680,7 +1680,7 @@ static Writer& OutCSS1_SwPageDesc( Writer& rWrt, const SwPageDesc& rPageDesc, if( rHTMLWrt.m_bFirstCSS1Property && bPseudo ) { rHTMLWrt.OutNewLine(); - OString sTmp(OUStringToOString(aSelector, rHTMLWrt.m_eDestEnc)); + OString sTmp(OUStringToOString(aSelector, RTL_TEXTENCODING_UTF8)); rWrt.Strm().WriteOString( sTmp ).WriteCharPtr( " {" ); rHTMLWrt.m_bFirstCSS1Property = false; } diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 874437ede6ec..1467a92c3eb6 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -896,7 +896,7 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat& rFormat, } } HTMLOutFuncs::Out_String( rWrt.Strm(), aClass, - rHWrt.m_eDestEnc, &rHWrt.m_aNonConvertableCharacters ); + &rHWrt.m_aNonConvertableCharacters ); sOut += "\""; } rWrt.Strm().WriteOString( sOut ); @@ -1134,10 +1134,8 @@ public: sal_uInt16 GetScriptAtPos( sal_Int32 nPos, sal_uInt16 nWeak ); - void OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, - HTMLOutContext *pContext = nullptr ); - void OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, - HTMLOutContext *pContext ); + void OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos ); + void OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos ); bool IsHTMLMode(sal_uLong nMode) const { return (m_nHTMLMode & nMode) != 0; } }; @@ -1867,8 +1865,7 @@ sal_uInt16 HTMLEndPosLst::GetScriptAtPos( sal_Int32 nPos, sal_uInt16 nWeak ) return nRet; } -void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, - HTMLOutContext *pContext ) +void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos ) { rHWrt.m_bTagOn = true; @@ -1914,11 +1911,7 @@ void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, { rHWrt.m_nCSS1Script = GetScriptAtPos( nPos, nCSS1Script ); } - if( pContext ) - { - HTMLOutFuncs::FlushToAscii( rHWrt.Strm(), *pContext ); - pContext = nullptr; // one time only - } + HTMLOutFuncs::FlushToAscii( rHWrt.Strm() ); // was one time only - do we still need it? Out( aHTMLAttrFnTab, *pPos->GetItem(), rHWrt ); rHWrt.maStartedAttributes[pPos->GetItem()->Which()]++; rHWrt.m_nCSS1Script = nCSS1Script; @@ -1926,8 +1919,7 @@ void HTMLEndPosLst::OutStartAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, } } -void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, - HTMLOutContext *pContext = nullptr ) +void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos ) { rHWrt.m_bTagOn = false; @@ -1940,11 +1932,7 @@ void HTMLEndPosLst::OutEndAttrs( SwHTMLWriter& rHWrt, sal_Int32 nPos, if( SAL_MAX_INT32 == nPos || nEnd == nPos ) { - if( pContext ) - { - HTMLOutFuncs::FlushToAscii( rHWrt.Strm(), *pContext ); - pContext = nullptr; // one time only - } + HTMLOutFuncs::FlushToAscii( rHWrt.Strm() ); // was one time only - do we still need it? // Skip closing span if next character span has the same border (border merge) bool bSkipOut = false; if( pPos->GetItem()->Which() == RES_CHRATR_BOX ) @@ -2271,7 +2259,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) if( !aOutlineText.isEmpty() ) HTMLOutFuncs::Out_String( rWrt.Strm(), aOutlineText, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters); + &rHTMLWrt.m_aNonConvertableCharacters); if( rHTMLWrt.m_pFormatFootnote ) { @@ -2344,8 +2332,6 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) } { - HTMLOutContext aContext( rHTMLWrt.m_eDestEnc ); - // Tabs are leading till there is a non-tab since the start of the paragraph. bool bLeadingTab = true; for( ; nStrPos < nEnd; nStrPos++ ) @@ -2353,10 +2339,9 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) // output the frames that are anchored to the current position if( bFlysLeft ) { - aEndPosLst.OutEndAttrs( rHTMLWrt, nStrPos + nOffset, &aContext ); + aEndPosLst.OutEndAttrs( rHTMLWrt, nStrPos + nOffset ); bFlysLeft = rHTMLWrt.OutFlyFrame( rNode.GetIndex(), - nStrPos, HtmlPosition::Inside, - &aContext ); + nStrPos, HtmlPosition::Inside ); } bool bOutChar = true; @@ -2413,8 +2398,8 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) rHTMLWrt.m_CharFormatInfos ); } - aEndPosLst.OutEndAttrs( rHTMLWrt, nStrPos + nOffset, &aContext ); - aEndPosLst.OutStartAttrs( rHTMLWrt, nStrPos + nOffset, &aContext ); + aEndPosLst.OutEndAttrs( rHTMLWrt, nStrPos + nOffset ); + aEndPosLst.OutStartAttrs( rHTMLWrt, nStrPos + nOffset ); if( pTextHt ) { @@ -2424,7 +2409,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) sal_uInt16 nCSS1Script = rHTMLWrt.m_nCSS1Script; rHTMLWrt.m_nCSS1Script = aEndPosLst.GetScriptAtPos( nStrPos + nOffset, nCSS1Script ); - HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext ); + HTMLOutFuncs::FlushToAscii( rWrt.Strm() ); Out( aHTMLAttrFnTab, pTextHt->GetAttr(), rHTMLWrt ); rHTMLWrt.m_nCSS1Script = nCSS1Script; rHTMLWrt.m_bLFPossible = false; @@ -2459,7 +2444,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) (nLineLen >= rHTMLWrt.m_nWishLineLen || (nLineLen+nWordLen) >= rHTMLWrt.m_nWishLineLen ) ) { - HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext ); + HTMLOutFuncs::FlushToAscii( rWrt.Strm() ); rHTMLWrt.OutNewLine(); bOutChar = false; } @@ -2469,7 +2454,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) { if( 0x0a == c ) { - HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext ); + HTMLOutFuncs::FlushToAscii( rWrt.Strm() ); HtmlWriter aHtml(rWrt.Strm(), rHTMLWrt.maNamespace); aHtml.single(OOO_STRING_SVTOOLS_HTML_linebreak); } @@ -2505,7 +2490,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) if (!bConsumed) { - HTMLOutFuncs::Out_Char(rWrt.Strm(), c, aContext, + HTMLOutFuncs::Out_Char(rWrt.Strm(), c, &rHTMLWrt.m_aNonConvertableCharacters); } } @@ -2521,7 +2506,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const SwContentNode& rNode ) } } } - HTMLOutFuncs::FlushToAscii( rWrt.Strm(), aContext ); + HTMLOutFuncs::FlushToAscii( rWrt.Strm() ); } aEndPosLst.OutEndAttrs( rHTMLWrt, SAL_MAX_INT32 ); @@ -2724,7 +2709,7 @@ static Writer& OutHTML_SvxFont( Writer& rWrt, const SfxPoolItem& rHt ) OString sOut = "<" + rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_span " " OOO_STRING_SVTOOLS_HTML_O_style "=\"font-family: "; rWrt.Strm().WriteOString(sOut); - HTMLOutFuncs::Out_String(rWrt.Strm(), aNames, rHTMLWrt.m_eDestEnc, + HTMLOutFuncs::Out_String(rWrt.Strm(), aNames, &rHTMLWrt.m_aNonConvertableCharacters) .WriteCharPtr("\">"); } @@ -2733,7 +2718,7 @@ static Writer& OutHTML_SvxFont( Writer& rWrt, const SfxPoolItem& rHt ) OString sOut = "<" + rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_font " " OOO_STRING_SVTOOLS_HTML_O_face "=\""; rWrt.Strm().WriteOString( sOut ); - HTMLOutFuncs::Out_String( rWrt.Strm(), aNames, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ) + HTMLOutFuncs::Out_String( rWrt.Strm(), aNames, &rHTMLWrt.m_aNonConvertableCharacters ) .WriteCharPtr( "\">" ); } } @@ -3044,7 +3029,7 @@ Writer& OutHTML_INetFormat( Writer& rWrt, const SwFormatINetFormat& rINetFormat, sOut += " " OOO_STRING_SVTOOLS_HTML_O_name "=\""; rWrt.Strm().WriteOString( sOut ); HTMLOutFuncs::Out_String( rWrt.Strm(), rINetFormat.GetName(), - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); sOut = "\""; } @@ -3053,7 +3038,7 @@ Writer& OutHTML_INetFormat( Writer& rWrt, const SwFormatINetFormat& rINetFormat, { sOut += " " OOO_STRING_SVTOOLS_HTML_O_target "=\""; rWrt.Strm().WriteOString( sOut ); - HTMLOutFuncs::Out_String( rWrt.Strm(), rTarget, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), rTarget, &rHTMLWrt.m_aNonConvertableCharacters ); sOut = "\""; } @@ -3065,7 +3050,7 @@ Writer& OutHTML_INetFormat( Writer& rWrt, const SwFormatINetFormat& rINetFormat, if( bEvents ) HTMLOutFuncs::Out_Events( rWrt.Strm(), *pMacTable, aAnchorEventTable, - rHTMLWrt.m_bCfgStarBasic, rHTMLWrt.m_eDestEnc, + rHTMLWrt.m_bCfgStarBasic, &rHTMLWrt.m_aNonConvertableCharacters ); rWrt.Strm().WriteCharPtr( ">" ); @@ -3176,7 +3161,7 @@ static Writer& OutHTML_SwTextCharFormat( Writer& rWrt, const SfxPoolItem& rHt ) } } HTMLOutFuncs::Out_String( rWrt.Strm(), aClass, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); sOut = "\""; } sOut += ">"; diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index 65badb54f68b..098233e5dbfc 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -284,7 +284,7 @@ void SwHTMLWriter::OutBasic(const SwHTMLWriter & rHTMLWrt) "=\"text/x-"; Strm().WriteOString( sOut ); // Entities aren't welcome here - Strm().WriteOString( OUStringToOString(sLang, m_eDestEnc) ) + Strm().WriteOString( OUStringToOString(sLang, RTL_TEXTENCODING_UTF8) ) .WriteCharPtr( "\">" ); } @@ -293,7 +293,7 @@ void SwHTMLWriter::OutBasic(const SwHTMLWriter & rHTMLWrt) HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), pModule->GetSource32(), sLang, STARBASIC, OUString(), &rLibName, &rModName, - m_eDestEnc, &m_aNonConvertableCharacters ); + &m_aNonConvertableCharacters ); } } #endif @@ -325,7 +325,7 @@ void SwHTMLWriter::OutBasicBodyEvents() if( !aDocTable.empty() ) HTMLOutFuncs::Out_Events( Strm(), aDocTable, aBodyEventTable, - m_bCfgStarBasic, m_eDestEnc, &m_aNonConvertableCharacters ); + m_bCfgStarBasic, &m_aNonConvertableCharacters ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index fde32e78170d..8ba6299b99c8 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -274,7 +274,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt, OUString aText( aOutliner.GetText( aOutliner.GetParagraph(0), aOutliner.GetParagraphCount() ) ); HTMLOutFuncs::Out_String( rWrt.Strm(), aText, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OStringConcatenation(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_marquee), false ); diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index dbe4fe8d9092..a28ffade717f 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -286,14 +286,14 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_name "=\""); rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), aName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), aName, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } if( !aValue.isEmpty() ) { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_value "=\""); rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), aValue, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), aValue, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } if( bNumFormat ) @@ -301,7 +301,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, OSL_ENSURE( nFormat, "number format is 0" ); sOut.append(HTMLOutFuncs::CreateTableDataOptionsValNum( bNumValue, dNumValue, nFormat, - *rHTMLWrt.m_pDoc->GetNumberFormatter(), rHTMLWrt.m_eDestEnc, + *rHTMLWrt.m_pDoc->GetNumberFormatter(), &rHTMLWrt.m_aNonConvertableCharacters)); } if( bFixed ) @@ -409,7 +409,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, } HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.copy( nPos, nChunkLen ), - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); rHTMLWrt.m_bTagOn = false; while( nItems ) @@ -419,7 +419,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, else { HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.copy( nPos, nChunkLen ), - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); } nPos = nEndPos; } @@ -428,7 +428,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, else { HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); } // Output the closing tag. @@ -459,7 +459,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt ) // TODO: HTML-Tags are written without entities, that for, characters // not contained in the destination encoding are lost! OString sTmp(OUStringToOString(rText, - static_cast<SwHTMLWriter&>(rWrt).m_eDestEnc)); + RTL_TEXTENCODING_UTF8)); rWrt.Strm().WriteOString( sTmp ).WriteChar( '>' ); } else if( SwFieldIds::Postit == pFieldTyp->Which() ) @@ -480,7 +480,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt ) // TODO: HTML-Tags are written without entities, that for, // characters not contained in the destination encoding are lost! OString sTmp(OUStringToOString(sComment, - static_cast<SwHTMLWriter&>(rWrt).m_eDestEnc)); + RTL_TEXTENCODING_UTF8)); rWrt.Strm().WriteOString( sTmp ); bWritten = true; } @@ -496,7 +496,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt ) // characters not contained in the destination encoding are // lost! OString sTmp(OUStringToOString(sComment, - static_cast<SwHTMLWriter&>(rWrt).m_eDestEnc)); + RTL_TEXTENCODING_UTF8)); rWrt.Strm().WriteOString( sTmp ); bWritten = true; } @@ -510,7 +510,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt ) OString sOut = "<" OOO_STRING_SVTOOLS_HTML_comment " " + - OUStringToOString(sComment, static_cast<SwHTMLWriter&>(rWrt).m_eDestEnc) + + OUStringToOString(sComment, RTL_TEXTENCODING_UTF8) + " -->"; rWrt.Strm().WriteOString( sOut ); } @@ -531,7 +531,7 @@ Writer& OutHTML_SwFormatField( Writer& rWrt, const SfxPoolItem& rHt ) // otherwise is the script content itself. Since only JavaScript // is in fields, it must be JavaScript ...:) HTMLOutFuncs::OutScript( rWrt.Strm(), rWrt.GetBaseURL(), aContents, rType, JAVASCRIPT, - aURL, nullptr, nullptr, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + aURL, nullptr, nullptr, &rHTMLWrt.m_aNonConvertableCharacters ); if( rHTMLWrt.m_bLFPossible ) rHTMLWrt.OutNewLine( true ); diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx index ade669f80b79..ba7c67200f5b 100644 --- a/sw/source/filter/html/htmlflywriter.cxx +++ b/sw/source/filter/html/htmlflywriter.cxx @@ -353,8 +353,7 @@ void SwHTMLWriter::CollectFlyFrames() } } -bool SwHTMLWriter::OutFlyFrame( SwNodeOffset nNdIdx, sal_Int32 nContentIdx, HtmlPosition nPos, - HTMLOutContext *pContext ) +bool SwHTMLWriter::OutFlyFrame( SwNodeOffset nNdIdx, sal_Int32 nContentIdx, HtmlPosition nPos ) { bool bFlysLeft = false; // Are there still Flys left at the current node position? @@ -390,11 +389,7 @@ bool SwHTMLWriter::OutFlyFrame( SwNodeOffset nNdIdx, sal_Int32 nContentIdx, Html bRestart = true; // not really, only exit the loop } - if( pContext ) - { - HTMLOutFuncs::FlushToAscii(Strm(), *pContext ); - pContext = nullptr; // one time only - } + HTMLOutFuncs::FlushToAscii(Strm()); // it was one time only; do we still need it? OutFrameFormat( pPosFly->GetOutMode(), pPosFly->GetFormat(), pPosFly->GetSdrObject() ); @@ -532,7 +527,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, (nFrameOpts & HtmlFrmOpts::Id) ? OOO_STRING_SVTOOLS_HTML_O_id : OOO_STRING_SVTOOLS_HTML_O_name; sOut.append(OString::Concat(" ") + pStr + "=\""); Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( Strm(), rFrameFormat.GetName(), m_eDestEnc, &m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( Strm(), rFrameFormat.GetName(), &m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -549,7 +544,7 @@ OString SwHTMLWriter::OutFrameFormatOptions( const SwFrameFormat &rFrameFormat, { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_alt "=\""); Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( Strm(), rAlternateText, m_eDestEnc, &m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( Strm(), rAlternateText, &m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -1182,7 +1177,6 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con aIMapEventTable, rHTMLWrt.m_bCfgStarBasic, SAL_NEWLINE_STRING, pIndArea, pIndMap, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); } else @@ -1191,7 +1185,6 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const SfxItemSet& rItemSet, con aIMapEventTable, rHTMLWrt.m_bCfgStarBasic, SAL_NEWLINE_STRING, pIndArea, pIndMap, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); } } @@ -1501,14 +1494,14 @@ Writer& OutHTML_BulletImage( Writer& rWrt, { sOut.append(OOO_STRING_SVTOOLS_HTML_O_src "=\""); rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), aLink, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), aLink, &rHTMLWrt.m_aNonConvertableCharacters ); } else { sOut.append("list-style-image: url(" OOO_STRING_SVTOOLS_HTML_O_data ":"); rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append(");"); } sOut.append('\"'); diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index eaf475ceb603..da838b3bdfd2 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -80,7 +80,6 @@ const HtmlFrmOpts HTML_FRMOPTS_IMG_CONTROL_CSS1 = static void lcl_html_outEvents( SvStream& rStrm, const uno::Reference< form::XFormComponent >& rFormComp, bool bCfgStarBasic, - rtl_TextEncoding eDestEnc, OUString *pNonConvertableChars ) { uno::Reference< uno::XInterface > xParentIfc = rFormComp->getParent(); @@ -176,7 +175,7 @@ static void lcl_html_outEvents( SvStream& rStrm, } sOut += "=\""; rStrm.WriteOString( sOut ); - HTMLOutFuncs::Out_String( rStrm, rDesc.ScriptCode, eDestEnc, pNonConvertableChars ); + HTMLOutFuncs::Out_String( rStrm, rDesc.ScriptCode, pNonConvertableChars ); rStrm.WriteChar( '\"' ); if( EXTENDED_STYPE == eScriptType && !rDesc.AddListenerParam.isEmpty() ) @@ -186,7 +185,7 @@ static void lcl_html_outEvents( SvStream& rStrm, OUStringToOString(sMethod, RTL_TEXTENCODING_ASCII_US) + "=\""; rStrm.WriteOString( sOut ); HTMLOutFuncs::Out_String( rStrm, rDesc.AddListenerParam, - eDestEnc, pNonConvertableChars ); + pNonConvertableChars ); rStrm.WriteChar( '\"' ); } } @@ -458,7 +457,7 @@ void SwHTMLWriter::OutForm( bool bOn, sOut += " " OOO_STRING_SVTOOLS_HTML_O_name "=\""; Strm().WriteOString( sOut ); HTMLOutFuncs::Out_String( Strm(), *s, - m_eDestEnc, &m_aNonConvertableCharacters ); + &m_aNonConvertableCharacters ); sOut = "\""; } } @@ -472,7 +471,7 @@ void SwHTMLWriter::OutForm( bool bOn, Strm().WriteOString( sOut ); OUString aURL = URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), *s); - HTMLOutFuncs::Out_String( Strm(), aURL, m_eDestEnc, &m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( Strm(), aURL, &m_aNonConvertableCharacters ); sOut = "\""; } } @@ -517,14 +516,14 @@ void SwHTMLWriter::OutForm( bool bOn, sOut += " " OOO_STRING_SVTOOLS_HTML_O_target "=\""; Strm().WriteOString( sOut ); HTMLOutFuncs::Out_String( Strm(), *s, - m_eDestEnc, &m_aNonConvertableCharacters ); + &m_aNonConvertableCharacters ); sOut = "\""; } } Strm().WriteOString( sOut ); uno::Reference< form::XFormComponent > xFormComp( rFormComps, uno::UNO_QUERY ); - lcl_html_outEvents( Strm(), xFormComp, m_bCfgStarBasic, m_eDestEnc, &m_aNonConvertableCharacters ); + lcl_html_outEvents( Strm(), xFormComp, m_bCfgStarBasic, &m_aNonConvertableCharacters ); Strm().WriteChar( '>' ); IncIndentLevel(); // indent content of form @@ -587,7 +586,7 @@ void SwHTMLWriter::OutHiddenControls( sOut += " " OOO_STRING_SVTOOLS_HTML_O_name "=\""; Strm().WriteOString( sOut ); HTMLOutFuncs::Out_String( Strm(), *s, - m_eDestEnc, &m_aNonConvertableCharacters ); + &m_aNonConvertableCharacters ); sOut = "\""; } } @@ -599,7 +598,7 @@ void SwHTMLWriter::OutHiddenControls( sOut += " " OOO_STRING_SVTOOLS_HTML_O_value "=\""; Strm().WriteOString( sOut ); HTMLOutFuncs::Out_String( Strm(), *s, - m_eDestEnc, &m_aNonConvertableCharacters ); + &m_aNonConvertableCharacters ); sOut = "\""; } } @@ -940,7 +939,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, sOut += " " OOO_STRING_SVTOOLS_HTML_O_name "=\""; rWrt.Strm().WriteOString( sOut ); HTMLOutFuncs::Out_String( rWrt.Strm(), *s, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); sOut = "\""; } } @@ -958,7 +957,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, { sOut += " " OOO_STRING_SVTOOLS_HTML_O_value "=\""; rWrt.Strm().WriteOString( sOut ); - HTMLOutFuncs::Out_String( rWrt.Strm(), sValue, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), sValue, &rHTMLWrt.m_aNonConvertableCharacters ); sOut = "\""; } @@ -976,7 +975,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, HTMLOutFuncs::Out_String( rWrt.Strm(), URIHelper::simpleNormalizedMakeRelative( rWrt.GetBaseURL(), *s), - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); sOut = "\""; } } @@ -1147,7 +1146,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, uno::Reference< form::XFormComponent > xFormComp( xControlModel, uno::UNO_QUERY ); lcl_html_outEvents( rWrt.Strm(), xFormComp, rHTMLWrt.m_bCfgStarBasic, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); rWrt.Strm().WriteChar( '>' ); @@ -1207,7 +1206,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, sOut += " " OOO_STRING_SVTOOLS_HTML_O_value "=\""; rWrt.Strm().WriteOString( sOut ); HTMLOutFuncs::Out_String( rWrt.Strm(), sVal, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); sOut = "\""; } if( bSelected ) @@ -1217,7 +1216,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, rWrt.Strm().WriteOString( sOut ); HTMLOutFuncs::Out_String( rWrt.Strm(), pStrings[i], - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); } HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OStringConcatenation(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_option), false ); @@ -1248,7 +1247,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, rWrt.Strm().WriteCharPtr( SAL_NEWLINE_STRING ); OUString aLine = sVal.getToken( 0, 0x0A, nPos ); HTMLOutFuncs::Out_String( rWrt.Strm(), aLine, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); } } HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OStringConcatenation(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_textarea), false ); @@ -1261,7 +1260,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, if( !s->isEmpty() ) { HTMLOutFuncs::Out_String( rWrt.Strm(), *s, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ).WriteChar( ' ' ); + &rHTMLWrt.m_aNonConvertableCharacters ).WriteChar( ' ' ); } } } diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index 0020a4166eae..6702a80efe3f 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -305,14 +305,14 @@ Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt ) OString aTag = rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_anchor; sOut.append("<" + aTag + " " OOO_STRING_SVTOOLS_HTML_O_class "=\""); rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), sClass, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), sClass, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append("\" " OOO_STRING_SVTOOLS_HTML_O_name "=\""); rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor "\" " OOO_STRING_SVTOOLS_HTML_O_href "=\"#"); rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol "\""); if( !rFormatFootnote.GetNumStr().isEmpty() ) sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_sdfixed); @@ -321,7 +321,7 @@ Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const SfxPoolItem& rHt ) HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OStringConcatenation(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_superscript )); HTMLOutFuncs::Out_String( rWrt.Strm(), rFormatFootnote.GetViewNumStr(*rWrt.m_pDoc, nullptr), - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OStringConcatenation(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_superscript), false ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OStringConcatenation(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_anchor), false ); @@ -361,7 +361,7 @@ void SwHTMLWriter::OutFootEndNotes() "<" + GetNamespace() + OOO_STRING_SVTOOLS_HTML_division " " OOO_STRING_SVTOOLS_HTML_O_id "=\""; Strm().WriteOString( sOut ); - HTMLOutFuncs::Out_String( Strm(), sFootnoteName, m_eDestEnc, &m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( Strm(), sFootnoteName, &m_aNonConvertableCharacters ); Strm().WriteCharPtr( "\">" ); m_bLFPossible = true; @@ -468,18 +468,18 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFormatFootnote& rFormatFootnote, sOut.append("<" + GetNamespace() + OOO_STRING_SVTOOLS_HTML_anchor " " OOO_STRING_SVTOOLS_HTML_O_class "=\""); Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( Strm(), sClass, m_eDestEnc, &m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( Strm(), sClass, &m_aNonConvertableCharacters ); sOut.append("\" " OOO_STRING_SVTOOLS_HTML_O_name "=\""); Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( Strm(), sFootnoteName, m_eDestEnc, &m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( Strm(), sFootnoteName, &m_aNonConvertableCharacters ); sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol "\" " OOO_STRING_SVTOOLS_HTML_O_href "=\"#"); Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( Strm(), sFootnoteName, m_eDestEnc, &m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( Strm(), sFootnoteName, &m_aNonConvertableCharacters ); sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor "\">"); Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( Strm(), rNum, m_eDestEnc, &m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( Strm(), rNum, &m_aNonConvertableCharacters ); HTMLOutFuncs::Out_AsciiTag( Strm(), OStringConcatenation(GetNamespace() + OOO_STRING_SVTOOLS_HTML_anchor), false ); } @@ -539,7 +539,7 @@ static void lcl_html_outFootEndNoteInfo( Writer& rWrt, OUString const *pParts, OOO_STRING_SVTOOLS_HTML_O_name "=\"" + pName + "\" " OOO_STRING_SVTOOLS_HTML_O_content "=\""; rWrt.Strm().WriteOString( sOut ); - HTMLOutFuncs::Out_String( rWrt.Strm(), aContent.makeStringAndClear(), rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), aContent.makeStringAndClear(), &rHTMLWrt.m_aNonConvertableCharacters ); rWrt.Strm().WriteCharPtr( "\">" ); } diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx index eeefc4e41c33..4912a8adc4da 100644 --- a/sw/source/filter/html/htmlplug.cxx +++ b/sw/source/filter/html/htmlplug.cxx @@ -1245,7 +1245,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_src "=\""); rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), aURL, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), aURL, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -1255,7 +1255,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_type "=\""); rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), aType, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), aType, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -1289,7 +1289,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_codebase "=\""); rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), sCodeBase, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), sCodeBase, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } } @@ -1300,7 +1300,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor aAny >>= aClass; sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_code "=\""); rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), aClass, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), aClass, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); // NAME @@ -1311,7 +1311,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_name "=\""); rWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), aAppletName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), aAppletName, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -1333,7 +1333,6 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor SfxFrameHTMLWriter::Out_FrameDescriptor( rWrt.Strm(), rWrt.GetBaseURL(), xSet, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); nFrameOpts = bInCntnr ? HTML_FRMOPTS_IFRAME_CNTNR @@ -1371,9 +1370,9 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor { const OUString& rValue = rCommand.GetArgument(); rWrt.Strm().WriteChar( ' ' ); - HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), rName, &rHTMLWrt.m_aNonConvertableCharacters ); rWrt.Strm().WriteCharPtr( "=\"" ); - HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ).WriteChar( '\"' ); + HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, &rHTMLWrt.m_aNonConvertableCharacters ).WriteChar( '\"' ); } else if( SwHtmlOptType::PARAM == nType ) { @@ -1397,10 +1396,10 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor " " OOO_STRING_SVTOOLS_HTML_O_name "=\""); rWrt.Strm().WriteOString( sBuf.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), rName, &rHTMLWrt.m_aNonConvertableCharacters ); sBuf.append("\" " OOO_STRING_SVTOOLS_HTML_O_value "=\""); rWrt.Strm().WriteOString( sBuf.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ).WriteCharPtr( "\">" ); + HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, &rHTMLWrt.m_aNonConvertableCharacters ).WriteCharPtr( "\">" ); } rHTMLWrt.DecIndentLevel(); // indent the applet content @@ -1427,9 +1426,9 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const SwFrameFormat& rFrameFor { const OUString& rValue = rCommand.GetArgument(); rWrt.Strm().WriteChar( ' ' ); - HTMLOutFuncs::Out_String( rWrt.Strm(), rName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), rName, &rHTMLWrt.m_aNonConvertableCharacters ); rWrt.Strm().WriteCharPtr( "=\"" ); - HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ).WriteChar( '\"' ); + HTMLOutFuncs::Out_String( rWrt.Strm(), rValue, &rHTMLWrt.m_aNonConvertableCharacters ).WriteChar( '\"' ); } } rHTMLWrt.Strm().WriteChar( '>' ); diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx index e39cb506ff10..89eb33fe56d8 100644 --- a/sw/source/filter/html/htmltabw.cxx +++ b/sw/source/filter/html/htmltabw.cxx @@ -452,7 +452,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt, if( bNumFormat || bValue ) { sOut.append(HTMLOutFuncs::CreateTableDataOptionsValNum(bValue, nValue, - nNumFormat, *rWrt.m_pDoc->GetNumberFormatter(), rWrt.m_eDestEnc, + nNumFormat, *rWrt.m_pDoc->GetNumberFormatter(), &rWrt.m_aNonConvertableCharacters)); } sOut.append('>'); @@ -718,7 +718,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign, .append(bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom) .append("\""); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OStringConcatenation(rWrt.GetNamespace() + sOutStr) ); - HTMLOutFuncs::Out_String( rWrt.Strm(), *pCaption, rWrt.m_eDestEnc, &rWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rWrt.Strm(), *pCaption, &rWrt.m_aNonConvertableCharacters ); HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OStringConcatenation(rWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_caption), false ); } diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 9ac3f2519660..a25bdcdf555b 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -125,7 +125,6 @@ SwHTMLWriter::SwHTMLWriter( const OUString& rBaseURL, std::u16string_view rFilte , m_nCSS1OutMode(0) , m_nCSS1Script(CSS1_OUTMODE_WESTERN) , m_nDirection(SvxFrameDirection::Horizontal_LR_TB) - , m_eDestEnc(RTL_TEXTENCODING_MS_1252) , m_eLang(LANGUAGE_DONTKNOW) , m_bCfgOutStyles( false ) , m_bCfgPreferStyles( false ) @@ -405,11 +404,6 @@ ErrCode SwHTMLWriter::WriteStream() m_eCSS1Unit = SW_MOD()->GetMetric( m_pDoc->getIDocumentSettingAccess().get(DocumentSettingId::HTML_MODE) ); - bool bWriteUTF8 = m_bWriteClipboardDoc; - m_eDestEnc = bWriteUTF8 ? RTL_TEXTENCODING_UTF8 : SvxHtmlOptions::GetTextEncoding(); - const char *pCharSet = rtl_getBestMimeCharsetFromTextEncoding( m_eDestEnc ); - m_eDestEnc = rtl_getTextEncodingFromMimeCharset( pCharSet ); - // Only for the MS-IE we favour the export of styles. m_bCfgPreferStyles = HTML_CFG_MSIE == m_nExportMode; @@ -518,7 +512,7 @@ ErrCode SwHTMLWriter::WriteStream() // save only the tag of section OString aName = HTMLOutFuncs::ConvertStringToHTML( - pSNd->GetSection().GetSectionName(), m_eDestEnc, + pSNd->GetSection().GetSectionName(), &m_aNonConvertableCharacters ); aStartTags = @@ -716,7 +710,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, { sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_id "=\""); rHTMLWrt.Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), rName, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), rName, &rHTMLWrt.m_aNonConvertableCharacters ); sOut.append('\"'); } @@ -740,13 +734,12 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, bool bURLContainsDelim = (-1 != aEncURL.indexOf( cDelim ) ); HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aEncURL, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); const char* const pDelim = "ÿ"; if( !aFilter.isEmpty() || !aSection.isEmpty() || bURLContainsDelim ) rHTMLWrt.Strm().WriteCharPtr( pDelim ); if( !aFilter.isEmpty() ) - HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aFilter, rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aFilter, &rHTMLWrt.m_aNonConvertableCharacters ); if( !aSection.isEmpty() || bURLContainsDelim ) rHTMLWrt.Strm().WriteCharPtr( pDelim ); if( !aSection.isEmpty() ) @@ -764,7 +757,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter& rHTMLWrt, nPos = aSection.indexOf( cDelim, nPos+3 ); } HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aSection, - rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters ); + &rHTMLWrt.m_aNonConvertableCharacters ); } sOut.append('\"'); } @@ -1102,7 +1095,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) // xDocProps may be null here (when copying) SfxFrameHTMLWriter::Out_DocInfo( Strm(), GetBaseURL(), xDocProps, - sIndent.getStr(), m_eDestEnc, + sIndent.getStr(), &m_aNonConvertableCharacters ); // comments and meta-tags of first paragraph @@ -1209,7 +1202,7 @@ void SwHTMLWriter::OutAnchor( const OUString& rName ) { sOut.append(OOO_STRING_SVTOOLS_HTML_O_name "=\""); Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( Strm(), rName, m_eDestEnc, &m_aNonConvertableCharacters ).WriteCharPtr( "\">" ); + HTMLOutFuncs::Out_String( Strm(), rName, &m_aNonConvertableCharacters ).WriteCharPtr( "\">" ); } else { @@ -1217,7 +1210,7 @@ void SwHTMLWriter::OutAnchor( const OUString& rName ) // spaces. sOut.append(OOO_STRING_SVTOOLS_HTML_O_id "=\""); Strm().WriteOString( sOut.makeStringAndClear() ); - HTMLOutFuncs::Out_String( Strm(), rName.replace(' ', '_'), m_eDestEnc, &m_aNonConvertableCharacters ).WriteCharPtr( "\">" ); + HTMLOutFuncs::Out_String( Strm(), rName.replace(' ', '_'), &m_aNonConvertableCharacters ).WriteCharPtr( "\">" ); } HTMLOutFuncs::Out_AsciiTag( Strm(), OStringConcatenation(GetNamespace() + OOO_STRING_SVTOOLS_HTML_anchor), false ); } @@ -1352,7 +1345,7 @@ OUString SwHTMLWriter::convertHyperlinkHRefValue(const OUString& rURL) void SwHTMLWriter::OutHyperlinkHRefValue( const OUString& rURL ) { OUString sURL = convertHyperlinkHRefValue(rURL); - HTMLOutFuncs::Out_String( Strm(), sURL, m_eDestEnc, &m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( Strm(), sURL, &m_aNonConvertableCharacters ); } void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic ) @@ -1382,7 +1375,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic } Strm().WriteCharPtr( " " OOO_STRING_SVTOOLS_HTML_O_background "=\"" ); Strm().WriteCharPtr( OOO_STRING_SVTOOLS_HTML_O_data ":" ); - HTMLOutFuncs::Out_String( Strm(), aGraphicInBase64, m_eDestEnc, &m_aNonConvertableCharacters ).WriteChar( '\"' ); + HTMLOutFuncs::Out_String( Strm(), aGraphicInBase64, &m_aNonConvertableCharacters ).WriteChar( '\"' ); } } else @@ -1393,7 +1386,7 @@ void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool bGraphic } OUString s( URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), GraphicURL)); Strm().WriteCharPtr(" " OOO_STRING_SVTOOLS_HTML_O_background "=\"" ); - HTMLOutFuncs::Out_String( Strm(), s, m_eDestEnc, &m_aNonConvertableCharacters ); + HTMLOutFuncs::Out_String( Strm(), s, &m_aNonConvertableCharacters ); Strm().WriteCharPtr("\""); } @@ -1440,7 +1433,7 @@ void SwHTMLWriter::OutLanguage( LanguageType nLang ) sOut.append("=\""); Strm().WriteOString( sOut.makeStringAndClear() ); HTMLOutFuncs::Out_String( Strm(), LanguageTag::convertToBcp47(nLang), - m_eDestEnc, &m_aNonConvertableCharacters ).WriteChar( '"' ); + &m_aNonConvertableCharacters ).WriteChar( '"' ); } SvxFrameDirection SwHTMLWriter::GetHTMLDirection( const SfxItemSet& rItemSet ) const diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 674b86d27ab1..937d7367907e 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -335,7 +335,6 @@ public: // that is not contained in class names) SvxFrameDirection m_nDirection; // the current direction - rtl_TextEncoding m_eDestEnc; LanguageType m_eLang; // description of the export configuration @@ -439,7 +438,7 @@ public: // output the FlyFrame anchored at current position bool OutFlyFrame( SwNodeOffset nNdIdx, sal_Int32 nContentIdx, - HtmlPosition nPos, HTMLOutContext *pContext = nullptr ); + HtmlPosition nPos ); void OutFrameFormat( AllHtmlFlags nType, const SwFrameFormat& rFormat, const SdrObject *pSdrObj ); |