svl/qa/unit/test_INetContentType.cxx | 6 +--
svtools/qa/unit/testHtmlReader.cxx | 6 +--
svtools/qa/unit/testHtmlWriter.cxx | 60 +++++++++++++++++------------------
svtools/source/svhtml/parhtml.cxx | 2 -
4 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit 6ccd536aae8b5fb5ec01796a1d48d8c5e0b21582
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sun Nov 19 14:43:07 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sun Nov 19 18:27:05 2023 +0100
Extended loplugin:ostr: svtools
Change-Id: I4aa6ab1c132a5666b0ee4a4e9f68aaca58a38ceb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159672
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svtools/qa/unit/testHtmlReader.cxx
b/svtools/qa/unit/testHtmlReader.cxx
index 37f74e903bcc..5605060eab34 100644
--- a/svtools/qa/unit/testHtmlReader.cxx
+++ b/svtools/qa/unit/testHtmlReader.cxx
@@ -53,7 +53,7 @@ class Test : public CppUnit::TestFixture
CPPUNIT_TEST_FIXTURE(Test, testTdf114428)
{
SvMemoryStream aStream;
- OString aDocument("<?xml version=\"1.0\"
encoding=\"utf-8\"?>\n<html>hello</html>");
+ OString aDocument("<?xml version=\"1.0\"
encoding=\"utf-8\"?>\n<html>hello</html>"_ostr);
aStream.WriteBytes(aDocument.getStr(), aDocument.getLength());
aStream.Seek(0);
@@ -68,7 +68,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf114428)
CPPUNIT_TEST_FIXTURE(Test, testLineBreak)
{
SvMemoryStream aStream;
- OString aDocument("aaa<br></br>bbb");
+ OString aDocument("aaa<br></br>bbb"_ostr);
aStream.WriteBytes(aDocument.getStr(), aDocument.getLength());
aStream.Seek(0);
@@ -84,7 +84,7 @@ CPPUNIT_TEST_FIXTURE(Test, testCdata)
{
// Given a document with CDATA:
SvMemoryStream aStream;
- OString aDocument("A<![CDATA[B ü <]]>C");
+ OString aDocument("A<![CDATA[B ü <]]>C"_ostr);
aStream.WriteBytes(aDocument.getStr(), aDocument.getLength());
aStream.Seek(0);
diff --git a/svtools/qa/unit/testHtmlWriter.cxx
b/svtools/qa/unit/testHtmlWriter.cxx
index 702bf64464ab..19e5b6078947 100644
--- a/svtools/qa/unit/testHtmlWriter.cxx
+++ b/svtools/qa/unit/testHtmlWriter.cxx
@@ -37,11 +37,11 @@ CPPUNIT_TEST_FIXTURE(Test, testSingleElement)
HtmlWriter aHtml(aStream);
aHtml.prettyPrint(false);
- aHtml.start("abc");
+ aHtml.start("abc"_ostr);
aHtml.end();
OString aString = extractFromStream(aStream);
- CPPUNIT_ASSERT_EQUAL(OString("<abc/>"), aString);
+ CPPUNIT_ASSERT_EQUAL("<abc/>"_ostr, aString);
}
{
@@ -49,11 +49,11 @@ CPPUNIT_TEST_FIXTURE(Test, testSingleElement)
HtmlWriter aHtml(aStream);
aHtml.prettyPrint(false);
- aHtml.single("abc");
+ aHtml.single("abc"_ostr);
OString aString = extractFromStream(aStream);
- CPPUNIT_ASSERT_EQUAL(OString("<abc/>"), aString);
+ CPPUNIT_ASSERT_EQUAL("<abc/>"_ostr, aString);
}
}
@@ -64,13 +64,13 @@ CPPUNIT_TEST_FIXTURE(Test, testSingleElementWithAttributes)
HtmlWriter aHtml(aStream);
aHtml.prettyPrint(false);
- aHtml.start("abc");
+ aHtml.start("abc"_ostr);
aHtml.attribute("x", "y");
aHtml.end();
OString aString = extractFromStream(aStream);
- CPPUNIT_ASSERT_EQUAL(OString("<abc x=\"y\"/>"), aString);
+ CPPUNIT_ASSERT_EQUAL("<abc x=\"y\"/>"_ostr, aString);
}
{
@@ -78,14 +78,14 @@ CPPUNIT_TEST_FIXTURE(Test, testSingleElementWithAttributes)
HtmlWriter aHtml(aStream);
aHtml.prettyPrint(false);
- aHtml.start("abc");
+ aHtml.start("abc"_ostr);
aHtml.attribute("x", "y");
aHtml.attribute("q", "w");
aHtml.end();
OString aString = extractFromStream(aStream);
- CPPUNIT_ASSERT_EQUAL(OString("<abc x=\"y\" q=\"w\"/>"), aString);
+ CPPUNIT_ASSERT_EQUAL("<abc x=\"y\" q=\"w\"/>"_ostr, aString);
}
}
@@ -95,12 +95,12 @@ CPPUNIT_TEST_FIXTURE(Test, testSingleElementWithContent)
HtmlWriter aHtml(aStream);
aHtml.prettyPrint(false);
- aHtml.start("abc");
+ aHtml.start("abc"_ostr);
aHtml.end();
OString aString = extractFromStream(aStream);
- CPPUNIT_ASSERT_EQUAL(OString("<abc/>"), aString);
+ CPPUNIT_ASSERT_EQUAL("<abc/>"_ostr, aString);
}
CPPUNIT_TEST_FIXTURE(Test, testSingleElementWithContentAndAttributes)
@@ -109,14 +109,14 @@ CPPUNIT_TEST_FIXTURE(Test,
testSingleElementWithContentAndAttributes)
HtmlWriter aHtml(aStream);
aHtml.prettyPrint(false);
- aHtml.start("abc");
+ aHtml.start("abc"_ostr);
aHtml.attribute("x", "y");
aHtml.attribute("q", "w");
aHtml.end();
OString aString = extractFromStream(aStream);
- CPPUNIT_ASSERT_EQUAL(OString("<abc x=\"y\" q=\"w\"/>"), aString);
+ CPPUNIT_ASSERT_EQUAL("<abc x=\"y\" q=\"w\"/>"_ostr, aString);
}
CPPUNIT_TEST_FIXTURE(Test, testNested)
@@ -125,14 +125,14 @@ CPPUNIT_TEST_FIXTURE(Test, testNested)
HtmlWriter aHtml(aStream);
aHtml.prettyPrint(false);
- aHtml.start("abc");
- aHtml.start("xyz");
+ aHtml.start("abc"_ostr);
+ aHtml.start("xyz"_ostr);
aHtml.end();
aHtml.end();
OString aString = extractFromStream(aStream);
- CPPUNIT_ASSERT_EQUAL(OString("<abc><xyz/></abc>"), aString);
+ CPPUNIT_ASSERT_EQUAL("<abc><xyz/></abc>"_ostr, aString);
}
CPPUNIT_TEST_FIXTURE(Test, testNamespace)
@@ -141,12 +141,12 @@ CPPUNIT_TEST_FIXTURE(Test, testNamespace)
HtmlWriter aHtml(aStream, "reqif-xhtml");
aHtml.prettyPrint(false);
- aHtml.single("br");
+ aHtml.single("br"_ostr);
OString aString = extractFromStream(aStream);
// This was <br/>, namespace request was ignored.
- CPPUNIT_ASSERT_EQUAL(OString("<reqif-xhtml:br/>"), aString);
+ CPPUNIT_ASSERT_EQUAL("<reqif-xhtml:br/>"_ostr, aString);
}
CPPUNIT_TEST_FIXTURE(Test, testAttributeValues)
@@ -155,7 +155,7 @@ CPPUNIT_TEST_FIXTURE(Test, testAttributeValues)
HtmlWriter aHtml(aStream);
aHtml.prettyPrint(false);
- aHtml.start("abc");
+ aHtml.start("abc"_ostr);
aHtml.attribute("one", "one");
aHtml.attribute("two", u"two");
aHtml.attribute("three", sal_Int32(12));
@@ -163,7 +163,7 @@ CPPUNIT_TEST_FIXTURE(Test, testAttributeValues)
OString aString = extractFromStream(aStream);
- CPPUNIT_ASSERT_EQUAL(OString("<abc one=\"one\" two=\"two\"
three=\"12\"/>"), aString);
+ CPPUNIT_ASSERT_EQUAL("<abc one=\"one\" two=\"two\" three=\"12\"/>"_ostr,
aString);
}
CPPUNIT_TEST_FIXTURE(Test, testCharacters)
@@ -172,13 +172,13 @@ CPPUNIT_TEST_FIXTURE(Test, testCharacters)
HtmlWriter aHtml(aStream);
aHtml.prettyPrint(false);
- aHtml.start("abc");
+ aHtml.start("abc"_ostr);
aHtml.characters("hello");
aHtml.end();
OString aString = extractFromStream(aStream);
- CPPUNIT_ASSERT_EQUAL(OString("<abc>hello</abc>"), aString);
+ CPPUNIT_ASSERT_EQUAL("<abc>hello</abc>"_ostr, aString);
}
CPPUNIT_TEST_FIXTURE(Test, testExactElementEnd)
@@ -187,15 +187,15 @@ CPPUNIT_TEST_FIXTURE(Test, testExactElementEnd)
HtmlWriter aHtml(aStream);
aHtml.prettyPrint(false);
- aHtml.start("start");
- aHtml.start("a");
- CPPUNIT_ASSERT(aHtml.end("a"));
- aHtml.start("b");
- CPPUNIT_ASSERT(!aHtml.end("c"));
- CPPUNIT_ASSERT(aHtml.end("start"));
+ aHtml.start("start"_ostr);
+ aHtml.start("a"_ostr);
+ CPPUNIT_ASSERT(aHtml.end("a"_ostr));
+ aHtml.start("b"_ostr);
+ CPPUNIT_ASSERT(!aHtml.end("c"_ostr));
+ CPPUNIT_ASSERT(aHtml.end("start"_ostr));
OString aString = extractFromStream(aStream);
- CPPUNIT_ASSERT_EQUAL(OString("<start><a/><b/></start>"), aString);
+ CPPUNIT_ASSERT_EQUAL("<start><a/><b/></start>"_ostr, aString);
}
CPPUNIT_TEST_FIXTURE(Test, testAttributeValueEncode)
@@ -206,7 +206,7 @@ CPPUNIT_TEST_FIXTURE(Test, testAttributeValueEncode)
aHtml.prettyPrint(false);
// When writing an attribute with a value that needs encoding:
- aHtml.start("element");
+ aHtml.start("element"_ostr);
aHtml.attribute("attribute", "a&b");
aHtml.end();
@@ -216,7 +216,7 @@ CPPUNIT_TEST_FIXTURE(Test, testAttributeValueEncode)
// - Expected: <element attribute="a&b"/>
// - Actual : <element attribute="a&b"/>
// i.e. attribute value was not encoded in HTML, but it was in e.g. XML.
- CPPUNIT_ASSERT_EQUAL(OString("<element attribute=\"a&b\"/>"), aString);
+ CPPUNIT_ASSERT_EQUAL("<element attribute=\"a&b\"/>"_ostr, aString);
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/svtools/source/svhtml/parhtml.cxx
b/svtools/source/svhtml/parhtml.cxx
index d94a24632779..1f8745674469 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -2165,7 +2165,7 @@ rtl_TextEncoding HTMLParser::GetEncodingByMIME( const
OUString& rMime )
INetContentTypeParameterList aParameters;
if (INetContentTypes::parse(rMime, sType, sSubType, &aParameters))
{
- auto const iter = aParameters.find("charset");
+ auto const iter = aParameters.find("charset"_ostr);
if (iter != aParameters.end())
{
const INetContentTypeParameter * pCharset = &iter->second;
commit 23641bffb78fed4db99a0a906b6d80335340c9a3
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Sun Nov 19 14:43:20 2023 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Sun Nov 19 18:26:53 2023 +0100
Extended loplugin:ostr: svl
Change-Id: Ia74b15213a05da36f48932811d70d231ec7ee164
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159673
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svl/qa/unit/test_INetContentType.cxx
b/svl/qa/unit/test_INetContentType.cxx
index b68796726e0e..288cfe919008 100644
--- a/svl/qa/unit/test_INetContentType.cxx
+++ b/svl/qa/unit/test_INetContentType.cxx
@@ -47,7 +47,7 @@ void Test::testBad() {
CPPUNIT_ASSERT(!INetContentTypes::parse(in, t, s, &ps));
CPPUNIT_ASSERT(t.isEmpty());
CPPUNIT_ASSERT(s.isEmpty());
- CPPUNIT_ASSERT(bool(ps.end() == ps.find("foo")));
+ CPPUNIT_ASSERT(bool(ps.end() == ps.find("foo"_ostr)));
}
void Test::testFull() {
@@ -61,7 +61,7 @@ void Test::testFull() {
CPPUNIT_ASSERT(INetContentTypes::parse(in, t, s, &ps));
CPPUNIT_ASSERT_EQUAL(OUString("foo"), t);
CPPUNIT_ASSERT_EQUAL(OUString("bar"), s);
- auto iter = ps.find("baz");
+ auto iter = ps.find("baz"_ostr);
CPPUNIT_ASSERT(iter != ps.end());
CPPUNIT_ASSERT_EQUAL(OUString("boz"), iter->second.m_sValue);
}
@@ -77,7 +77,7 @@ void Test::testFollow() {
CPPUNIT_ASSERT(!INetContentTypes::parse(in, t, s));
CPPUNIT_ASSERT(t.isEmpty());
CPPUNIT_ASSERT(s.isEmpty());
- CPPUNIT_ASSERT(bool(ps.end() == ps.find("baz")));
+ CPPUNIT_ASSERT(bool(ps.end() == ps.find("baz"_ostr)));
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
