diff options
Diffstat (limited to 'sw/source/filter/html')
| -rw-r--r-- | sw/source/filter/html/css1atr.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/html/htmlfld.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/htmlftn.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/html/htmlsect.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 0e0192063e31..1a5b304443e4 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -1135,10 +1135,10 @@ void SwHTMLWriter::PrepareFontList( const SvxFontItem& rFontItem, if( !rNames.isEmpty() ) rNames += ", "; if( cQuote && !bIsKeyword ) - rNames += OUStringLiteral1( cQuote ); + rNames += OUStringChar( cQuote ); rNames += aName; if( cQuote && !bIsKeyword ) - rNames += OUStringLiteral1( cQuote ); + rNames += OUStringChar( cQuote ); } } diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index ef27a0e91049..92ecf5578909 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -588,7 +588,7 @@ void SwHTMLParser::InsertCommentText( const sal_Char *pTag ) m_aContents += aToken; if( bEmpty && pTag ) { - m_aContents = OUStringLiteral("HTML: <") + OUStringLiteral1(*pTag) + ">" + m_aContents; + m_aContents = OUStringLiteral("HTML: <") + OUStringChar(*pTag) + ">" + m_aContents; } } diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx index f0f2f6c5ac0f..f543fd279fae 100644 --- a/sw/source/filter/html/htmlftn.cxx +++ b/sw/source/filter/html/htmlftn.cxx @@ -51,20 +51,20 @@ static sal_Int32 lcl_html_getNextPart( OUString& rPart, const OUString& rContent { case '\\': if( bQuoted ) - rPart += OUStringLiteral1( c ); + rPart += OUStringChar( c ); bQuoted = !bQuoted; break; case ';': if( bQuoted ) - rPart += OUStringLiteral1( c ); + rPart += OUStringChar( c ); else bDone = true; bQuoted = false; break; default: - rPart += OUStringLiteral1( c ); + rPart += OUStringChar( c ); bQuoted = false; break; } diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx index 0e0d6378ddfb..7e4e4a2358a8 100644 --- a/sw/source/filter/html/htmlsect.cxx +++ b/sw/source/filter/html/htmlsect.cxx @@ -291,7 +291,7 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken ) else { aURL = URIHelper::SmartRel2Abs(INetURLObject( m_sBaseURL ), aHRef.copy( 0, nPos ), Link<OUString *, bool>(), false ) - + OUStringLiteral1(sfx2::cTokenSeparator); + + OUStringChar(sfx2::cTokenSeparator); if( nPos2 == -1 ) { aURL += aHRef.copy( nPos+1 ); @@ -299,7 +299,7 @@ void SwHTMLParser::NewDivision( HtmlTokenId nToken ) else { aURL += aHRef.copy( nPos+1, nPos2 - (nPos+1) ) - + OUStringLiteral1(sfx2::cTokenSeparator) + + OUStringChar(sfx2::cTokenSeparator) + rtl::Uri::decode( aHRef.copy( nPos2+1 ), rtl_UriDecodeWithCharset, RTL_TEXTENCODING_ISO_8859_1 ); diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 9fc8d8298dd5..0f0b90fb6c9f 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -1211,7 +1211,7 @@ void SwHTMLWriter::OutImplicitMark( const OUString& rMark, { if( !rMark.isEmpty() && !m_aImplicitMarks.empty() ) { - OUString sMark(rMark + OUStringLiteral1(cMarkSeparator) + OUString::createFromAscii(pMarkType)); + OUString sMark(rMark + OUStringChar(cMarkSeparator) + OUString::createFromAscii(pMarkType)); if( 0 != m_aImplicitMarks.erase( sMark ) ) { OutAnchor(sMark.replace('?', '_')); // '?' causes problems in IE/Netscape 5 |