include/svtools/htmlout.hxx | 6 +--
sd/source/filter/html/htmlex.cxx | 5 ---
sw/source/filter/html/css1atr.cxx | 5 +--
sw/source/filter/html/htmlatr.cxx | 25 +++++-----------
sw/source/filter/html/htmlbas.cxx | 5 +--
sw/source/filter/html/htmldrawwriter.cxx | 3 -
sw/source/filter/html/htmlfldw.cxx | 18 ++++-------
sw/source/filter/html/htmlflywriter.cxx | 14 +++------
sw/source/filter/html/htmlforw.cxx | 47 +++++++++++--------------------
sw/source/filter/html/htmlftn.cxx | 21 ++++++-------
sw/source/filter/html/htmlplug.cxx | 25 +++++++---------
sw/source/filter/html/htmltabw.cxx | 5 +--
sw/source/filter/html/wrthtml.cxx | 31 +++++++-------------
sw/source/filter/html/wrthtml.hxx | 1
14 files changed, 84 insertions(+), 127 deletions(-)
New commits:
commit aeeacd28456c8c1f223342c45bf8c7199e3acd34
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Apr 6 20:11:23 2022 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Apr 6 20:09:22 2022 +0200
Drop write-only uses of pNonConvertableChars argument
Change-Id: Ibf60405868cfda08d125f63c45f8b74e52b32da4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132642
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 4207bcb4d2bc..8bd34b5f1d2a 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -44,12 +44,12 @@ struct HTMLOutEvent
struct HTMLOutFuncs
{
SVT_DLLPUBLIC static OString ConvertStringToHTML( const OUString& sSrc,
- OUString *pNonConvertableChars );
+ OUString *pNonConvertableChars = nullptr );
SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, std::string_view
rStr,
bool bOn = true);
SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_uInt32 cChar,
- OUString *pNonConvertableChars );
+ OUString *pNonConvertableChars = nullptr );
SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const OUString&,
OUString *pNonConvertableChars = nullptr );
SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uInt32 nHex,
sal_uInt8 nLen );
@@ -77,7 +77,7 @@ struct HTMLOutFuncs
// by an entry that consists only of 0s
SVT_DLLPUBLIC static SvStream& Out_Events( SvStream&, const
SvxMacroTableDtor&,
const HTMLOutEvent*, bool bOutStarBasic,
- OUString *pNonConvertableChars );
+ OUString *pNonConvertableChars = nullptr );
// <TD SDVAL="..." SDNUM="...">
SVT_DLLPUBLIC static OString CreateTableDataOptionsValNum(
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 9ceffc8a515a..e76925f82917 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1062,11 +1062,8 @@ OUString HtmlExport::DocumentMetadata() const
xDocProps.set(xDPS->getDocumentProperties());
}
- OUString aNonConvertableCharacters;
-
SfxFrameHTMLWriter::Out_DocInfo(aStream, maDocFileName, xDocProps,
- " ",
- &aNonConvertableCharacters);
+ " ");
const sal_uInt64 nLen = aStream.GetSize();
OSL_ENSURE(nLen < o3tl::make_unsigned(SAL_MAX_INT32), "Stream can't fit in
OString");
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 731381f1a071..040914222d77 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -350,10 +350,9 @@ void SwHTMLWriter::OutCSS1_Property( const char *pProp,
// for STYLE-Option encode string
Strm().WriteOString( sOut.makeStringAndClear() );
if( !sVal.empty() )
- HTMLOutFuncs::Out_String( Strm(), OUString::createFromAscii(sVal),
- &m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), OUString::createFromAscii(sVal)
);
else if( pSVal )
- HTMLOutFuncs::Out_String( Strm(), *pSVal,
&m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), *pSVal );
}
else
{
diff --git a/sw/source/filter/html/htmlatr.cxx
b/sw/source/filter/html/htmlatr.cxx
index 1467a92c3eb6..db17987ff468 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -895,8 +895,7 @@ static void OutHTML_SwFormat( Writer& rWrt, const SwFormat&
rFormat,
break;
}
}
- HTMLOutFuncs::Out_String( rWrt.Strm(), aClass,
- &rHWrt.m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aClass );
sOut += "\"";
}
rWrt.Strm().WriteOString( sOut );
@@ -2258,8 +2257,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const
SwContentNode& rNode )
// it for now.
if( !aOutlineText.isEmpty() )
- HTMLOutFuncs::Out_String( rWrt.Strm(), aOutlineText,
-
&rHTMLWrt.m_aNonConvertableCharacters);
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aOutlineText );
if( rHTMLWrt.m_pFormatFootnote )
{
@@ -2490,8 +2488,7 @@ Writer& OutHTML_SwTextNode( Writer& rWrt, const
SwContentNode& rNode )
if (!bConsumed)
{
- HTMLOutFuncs::Out_Char(rWrt.Strm(), c,
-
&rHTMLWrt.m_aNonConvertableCharacters);
+ HTMLOutFuncs::Out_Char(rWrt.Strm(), c);
}
}
@@ -2709,8 +2706,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_aNonConvertableCharacters)
+ HTMLOutFuncs::Out_String(rWrt.Strm(), aNames)
.WriteCharPtr("\">");
}
else
@@ -2718,7 +2714,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_aNonConvertableCharacters )
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aNames )
.WriteCharPtr( "\">" );
}
}
@@ -3028,8 +3024,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rINetFormat.GetName() );
sOut = "\"";
}
@@ -3038,7 +3033,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rTarget );
sOut = "\"";
}
@@ -3050,8 +3045,7 @@ Writer& OutHTML_INetFormat( Writer& rWrt, const
SwFormatINetFormat& rINetFormat,
if( bEvents )
HTMLOutFuncs::Out_Events( rWrt.Strm(), *pMacTable, aAnchorEventTable,
- rHTMLWrt.m_bCfgStarBasic,
- &rHTMLWrt.m_aNonConvertableCharacters
);
+ rHTMLWrt.m_bCfgStarBasic );
rWrt.Strm().WriteCharPtr( ">" );
return rWrt;
@@ -3160,8 +3154,7 @@ static Writer& OutHTML_SwTextCharFormat( Writer& rWrt,
const SfxPoolItem& rHt )
break;
}
}
- HTMLOutFuncs::Out_String( rWrt.Strm(), aClass,
-
&rHTMLWrt.m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aClass );
sOut = "\"";
}
sOut += ">";
diff --git a/sw/source/filter/html/htmlbas.cxx
b/sw/source/filter/html/htmlbas.cxx
index 098233e5dbfc..e8a380efd78f 100644
--- a/sw/source/filter/html/htmlbas.cxx
+++ b/sw/source/filter/html/htmlbas.cxx
@@ -292,8 +292,7 @@ void SwHTMLWriter::OutBasic(const SwHTMLWriter & rHTMLWrt)
Strm().WriteCharPtr( SAL_NEWLINE_STRING ); // don't indent!
HTMLOutFuncs::OutScript( Strm(), GetBaseURL(),
pModule->GetSource32(),
sLang, STARBASIC, OUString(),
- &rLibName, &rModName,
- &m_aNonConvertableCharacters );
+ &rLibName, &rModName );
}
}
#endif
@@ -325,7 +324,7 @@ void SwHTMLWriter::OutBasicBodyEvents()
if( !aDocTable.empty() )
HTMLOutFuncs::Out_Events( Strm(), aDocTable, aBodyEventTable,
- m_bCfgStarBasic,
&m_aNonConvertableCharacters );
+ m_bCfgStarBasic );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmldrawwriter.cxx
b/sw/source/filter/html/htmldrawwriter.cxx
index 8ba6299b99c8..28e34c6c3cd6 100644
--- a/sw/source/filter/html/htmldrawwriter.cxx
+++ b/sw/source/filter/html/htmldrawwriter.cxx
@@ -273,8 +273,7 @@ Writer& OutHTML_DrawFrameFormatAsMarquee( Writer& rWrt,
aOutliner.SetText( *pOutlinerParaObj );
OUString aText( aOutliner.GetText( aOutliner.GetParagraph(0),
aOutliner.GetParagraphCount() ) );
- HTMLOutFuncs::Out_String( rWrt.Strm(), aText,
- &rHTMLWrt.m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aText );
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 a28ffade717f..91fa6120eae2 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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aName );
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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aValue );
sOut.append('\"');
}
if( bNumFormat )
@@ -301,8 +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_aNonConvertableCharacters));
+ *rHTMLWrt.m_pDoc->GetNumberFormatter()));
}
if( bFixed )
{
@@ -408,8 +407,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const
SwField* pField,
}
}
- HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.copy( nPos,
nChunkLen ),
- &rHTMLWrt.m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.copy( nPos,
nChunkLen ) );
rHTMLWrt.m_bTagOn = false;
while( nItems )
@@ -418,8 +416,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const
SwField* pField,
}
else
{
- HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.copy( nPos,
nChunkLen ),
- &rHTMLWrt.m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.copy( nPos,
nChunkLen ) );
}
nPos = nEndPos;
}
@@ -427,8 +424,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const
SwField* pField,
}
else
{
- HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand,
- &rHTMLWrt.m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand );
}
// Output the closing tag.
@@ -531,7 +527,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_aNonConvertableCharacters );
+ aURL, nullptr, nullptr );
if( rHTMLWrt.m_bLFPossible )
rHTMLWrt.OutNewLine( true );
diff --git a/sw/source/filter/html/htmlflywriter.cxx
b/sw/source/filter/html/htmlflywriter.cxx
index ba7c67200f5b..2ad597aea80d 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -527,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), rFrameFormat.GetName() );
sOut.append('\"');
}
@@ -544,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), rAlternateText );
sOut.append('\"');
}
@@ -1176,16 +1176,14 @@ OUString lclWriteOutImap(SwHTMLWriter& rHTMLWrt, const
SfxItemSet& rItemSet, con
HTMLOutFuncs::Out_ImageMap( rHTMLWrt.Strm(),
rHTMLWrt.GetBaseURL(), aScaledIMap, aIMapName,
aIMapEventTable,
rHTMLWrt.m_bCfgStarBasic,
- SAL_NEWLINE_STRING, pIndArea, pIndMap,
- &rHTMLWrt.m_aNonConvertableCharacters
);
+ SAL_NEWLINE_STRING, pIndArea, pIndMap
);
}
else
{
HTMLOutFuncs::Out_ImageMap( rHTMLWrt.Strm(),
rHTMLWrt.GetBaseURL(), *pIMap, aIMapName,
aIMapEventTable,
rHTMLWrt.m_bCfgStarBasic,
- SAL_NEWLINE_STRING, pIndArea, pIndMap,
- &rHTMLWrt.m_aNonConvertableCharacters
);
+ SAL_NEWLINE_STRING, pIndArea, pIndMap
);
}
}
return aIMapName;
@@ -1494,14 +1492,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aLink );
}
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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64 );
sOut.append(");");
}
sOut.append('\"');
diff --git a/sw/source/filter/html/htmlforw.cxx
b/sw/source/filter/html/htmlforw.cxx
index da838b3bdfd2..e810c2420101 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -79,8 +79,7 @@ const HtmlFrmOpts HTML_FRMOPTS_IMG_CONTROL_CSS1 =
static void lcl_html_outEvents( SvStream& rStrm,
const uno::Reference< form::XFormComponent >&
rFormComp,
- bool bCfgStarBasic,
- OUString *pNonConvertableChars )
+ bool bCfgStarBasic )
{
uno::Reference< uno::XInterface > xParentIfc = rFormComp->getParent();
OSL_ENSURE( xParentIfc.is(), "lcl_html_outEvents: no parent interface" );
@@ -175,7 +174,7 @@ static void lcl_html_outEvents( SvStream& rStrm,
}
sOut += "=\"";
rStrm.WriteOString( sOut );
- HTMLOutFuncs::Out_String( rStrm, rDesc.ScriptCode,
pNonConvertableChars );
+ HTMLOutFuncs::Out_String( rStrm, rDesc.ScriptCode );
rStrm.WriteChar( '\"' );
if( EXTENDED_STYPE == eScriptType &&
!rDesc.AddListenerParam.isEmpty() )
@@ -184,8 +183,7 @@ static void lcl_html_outEvents( SvStream& rStrm,
OUStringToOString(sListener, RTL_TEXTENCODING_ASCII_US) + "-" +
OUStringToOString(sMethod, RTL_TEXTENCODING_ASCII_US) + "=\"";
rStrm.WriteOString( sOut );
- HTMLOutFuncs::Out_String( rStrm, rDesc.AddListenerParam,
- pNonConvertableChars );
+ HTMLOutFuncs::Out_String( rStrm, rDesc.AddListenerParam );
rStrm.WriteChar( '\"' );
}
}
@@ -456,8 +454,7 @@ void SwHTMLWriter::OutForm( bool bOn,
{
sOut += " " OOO_STRING_SVTOOLS_HTML_O_name "=\"";
Strm().WriteOString( sOut );
- HTMLOutFuncs::Out_String( Strm(), *s,
- &m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), *s );
sOut = "\"";
}
}
@@ -471,7 +468,7 @@ void SwHTMLWriter::OutForm( bool bOn,
Strm().WriteOString( sOut );
OUString aURL
= URIHelper::simpleNormalizedMakeRelative( GetBaseURL(), *s);
- HTMLOutFuncs::Out_String( Strm(), aURL,
&m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), aURL );
sOut = "\"";
}
}
@@ -515,15 +512,14 @@ void SwHTMLWriter::OutForm( bool bOn,
{
sOut += " " OOO_STRING_SVTOOLS_HTML_O_target "=\"";
Strm().WriteOString( sOut );
- HTMLOutFuncs::Out_String( Strm(), *s,
- &m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), *s );
sOut = "\"";
}
}
Strm().WriteOString( sOut );
uno::Reference< form::XFormComponent > xFormComp( rFormComps,
uno::UNO_QUERY );
- lcl_html_outEvents( Strm(), xFormComp, m_bCfgStarBasic,
&m_aNonConvertableCharacters );
+ lcl_html_outEvents( Strm(), xFormComp, m_bCfgStarBasic );
Strm().WriteChar( '>' );
IncIndentLevel(); // indent content of form
@@ -585,8 +581,7 @@ void SwHTMLWriter::OutHiddenControls(
{
sOut += " " OOO_STRING_SVTOOLS_HTML_O_name "=\"";
Strm().WriteOString( sOut );
- HTMLOutFuncs::Out_String( Strm(), *s,
- &m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), *s );
sOut = "\"";
}
}
@@ -597,8 +592,7 @@ void SwHTMLWriter::OutHiddenControls(
{
sOut += " " OOO_STRING_SVTOOLS_HTML_O_value "=\"";
Strm().WriteOString( sOut );
- HTMLOutFuncs::Out_String( Strm(), *s,
- &m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), *s );
sOut = "\"";
}
}
@@ -938,8 +932,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), *s );
sOut = "\"";
}
}
@@ -957,7 +950,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sValue );
sOut = "\"";
}
@@ -974,8 +967,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
rWrt.Strm().WriteOString( sOut );
HTMLOutFuncs::Out_String( rWrt.Strm(),
- URIHelper::simpleNormalizedMakeRelative(
rWrt.GetBaseURL(), *s),
- &rHTMLWrt.m_aNonConvertableCharacters );
+ URIHelper::simpleNormalizedMakeRelative(
rWrt.GetBaseURL(), *s) );
sOut = "\"";
}
}
@@ -1145,8 +1137,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_aNonConvertableCharacters );
+ lcl_html_outEvents( rWrt.Strm(), xFormComp, rHTMLWrt.m_bCfgStarBasic );
rWrt.Strm().WriteChar( '>' );
@@ -1205,8 +1196,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sVal );
sOut = "\"";
}
if( bSelected )
@@ -1215,8 +1205,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
sOut += ">";
rWrt.Strm().WriteOString( sOut );
- HTMLOutFuncs::Out_String( rWrt.Strm(), pStrings[i],
-
&rHTMLWrt.m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), pStrings[i] );
}
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
OStringConcatenation(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_option),
false );
@@ -1246,8 +1235,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
if( nPos )
rWrt.Strm().WriteCharPtr( SAL_NEWLINE_STRING );
OUString aLine = sVal.getToken( 0, 0x0A, nPos );
- HTMLOutFuncs::Out_String( rWrt.Strm(), aLine,
- &rHTMLWrt.m_aNonConvertableCharacters
);
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aLine );
}
}
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
OStringConcatenation(rHTMLWrt.GetNamespace() +
OOO_STRING_SVTOOLS_HTML_textarea), false );
@@ -1259,8 +1247,7 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
{
if( !s->isEmpty() )
{
- HTMLOutFuncs::Out_String( rWrt.Strm(), *s,
- &rHTMLWrt.m_aNonConvertableCharacters ).WriteChar( ' ' );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), *s ).WriteChar( ' ' );
}
}
}
diff --git a/sw/source/filter/html/htmlftn.cxx
b/sw/source/filter/html/htmlftn.cxx
index 6702a80efe3f..e0e442de81ac 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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sClass );
sOut.append("\" " OOO_STRING_SVTOOLS_HTML_O_name "=\"");
rWrt.Strm().WriteOString( sOut.makeStringAndClear() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName,
&rHTMLWrt.m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName );
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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sFootnoteName );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol "\"");
if( !rFormatFootnote.GetNumStr().isEmpty() )
sOut.append(" " OOO_STRING_SVTOOLS_HTML_O_sdfixed);
@@ -320,8 +320,7 @@ Writer& OutHTML_SwFormatFootnote( Writer& rWrt, const
SfxPoolItem& rHt )
rWrt.Strm().WriteOString( sOut.makeStringAndClear() );
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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(),
rFormatFootnote.GetViewNumStr(*rWrt.m_pDoc, nullptr) );
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 +360,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sFootnoteName );
Strm().WriteCharPtr( "\">" );
m_bLFPossible = true;
@@ -468,18 +467,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sClass );
sOut.append("\" " OOO_STRING_SVTOOLS_HTML_O_name "=\"");
Strm().WriteOString( sOut.makeStringAndClear() );
- HTMLOutFuncs::Out_String( Strm(), sFootnoteName,
&m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sFootnoteName );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_symbol "\" "
OOO_STRING_SVTOOLS_HTML_O_href "=\"#");
Strm().WriteOString( sOut.makeStringAndClear() );
- HTMLOutFuncs::Out_String( Strm(), sFootnoteName,
&m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sFootnoteName );
sOut.append(OOO_STRING_SVTOOLS_HTML_FTN_anchor "\">");
Strm().WriteOString( sOut.makeStringAndClear() );
- HTMLOutFuncs::Out_String( Strm(), rNum, &m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), rNum );
HTMLOutFuncs::Out_AsciiTag( Strm(), OStringConcatenation(GetNamespace() +
OOO_STRING_SVTOOLS_HTML_anchor), false );
}
@@ -539,7 +538,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aContent.makeStringAndClear() );
rWrt.Strm().WriteCharPtr( "\">" );
}
diff --git a/sw/source/filter/html/htmlplug.cxx
b/sw/source/filter/html/htmlplug.cxx
index 4912a8adc4da..eacb1647361f 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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aURL );
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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aType );
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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), sCodeBase );
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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aClass );
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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), aAppletName );
sOut.append('\"');
}
@@ -1332,8 +1332,7 @@ Writer& OutHTML_FrameFormatOLENode( Writer& rWrt, const
SwFrameFormat& rFrameFor
rWrt.Strm().WriteOString( sOut.makeStringAndClear() );
SfxFrameHTMLWriter::Out_FrameDescriptor( rWrt.Strm(),
rWrt.GetBaseURL(),
- xSet,
- &rHTMLWrt.m_aNonConvertableCharacters
);
+ xSet );
nFrameOpts = bInCntnr ? HTML_FRMOPTS_IFRAME_CNTNR
: HTML_FRMOPTS_IFRAME;
@@ -1370,9 +1369,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rName );
rWrt.Strm().WriteCharPtr( "=\"" );
- HTMLOutFuncs::Out_String( rWrt.Strm(), rValue,
&rHTMLWrt.m_aNonConvertableCharacters ).WriteChar( '\"' );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rValue ).WriteChar(
'\"' );
}
else if( SwHtmlOptType::PARAM == nType )
{
@@ -1396,10 +1395,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rName );
sBuf.append("\" " OOO_STRING_SVTOOLS_HTML_O_value "=\"");
rWrt.Strm().WriteOString( sBuf.makeStringAndClear() );
- HTMLOutFuncs::Out_String( rWrt.Strm(), rValue,
&rHTMLWrt.m_aNonConvertableCharacters ).WriteCharPtr( "\">" );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rValue ).WriteCharPtr(
"\">" );
}
rHTMLWrt.DecIndentLevel(); // indent the applet content
@@ -1426,9 +1425,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rName );
rWrt.Strm().WriteCharPtr( "=\"" );
- HTMLOutFuncs::Out_String( rWrt.Strm(), rValue,
&rHTMLWrt.m_aNonConvertableCharacters ).WriteChar( '\"' );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), rValue ).WriteChar(
'\"' );
}
}
rHTMLWrt.Strm().WriteChar( '>' );
diff --git a/sw/source/filter/html/htmltabw.cxx
b/sw/source/filter/html/htmltabw.cxx
index 89eb33fe56d8..e1bb62dd0969 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -452,8 +452,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
if( bNumFormat || bValue )
{
sOut.append(HTMLOutFuncs::CreateTableDataOptionsValNum(bValue, nValue,
- nNumFormat, *rWrt.m_pDoc->GetNumberFormatter(),
- &rWrt.m_aNonConvertableCharacters));
+ nNumFormat, *rWrt.m_pDoc->GetNumberFormatter()));
}
sOut.append('>');
rWrt.Strm().WriteOString( sOut.makeStringAndClear() );
@@ -718,7 +717,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), *pCaption );
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 a25bdcdf555b..2c0186c22b1f 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -512,8 +512,7 @@ ErrCode SwHTMLWriter::WriteStream()
// save only the tag of section
OString aName = HTMLOutFuncs::ConvertStringToHTML(
- pSNd->GetSection().GetSectionName(),
- &m_aNonConvertableCharacters );
+ pSNd->GetSection().GetSectionName() );
aStartTags =
"<" + GetNamespace() + OOO_STRING_SVTOOLS_HTML_division
@@ -622,8 +621,6 @@ ErrCode SwHTMLWriter::WriteStream()
for(OUString & s : m_aBulletGrfs)
s.clear();
- m_aNonConvertableCharacters.clear();
-
if( m_bShowProgress )
::EndProgress( m_pDoc->GetDocShell() );
@@ -710,7 +707,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), rName );
sOut.append('\"');
}
@@ -733,13 +730,12 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter&
rHTMLWrt,
sal_Unicode cDelim = 255U;
bool bURLContainsDelim = (-1 != aEncURL.indexOf( cDelim ) );
- HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aEncURL,
- &rHTMLWrt.m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aEncURL );
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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aFilter );
if( !aSection.isEmpty() || bURLContainsDelim )
rHTMLWrt.Strm().WriteCharPtr( pDelim );
if( !aSection.isEmpty() )
@@ -756,8 +752,7 @@ static void lcl_html_OutSectionStartTag( SwHTMLWriter&
rHTMLWrt,
aSection = aSection.replaceAt(nPos, 1, u"%FF" );
nPos = aSection.indexOf( cDelim, nPos+3 );
}
- HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aSection,
- &rHTMLWrt.m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( rHTMLWrt.Strm(), aSection );
}
sOut.append('\"');
}
@@ -1095,8 +1090,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16
&rHeaderAttrs )
// xDocProps may be null here (when copying)
SfxFrameHTMLWriter::Out_DocInfo( Strm(), GetBaseURL(), xDocProps,
- sIndent.getStr(),
- &m_aNonConvertableCharacters );
+ sIndent.getStr() );
// comments and meta-tags of first paragraph
rHeaderAttrs = OutHeaderAttrs();
@@ -1202,7 +1196,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_aNonConvertableCharacters
).WriteCharPtr( "\">" );
+ HTMLOutFuncs::Out_String( Strm(), rName ).WriteCharPtr( "\">" );
}
else
{
@@ -1210,7 +1204,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_aNonConvertableCharacters ).WriteCharPtr( "\">" );
+ HTMLOutFuncs::Out_String( Strm(), rName.replace(' ', '_')
).WriteCharPtr( "\">" );
}
HTMLOutFuncs::Out_AsciiTag( Strm(), OStringConcatenation(GetNamespace() +
OOO_STRING_SVTOOLS_HTML_anchor), false );
}
@@ -1345,7 +1339,7 @@ OUString SwHTMLWriter::convertHyperlinkHRefValue(const
OUString& rURL)
void SwHTMLWriter::OutHyperlinkHRefValue( const OUString& rURL )
{
OUString sURL = convertHyperlinkHRefValue(rURL);
- HTMLOutFuncs::Out_String( Strm(), sURL, &m_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), sURL );
}
void SwHTMLWriter::OutBackground( const SvxBrushItem *pBrushItem, bool
bGraphic )
@@ -1375,7 +1369,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_aNonConvertableCharacters ).WriteChar( '\"' );
+ HTMLOutFuncs::Out_String( Strm(), aGraphicInBase64 ).WriteChar(
'\"' );
}
}
else
@@ -1386,7 +1380,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_aNonConvertableCharacters );
+ HTMLOutFuncs::Out_String( Strm(), s );
Strm().WriteCharPtr("\"");
}
@@ -1432,8 +1426,7 @@ void SwHTMLWriter::OutLanguage( LanguageType nLang )
sOut.append(OOO_STRING_SVTOOLS_HTML_O_lang);
sOut.append("=\"");
Strm().WriteOString( sOut.makeStringAndClear() );
- HTMLOutFuncs::Out_String( Strm(), LanguageTag::convertToBcp47(nLang),
- &m_aNonConvertableCharacters ).WriteChar( '"' );
+ HTMLOutFuncs::Out_String( Strm(), LanguageTag::convertToBcp47(nLang)
).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 937d7367907e..0ad4728dc143 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -294,7 +294,6 @@ public:
std::optional<std::vector<SwTextFootnote*>> m_xFootEndNotes;
OUString m_aCSS1Selector; // style selector
- OUString m_aNonConvertableCharacters;
OUString m_aBulletGrfs[MAXLEVEL]; // list graphics
css::uno::Reference<css::container::XIndexContainer> mxFormComps; //
current form
