sw/source/filter/html/htmlflywriter.cxx | 30 +++++++++++++++---------------
sw/source/filter/html/wrthtml.hxx | 2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit b26a65bb108e2c681e0721bfe590e68f2fe5a602
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Mar 30 12:49:23 2023 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Mar 30 14:27:02 2023 +0000
Simplify some calls to HtmlWriter::attribute
Change-Id: I608efc6cf7ae05df5a0db3282e0a55315e286718
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149759
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/source/filter/html/htmlflywriter.cxx
b/sw/source/filter/html/htmlflywriter.cxx
index 85cae063cda5..faa5f1067b33 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -819,7 +819,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter&
aHtml, const SwFrameForma
}
// align
- const char* pAlignString = nullptr;
+ std::string_view pAlignString;
RndStdIds eAnchorId = rFrameFormat.GetAnchor().GetAnchorId();
if( (nFrameOptions & HtmlFrmOpts::Align) &&
((RndStdIds::FLY_AT_PARA == eAnchorId) || (RndStdIds::FLY_AT_CHAR ==
eAnchorId)) && !bReplacement)
@@ -830,12 +830,12 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter&
aHtml, const SwFrameForma
text::RelOrientation::PRINT_AREA == rHoriOri.GetRelationOrient() )
{
pAlignString = text::HoriOrientation::RIGHT ==
rHoriOri.GetHoriOrient()
- ? OOO_STRING_SVTOOLS_HTML_AL_right
- : OOO_STRING_SVTOOLS_HTML_AL_left;
+ ? std::string_view(OOO_STRING_SVTOOLS_HTML_AL_right)
+ : std::string_view(OOO_STRING_SVTOOLS_HTML_AL_left);
}
}
const SwFormatVertOrient* pVertOrient;
- if( (nFrameOptions & HtmlFrmOpts::Align) && !pAlignString &&
+ if( (nFrameOptions & HtmlFrmOpts::Align) && pAlignString.empty() &&
( !(nFrameOptions & HtmlFrmOpts::SAlign) ||
(RndStdIds::FLY_AS_CHAR == eAnchorId) ) &&
(pVertOrient = rItemSet.GetItemIfSet( RES_VERT_ORIENT )) )
@@ -854,7 +854,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter&
aHtml, const SwFrameForma
case text::VertOrientation::NONE: break;
}
}
- if (pAlignString && !bReplacement)
+ if (!pAlignString.empty() && !bReplacement)
{
aHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_align, pAlignString);
}
@@ -1047,7 +1047,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter&
aHtml, const SwFrameForma
if (!pSurround)
return;
- const char* pSurroundString = nullptr;
+ std::string_view pSurroundString;
sal_Int16 eHoriOri = rFrameFormat.GetHoriOrient().GetHoriOrient();
css::text::WrapTextMode eSurround = pSurround->GetSurround();
@@ -1095,7 +1095,7 @@ void SwHTMLWriter::writeFrameFormatOptions(HtmlWriter&
aHtml, const SwFrameForma
break;
}
- if (pSurroundString)
+ if (!pSurroundString.empty())
{
aHtml.start(OOO_STRING_SVTOOLS_HTML_linebreak);
aHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_clear, pSurroundString);
@@ -1238,7 +1238,7 @@ SwHTMLWriter& OutHTML_ImageStart( HtmlWriter& rHtml,
SwHTMLWriter& rWrt, const S
const Size &rRealSize, HtmlFrmOpts nFrameOpts,
const char *pMarkType,
const ImageMap *pAltImgMap,
- const OUString& rMimeType )
+ std::u16string_view rMimeType )
{
// <object data="..."> instead of <img src="...">
bool bReplacement = (nFrameOpts & HtmlFrmOpts::Replacement) ||
rWrt.mbReqIF;
@@ -1297,17 +1297,17 @@ SwHTMLWriter& OutHTML_ImageStart( HtmlWriter& rHtml,
SwHTMLWriter& rWrt, const S
// Output "href" element if a link or macro exists
if( !aMapURL.isEmpty() || bEvents )
{
- rHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_href,
OUStringToOString(rWrt.convertHyperlinkHRefValue(aMapURL),
RTL_TEXTENCODING_UTF8));
+ rHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_href,
rWrt.convertHyperlinkHRefValue(aMapURL));
}
if( !aName.isEmpty() )
{
- rHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_name,
OUStringToOString(aName, RTL_TEXTENCODING_UTF8));
+ rHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_name, aName);
}
if( !aTarget.isEmpty() )
{
- rHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_target,
OUStringToOString(aTarget, RTL_TEXTENCODING_UTF8));
+ rHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_target, aTarget);
}
if( pMacItem )
@@ -1399,7 +1399,7 @@ SwHTMLWriter& OutHTML_ImageStart( HtmlWriter& rHtml,
SwHTMLWriter& rWrt, const S
OString sBuffer(OString::Concat(OOO_STRING_SVTOOLS_HTML_O_data)
+ ":"
+ OUStringToOString(aGraphicInBase64, RTL_TEXTENCODING_UTF8));
- rHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_src, sBuffer.getStr());
+ rHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_src, sBuffer);
}
else
rWrt.m_nWarn = WARN_SWG_POOR_LOAD;
@@ -1410,14 +1410,14 @@ SwHTMLWriter& OutHTML_ImageStart( HtmlWriter& rHtml,
SwHTMLWriter& rWrt, const S
OString aAttribute(OOO_STRING_SVTOOLS_HTML_O_src);
if (bReplacement)
aAttribute = OOO_STRING_SVTOOLS_HTML_O_data;
- rHtml.attribute(aAttribute, sBuffer.getStr());
+ rHtml.attribute(aAttribute, sBuffer);
}
if (bReplacement)
{
// Handle XHTML type attribute for OLE replacement images.
- if (!rMimeType.isEmpty())
- rHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_type,
rMimeType.toUtf8());
+ if (!rMimeType.empty())
+ rHtml.attribute(OOO_STRING_SVTOOLS_HTML_O_type, rMimeType);
}
// Events
diff --git a/sw/source/filter/html/wrthtml.hxx
b/sw/source/filter/html/wrthtml.hxx
index 433d315562d7..16ec843dc279 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -698,7 +698,7 @@ SwHTMLWriter& OutHTML_ImageStart( HtmlWriter& rHtml,
SwHTMLWriter&, const SwFram
const Size& rRealSize, HtmlFrmOpts nFrameOpts,
const char *pMarkType,
const ImageMap *pGenImgMap,
- const OUString& rMimeType = OUString() );
+ std::u16string_view rMimeType = {} );
SwHTMLWriter& OutHTML_ImageEnd( HtmlWriter& rHtml, SwHTMLWriter& );
SwHTMLWriter& OutHTML_BulletImage( SwHTMLWriter& rWrt, const char *pTag,
