summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/html/css1atr.cxx8
-rw-r--r--sw/source/filter/html/htmlatr.cxx6
-rw-r--r--sw/source/filter/html/htmlfld.cxx3
-rw-r--r--sw/source/filter/html/htmlforw.cxx16
-rw-r--r--sw/source/filter/html/htmlnumwriter.cxx2
-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.cxx4
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx2
11 files changed, 24 insertions, 25 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 892569bcd0db..0e0192063e31 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -328,7 +328,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
sOut.append("; ");
}
- sOut.append(OString(pProp) + ": ");
+ sOut.append(pProp + OStringLiteral(": "));
if( m_nCSS1OutMode & CSS1_OUTMODE_ENCODE )
{
// for STYLE-Option encode string
@@ -2472,7 +2472,7 @@ static Writer& OutCSS1_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt )
return rWrt;
sal_uInt32 nHeight = static_cast<const SvxFontHeightItem&>(rHt).GetHeight();
- OString sHeight(OString::number(nHeight/20) + OString(sCSS1_UNIT_pt));
+ OString sHeight(OString::number(nHeight/20) + sCSS1_UNIT_pt);
rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_font_size, sHeight);
return rWrt;
@@ -2533,7 +2533,7 @@ static Writer& OutCSS1_SvxKerning( Writer& rWrt, const SfxPoolItem& rHt )
// Width as n.n pt
nValue = (nValue + 1) / 2; // 1/10pt
sOut.append(OString::number(nValue / 10) + "." + OString::number(nValue % 10) +
- OString(sCSS1_UNIT_pt));
+ sCSS1_UNIT_pt);
rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_letter_spacing,
sOut.makeStringAndClear());
@@ -3332,7 +3332,7 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt,
// width in n.nn pt
sOut.append(OString::number(nWidth / 100) + "." + OString::number((nWidth/10) % 10) +
- OString::number(nWidth % 10) + OString(sCSS1_UNIT_pt));
+ OString::number(nWidth % 10) + sCSS1_UNIT_pt);
}
// Line-Style: solid or double
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index a50b3f7836b8..cc2d0753b32b 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -2980,7 +2980,7 @@ Writer& OutHTML_INetFormat( Writer& rWrt, const SwFormatINetFormat& rINetFormat,
pStr = "ctl";
break;
}
- sOut += OString(pStr) + "\"";
+ sOut += pStr + OStringLiteral("\"");
}
rWrt.Strm().WriteOString( sOut );
@@ -3177,8 +3177,8 @@ static Writer& OutHTML_SvxAdjust( Writer& rWrt, const SfxPoolItem& rHt )
}
if( pStr )
{
- OString sOut = " " OOO_STRING_SVTOOLS_HTML_O_align "=\"" +
- OString(pStr) + "\"";
+ OString sOut = OStringLiteral(" " OOO_STRING_SVTOOLS_HTML_O_align "=\"") +
+ pStr + "\"";
rWrt.Strm().WriteOString( sOut );
}
diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx
index db7edb38a868..54bd87050034 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -588,8 +588,7 @@ void SwHTMLParser::InsertCommentText( const sal_Char *pTag )
m_aContents += aToken;
if( bEmpty && pTag )
{
- OUString aTmp( m_aContents );
- m_aContents = "HTML: <" + OUString( *pTag ) + ">" + aTmp;
+ m_aContents = OUStringLiteral("HTML: <") + OUStringLiteral1(*pTag) + ">" + m_aContents;
}
}
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 3b01bcf938a6..a8468320b5e9 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -176,7 +176,7 @@ static void lcl_html_outEvents( SvStream& rStrm,
sOut += OString(pOpt);
else
{
- sOut += OString(OOO_STRING_SVTOOLS_HTML_O_sdevent) +
+ sOut += OOO_STRING_SVTOOLS_HTML_O_sdevent +
OUStringToOString(sListener, RTL_TEXTENCODING_ASCII_US) + "-" +
OUStringToOString(sMethod, RTL_TEXTENCODING_ASCII_US);
}
@@ -510,8 +510,8 @@ void SwHTMLWriter::OutForm( bool bOn,
if( pStr )
{
- sOut += " " OOO_STRING_SVTOOLS_HTML_O_enctype "=\"" +
- OString(pStr) + "\"";
+ sOut += OStringLiteral(" " OOO_STRING_SVTOOLS_HTML_O_enctype "=\"") +
+ pStr + "\"";
}
}
@@ -853,8 +853,8 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
auto b = o3tl::tryAccess<bool>(aTmp2);
pWrapStr = (b && *b) ? OOO_STRING_SVTOOLS_HTML_WW_hard
: OOO_STRING_SVTOOLS_HTML_WW_soft;
- sOptions += " " OOO_STRING_SVTOOLS_HTML_O_wrap "=\"" +
- OString(pWrapStr) + "\"";
+ sOptions += OStringLiteral(" " OOO_STRING_SVTOOLS_HTML_O_wrap "=\"") +
+ pWrapStr + "\"";
}
}
else
@@ -931,11 +931,11 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt,
if( eTag == TAG_NONE )
return rWrt;
- OString sOut = "<" + OString(TagNames[eTag]);
+ OString sOut = OStringLiteral("<") + TagNames[eTag];
if( eType != TYPE_NONE )
{
- sOut += " " OOO_STRING_SVTOOLS_HTML_O_type "=\"" +
- OString(TypeNames[eType]) + "\"";
+ sOut += OStringLiteral(" " OOO_STRING_SVTOOLS_HTML_O_type "=\"") +
+ TypeNames[eType] + "\"";
}
aTmp = xPropSet->getPropertyValue("Name");
diff --git a/sw/source/filter/html/htmlnumwriter.cxx b/sw/source/filter/html/htmlnumwriter.cxx
index c4fd8ea9bdf7..22c63e29ec78 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -212,7 +212,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
if( pStr )
{
- sOut += " " OOO_STRING_SVTOOLS_HTML_O_type "=\"" + OString(pStr) + "\"";
+ sOut += OStringLiteral(" " OOO_STRING_SVTOOLS_HTML_O_type "=\"") + pStr + "\"";
}
}
else if( SVX_NUM_BITMAP == eType )
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 0bc8cc347d64..2ccdcc932ab9 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -910,7 +910,7 @@ static void OutBodyColor( const sal_Char* pTag, const SwFormat *pFormat,
if( pColorItem )
{
OStringBuffer sOut;
- sOut.append(" " + OString(pTag) + "=");
+ sOut.append(OStringLiteral(" ") + pTag + "=");
rHWrt.Strm().WriteOString( sOut.makeStringAndClear() );
Color aColor( pColorItem->GetValue() );
if( COL_AUTO == aColor )
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 27b3bb1a4c62..196970c2b4da 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6378,7 +6378,7 @@ void DocxAttributeOutput::FontCharset( sal_uInt8 nCharSet, rtl_TextEncoding nEnc
OString aCharSet( OString::number( nCharSet, 16 ) );
if ( aCharSet.getLength() == 1 )
- aCharSet = OString( "0" ) + aCharSet;
+ aCharSet = "0" + aCharSet;
pAttr->add( FSNS( XML_w, XML_val ), aCharSet.getStr());
if( GetExport().GetFilter().getVersion( ) != oox::core::ECMA_DIALECT )
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 4d2c56e67593..65c1158686e0 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" + OUString(aWW8Ruby.GetDirective());
+ aStr += "\\a" + OUStringLiteral1(aWW8Ruby.GetDirective());
}
aStr += "(\\s\\up ";
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index fd0f55dc7063..ad1768d25d84 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 += "\\a" + OUString(aWW8Ruby.GetDirective());
+ aStr += OUStringLiteral("\\a") + OUStringLiteral1(aWW8Ruby.GetDirective());
}
aStr += "(\\s\\up ";
@@ -1241,7 +1241,7 @@ void AttributeOutputBase::TOXMark( const SwTextNode& rNode, const SwTOXMark& rAt
break;
case TOX_USER:
- sText += "\" \\f \"" + OUString(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) ));
+ sText += "\" \\f \"" + OUStringLiteral1(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *rAttr.GetTOXType() ) ));
[[fallthrough]];
case TOX_CONTENT:
{
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 73059165f100..4f959c18a28b 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 += "\""
- + OUString(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *pTOX->GetTOXType() ) ))
+ + OUStringLiteral1(static_cast<sal_Char>( 'A' + GetExport( ).GetId( *pTOX->GetTOXType() ) ))
+ sEntryEnd;
}
}
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 01b434d2829f..1e0a1fc066a9 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -7402,7 +7402,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib const & rFib )
#ifdef OSL_BIGENDIAN
swapEndian(pSecondary);
#endif
- p->sFontname += ";" + OUString(pSecondary);
+ p->sFontname += OUStringLiteral(";") + pSecondary;
}
// #i43762# check font name for illegal characters
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-04 21:57:34 +0000