diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-20 09:51:16 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-04-20 13:34:43 +0200 |
| commit | b08a2b299418db84a71fe625f127f0484746010e (patch) | |
| tree | 544ad8a8c1d6c9b12f27f1771fe27ab8714ab4d4 /sw | |
| parent | bff2b8bf2b0ae47f6e59639db0544212398363ac (diff) | |
use OUString::Concat here, not OUStringLiteral
Change-Id: Ia2172bcab60f32c9d9d4f6ca0230484343eef69b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114321
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/fields/reffld.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/html/htmlfld.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8scan.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/dbui/mmconfigitem.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 10008bdd73ac..25b980b6dc19 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -292,7 +292,7 @@ static void lcl_formatReferenceLanguage( OUString& rRefText, 0x00E1, 0x00C1, 0x00E9, 0x00C9, 0x00ED, 0x00CD, 0x00F3, 0x00D3, 0x00F6, 0x00D6, 0x0151, 0x0150, 0x00FA, 0x00DA, 0x00FC, 0x00DC, 0x0171, 0x0170, 0 }; - static OUString sVowels = OUStringLiteral(u"aAeEiIoOuU") + sVowelsWithDiacritic; + static OUString sVowels = OUString::Concat(u"aAeEiIoOuU") + sVowelsWithDiacritic; // handle more than 1-letter long Roman numbers and // their possible combinations with letters: diff --git a/sw/source/filter/html/htmlfld.cxx b/sw/source/filter/html/htmlfld.cxx index 989457ef6244..5986a93f1ffb 100644 --- a/sw/source/filter/html/htmlfld.cxx +++ b/sw/source/filter/html/htmlfld.cxx @@ -592,7 +592,7 @@ void SwHTMLParser::InsertCommentText( const char *pTag ) m_aContents += aToken; if( bEmpty && pTag ) { - m_aContents = OUStringLiteral(u"HTML: <") + OUStringChar(*pTag) + ">" + m_aContents; + m_aContents = OUString::Concat("HTML: <") + OUStringChar(*pTag) + ">" + m_aContents; } } diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index c278d57588ec..c2e72732878a 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -908,7 +908,7 @@ void WW8AttributeOutput::StartRuby( const SwTextNode& rNode, sal_Int32 /*nPos*/, aStr += OUString::number((aWW8Ruby.GetRubyHeight() + 5) / 10) + " \\o"; if (aWW8Ruby.GetDirective()) { - aStr += OUStringLiteral(u"\\a") + OUStringChar(aWW8Ruby.GetDirective()); + aStr += OUString::Concat(u"\\a") + OUStringChar(aWW8Ruby.GetDirective()); } aStr += "(\\s\\up " + OUString::number((aWW8Ruby.GetBaseHeight() + 10) / 20 - 1) + "("; aStr += rRuby.GetText() + ")"; diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 5db9cb10d5b0..c37ccf2d1470 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -7463,7 +7463,7 @@ WW8Fonts::WW8Fonts( SvStream& rSt, WW8Fib const & rFib ) #ifdef OSL_BIGENDIAN swapEndian(pSecondary); #endif - p->sFontname += OUStringLiteral(u";") + pSecondary; + p->sFontname += OUString::Concat(";") + pSecondary; } // #i43762# check font name for illegal characters diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 083e1a73e0d0..969ca4976d36 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -302,7 +302,7 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() : sal_Int32 nAssign; for(nAssign = 0; nAssign < aAssignProperties.getLength(); nAssign += 4) { - OUString sAssignPath = OUStringLiteral(cAddressDataAssignments) + + OUString sAssignPath = OUString::Concat(cAddressDataAssignments) + "/" + pAssignments[nAssign / 4] + "/"; |