summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/ascii/ascatr.cxx2
-rw-r--r--sw/source/filter/html/css1atr.cxx4
-rw-r--r--sw/source/filter/html/htmlfld.cxx2
-rw-r--r--sw/source/filter/html/htmlftn.cxx6
-rw-r--r--sw/source/filter/html/htmlsect.cxx4
-rw-r--r--sw/source/filter/html/wrthtml.cxx2
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx6
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx6
-rw-r--r--sw/source/filter/xml/xmltbli.cxx4
14 files changed, 24 insertions, 24 deletions
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 3da9c5a2117b..9490e1bfc926 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -339,7 +339,7 @@ static Writer& OutASC_SwTextNode( Writer& rWrt, SwContentNode& rNode )
}
OUString aOutStr(buf.makeStringAndClear());
if ( !bExportSoftHyphens )
- aOutStr = aOutStr.replaceAll(OUStringLiteral1(CHAR_SOFTHYPHEN), "");
+ aOutStr = aOutStr.replaceAll(OUStringChar(CHAR_SOFTHYPHEN), "");
// all INWORD/BREAKWORD should be already removed by OutAttr
// but the field-marks are not attributes so filter those
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
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 866cc7f0c863..7bbf9179b211 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6675,7 +6675,7 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8 nLevel,
aBuffer.append( pPrev, pIt - pPrev );
// If bullet char is empty, set lvlText as empty
- if ( rNumberingString == OUStringLiteral1(0) && nNumberingType == SVX_NUM_CHAR_SPECIAL )
+ if ( rNumberingString == OUStringChar(0) && nNumberingType == SVX_NUM_CHAR_SPECIAL )
{
m_pSerializer->singleElementNS(XML_w, XML_lvlText, FSNS(XML_w, XML_val), "");
}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 65c1158686e0..1fdbcd307541 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -517,7 +517,7 @@ void RtfAttributeOutput::StartRuby(const SwTextNode& rNode, sal_Int32 nPos,
aStr += " \\o";
if (aWW8Ruby.GetDirective())
{
- aStr += "\\a" + OUStringLiteral1(aWW8Ruby.GetDirective());
+ aStr += "\\a" + OUStringChar(aWW8Ruby.GetDirective());
}
aStr += "(\\s\\up ";
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index ad1768d25d84..08e29ddb1a8f 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -837,7 +837,7 @@ void WW8AttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 /*nPos*/,
aStr += " \\o";
if (aWW8Ruby.GetDirective())
{
- aStr += OUStringLiteral("\\a") + OUStringLiteral1(aWW8Ruby.GetDirective());
+ aStr += OUStringLiteral("\\a") + OUStringChar(aWW8Ruby.GetDirective());
}
aStr += "(\\s\\up ";
@@ -1241,7 +1241,7 @@ void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAt
break;
case TOX_USER:
- sText += "\" \\f \"" + OUStringLiteral1(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) ));
+ sText += "\" \\f \"" + OUStringChar(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) ));
[[fallthrough]];
case TOX_CONTENT:
{
@@ -1725,7 +1725,7 @@ OUString SwWW8AttrIter::GetSnippet(const OUString &rStr, sal_Int32 nCurrentPos,
rStr, nCurrentPos, g_pBreakIt->GetLocale(nLanguage),
i18n::WordType::ANYWORD_IGNOREWHITESPACES ) )
{
- aSnippet = OUStringLiteral1(rStr[nCurrentPos]) + aSnippet.copy(1);
+ aSnippet = OUStringChar(rStr[nCurrentPos]) + aSnippet.copy(1);
}
}
m_rExport.m_aCurrentCharPropStarts.pop();
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 4f959c18a28b..8672ec47de69 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2289,7 +2289,7 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
if( TOX_USER == pTOX->GetType() )
{
sStr += "\""
- + OUStringLiteral1(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *pTOX->GetTOXType() ) ))
+ + OUStringChar(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *pTOX->GetTOXType() ) ))
+ sEntryEnd;
}
}
@@ -2799,7 +2799,7 @@ void AttributeOutputBase::TextField( const SwFormatField& rField )
SwDBData aData = GetExport().m_pDoc->GetDBData();
const OUString sStr = FieldString(ww::eDATABASE)
+ aData.sDataSource
- + OUStringLiteral1(DB_DELIM)
+ + OUStringChar(DB_DELIM)
+ aData.sCommand;
GetExport().OutputField(pField, ww::eDATABASE, sStr);
}
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 936bf6789018..b02d1441e691 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -200,7 +200,7 @@ sal_uInt16 SwWW8ImplReader::End_Footnote()
//There should have been a footnote char, we will replace this.
if (pText && nPos)
{
- sChar += OUStringLiteral1(pText->GetText()[--nPos]);
+ sChar += OUStringChar(pText->GetText()[--nPos]);
m_pPaM->SetMark();
--m_pPaM->GetMark()->nContent;
std::shared_ptr<SwUnoCursor> xLastAnchorCursor(m_pLastAnchorPos ? m_rDoc.CreateUnoCursor(*m_pLastAnchorPos) : nullptr);
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 3b5deed3e5ff..d9cce7602e21 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -485,7 +485,7 @@ static void lcl_CopyGreaterEight(OUString &rDest, OUString const &rSrc,
{
sal_Unicode nChar = rSrc[nI];
if (nChar > WW8ListManager::nMaxLevel)
- rDest += OUStringLiteral1(nChar);
+ rDest += OUStringChar(nChar);
}
}
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 3cd069d56dba..1c27d73c3021 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -2483,8 +2483,8 @@ eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* /*pF*/, OUString& rSt
{
// Section from Source (no switch)?
ConvertUFName(aBook);
- aPara += OUStringLiteral1(sfx2::cTokenSeparator)
- + OUStringLiteral1(sfx2::cTokenSeparator) + aBook;
+ aPara += OUStringChar(sfx2::cTokenSeparator)
+ + OUStringChar(sfx2::cTokenSeparator) + aBook;
}
/*
@@ -2874,7 +2874,7 @@ static void lcl_toxMatchTSwitch(SwWW8ImplReader const & rReader, SwTOXBase& rBas
OUString sStyles( rBase.GetStyleNames( nLevel ) );
if( !sStyles.isEmpty() )
- sStyles += OUStringLiteral1(TOX_STYLE_DELIMITER);
+ sStyles += OUStringChar(TOX_STYLE_DELIMITER);
sStyles += sTemplate;
rBase.SetStyleNames( sStyles, nLevel );
}
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 3f6fff362ff6..ed0049353326 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1117,9 +1117,9 @@ static SwDDEFieldType* lcl_GetDDEFieldType(SwXMLDDETableContext_Impl* pContext,
{
// make command string
const OUString sCommand(pContext->GetDDEApplication()
- + OUStringLiteral1(sfx2::cTokenSeparator)
+ + OUStringChar(sfx2::cTokenSeparator)
+ pContext->GetDDEItem()
- + OUStringLiteral1(sfx2::cTokenSeparator)
+ + OUStringChar(sfx2::cTokenSeparator)
+ pContext->GetDDETopic());
const SfxLinkUpdateMode nType = pContext->GetIsAutomaticUpdate()
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 04:31:53 +0000