diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-11 10:23:28 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2022-10-11 12:46:01 +0200 |
| commit | 3d236177be255b2027a997bfc12fe0833ca9a2f7 (patch) | |
| tree | d67582e355bccb43cf133c1857f5dd6136be2f35 /sw/source/filter/ww8/docxattributeoutput.cxx | |
| parent | 6c65c62c26a8aa4d04466545f8f04ec86b797012 (diff) | |
Deduplicate O(U)StringConcatenation
And use an overloaded helper function with a better (?) unified name
to show that the result is not an O(U)String.
Change-Id: I8956338b05d02bf46a6185828130ea8ef145d46b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141203
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/source/filter/ww8/docxattributeoutput.cxx')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index de0775305145..73af98b6fac3 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -7779,7 +7779,7 @@ void DocxAttributeOutput::EmbedFontStyle( std::u16string_view name, int tag, Fon xOutStream->closeOutput(); OString relId = OUStringToOString( GetExport().GetFilter().addRelation( m_pSerializer->getOutputStream(), oox::getRelationship(Relationship::FONT), - OUStringConcatenation("fonts/font" + OUString::number( m_nextFontId ) + ".odttf") ), RTL_TEXTENCODING_UTF8 ); + Concat2View("fonts/font" + OUString::number( m_nextFontId ) + ".odttf") ), RTL_TEXTENCODING_UTF8 ); EmbeddedFontRef ref; ref.relId = relId; ref.fontKey = fontKeyStr; @@ -10058,16 +10058,16 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox ) // and so on. OStringBuffer aInset; if(!aInset.isEmpty() || fDistanceBottomInch != 0.05) - aInset.insert(0, OStringConcatenation("," + OString::number(fDistanceBottomInch) + "in")); + aInset.insert(0, Concat2View("," + OString::number(fDistanceBottomInch) + "in")); if(!aInset.isEmpty() || fDistanceRightInch != 0.1) - aInset.insert(0, OStringConcatenation("," + OString::number(fDistanceRightInch) + "in")); + aInset.insert(0, Concat2View("," + OString::number(fDistanceRightInch) + "in")); if(!aInset.isEmpty() || fDistanceTopInch != 0.05) - aInset.insert(0, OStringConcatenation("," + OString::number(fDistanceTopInch) + "in")); + aInset.insert(0, Concat2View("," + OString::number(fDistanceTopInch) + "in")); if(!aInset.isEmpty() || fDistanceLeftInch != 0.1) - aInset.insert(0, OStringConcatenation(OString::number(fDistanceLeftInch) + "in")); + aInset.insert(0, Concat2View(OString::number(fDistanceLeftInch) + "in")); if (!aInset.isEmpty()) m_rExport.SdrExporter().getTextboxAttrList()->add(XML_inset, aInset.makeStringAndClear()); |