From 042033f1e6da22616cb76c8d950c20c9efecbad5 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 28 Dec 2020 17:56:40 +0100 Subject: loplugin:stringviewparam: operator + Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- emfio/qa/cppunit/emf/EmfImportTest.cxx | 23 ++++++++++++----------- emfio/qa/cppunit/wmf/wmfimporttest.cxx | 18 +++++++++++------- 2 files changed, 23 insertions(+), 18 deletions(-) (limited to 'emfio/qa') diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx index a4e8cc920382..20e84ca86c4a 100644 --- a/emfio/qa/cppunit/emf/EmfImportTest.cxx +++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx @@ -29,6 +29,7 @@ #include #include +#include namespace { @@ -54,7 +55,7 @@ class Test : public test::BootstrapFixture, public XmlTestTools, public unotest: void TestCreatePen(); void TestPdfInEmf(); - Primitive2DSequence parseEmf(const OUString& aSource); + Primitive2DSequence parseEmf(std::u16string_view aSource); public: void setUp() override; @@ -89,7 +90,7 @@ void Test::tearDown() test::BootstrapFixture::tearDown(); } -Primitive2DSequence Test::parseEmf(const OUString& aSource) +Primitive2DSequence Test::parseEmf(std::u16string_view aSource) { const Reference xEmfParser = EmfTools::create(m_xContext); @@ -111,7 +112,7 @@ Primitive2DSequence Test::parseEmf(const OUString& aSource) void Test::testPolyPolygon() { - Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/fdo79679-2.emf"); + Primitive2DSequence aSequence = parseEmf(u"/emfio/qa/cppunit/emf/data/fdo79679-2.emf"); CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength())); drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence)); @@ -151,7 +152,7 @@ void Test::TestDrawString() // Since the text is undecorated the optimal choice is a simpletextportion primitive // first, get the sequence of primitives and dump it - Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestDrawString.emf"); + Primitive2DSequence aSequence = parseEmf(u"/emfio/qa/cppunit/emf/data/TestDrawString.emf"); CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength())); drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence)); @@ -173,7 +174,7 @@ void Test::TestDrawStringTransparent() // This unit checks for a correct import of an EMF+ file with one DrawString Record with transparency // first, get the sequence of primitives and dump it - Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestDrawStringTransparent.emf"); + Primitive2DSequence aSequence = parseEmf(u"/emfio/qa/cppunit/emf/data/TestDrawStringTransparent.emf"); CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength())); drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence)); @@ -196,7 +197,7 @@ void Test::TestDrawLine() // The line is colored and has a specified width, therefore a polypolygonstroke primitive is the optimal choice // first, get the sequence of primitives and dump it - Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestDrawLine.emf"); + Primitive2DSequence aSequence = parseEmf(u"/emfio/qa/cppunit/emf/data/TestDrawLine.emf"); CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength())); drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence)); @@ -210,7 +211,7 @@ void Test::TestDrawLine() void Test::TestLinearGradient() { // This unit checks for a correct import of an EMF+ file with LinearGradient brush - Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestLinearGradient.emf"); + Primitive2DSequence aSequence = parseEmf(u"/emfio/qa/cppunit/emf/data/TestLinearGradient.emf"); CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength())); drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence)); @@ -244,7 +245,7 @@ void Test::TestTextMapMode() { // Check import of EMF image with records: SETMAPMODE with MM_TEXT MapMode, POLYLINE16, EXTCREATEPEN, EXTTEXTOUTW // MM_TEXT is mapped to one device pixel. Positive x is to the right; positive y is down. - Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TextMapMode.emf"); + Primitive2DSequence aSequence = parseEmf(u"/emfio/qa/cppunit/emf/data/TextMapMode.emf"); CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength())); drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence)); @@ -278,7 +279,7 @@ void Test::TestEnglishMapMode() { // Check import of EMF image with records: SETMAPMODE with MM_ENGLISH MapMode, STROKEANDFILLPATH, EXTTEXTOUTW, SETTEXTALIGN, STRETCHDIBITS // MM_LOENGLISH is mapped to 0.01 inch. Positive x is to the right; positive y is up.M - Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/test_mm_hienglish_ref.emf"); + Primitive2DSequence aSequence = parseEmf(u"/emfio/qa/cppunit/emf/data/test_mm_hienglish_ref.emf"); CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength())); drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence)); @@ -313,7 +314,7 @@ void Test::TestCreatePen() { // Check import of EMF image with records: RESTOREDC, SAVEDC, MOVETOEX, LINETO, POLYLINE16, EXTTEXTOUTW with DxBuffer // The CREATEPEN record is used with PS_COSMETIC line style, which will be displayed as solid hairline - Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestCreatePen.emf"); + Primitive2DSequence aSequence = parseEmf(u"/emfio/qa/cppunit/emf/data/TestCreatePen.emf"); CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength())); drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence)); @@ -362,7 +363,7 @@ void Test::TestCreatePen() void Test::TestPdfInEmf() { // Load a PPTX file, which has a shape, with a bitmap fill, which is an EMF, containing a PDF. - OUString aURL = m_directories.getURLFromSrc("emfio/qa/cppunit/emf/data/pdf-in-emf.pptx"); + OUString aURL = m_directories.getURLFromSrc(u"emfio/qa/cppunit/emf/data/pdf-in-emf.pptx"); getComponent() = loadFromDesktop(aURL); // Get the EMF. diff --git a/emfio/qa/cppunit/wmf/wmfimporttest.cxx b/emfio/qa/cppunit/wmf/wmfimporttest.cxx index 5dfcfdad2041..9be21a2735bd 100644 --- a/emfio/qa/cppunit/wmf/wmfimporttest.cxx +++ b/emfio/qa/cppunit/wmf/wmfimporttest.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + +#include + #include #include #include @@ -29,7 +33,7 @@ class WmfTest : public test::BootstrapFixture, public XmlTestTools { OUString maDataUrl; - OUString getFullUrl(const OUString& sFileName) + OUString getFullUrl(std::u16string_view sFileName) { return m_directories.getURLFromSrc(maDataUrl) + sFileName; } @@ -66,7 +70,7 @@ public: void WmfTest::testNonPlaceableWmf() { - SvFileStream aFileStream(getFullUrl("visio_import_source.wmf"), StreamMode::READ); + SvFileStream aFileStream(getFullUrl(u"visio_import_source.wmf"), StreamMode::READ); GDIMetaFile aGDIMetaFile; ReadWindowMetafile(aFileStream, aGDIMetaFile); @@ -95,7 +99,7 @@ void WmfTest::testNonPlaceableWmf() void WmfTest::testSine() { - SvFileStream aFileStream(getFullUrl("sine_wave.emf"), StreamMode::READ); + SvFileStream aFileStream(getFullUrl(u"sine_wave.emf"), StreamMode::READ); GDIMetaFile aGDIMetaFile; ReadWindowMetafile(aFileStream, aGDIMetaFile); @@ -111,7 +115,7 @@ void WmfTest::testSine() void WmfTest::testEmfProblem() { - SvFileStream aFileStream(getFullUrl("computer_mail.emf"), StreamMode::READ); + SvFileStream aFileStream(getFullUrl(u"computer_mail.emf"), StreamMode::READ); GDIMetaFile aGDIMetaFile; ReadWindowMetafile(aFileStream, aGDIMetaFile); @@ -130,7 +134,7 @@ void WmfTest::testEmfProblem() void WmfTest::testEmfLineStyles() { - SvFileStream aFileStream(getFullUrl("line_styles.emf"), StreamMode::READ); + SvFileStream aFileStream(getFullUrl(u"line_styles.emf"), StreamMode::READ); GDIMetaFile aGDIMetaFile; ReadWindowMetafile(aFileStream, aGDIMetaFile); @@ -190,7 +194,7 @@ void WmfTest::testEmfLineStyles() void WmfTest::testWorldTransformFontSize() { - SvFileStream aFileStream(getFullUrl("image1.emf"), StreamMode::READ); + SvFileStream aFileStream(getFullUrl(u"image1.emf"), StreamMode::READ); GDIMetaFile aGDIMetaFile; ReadWindowMetafile(aFileStream, aGDIMetaFile); @@ -220,7 +224,7 @@ void WmfTest::testWorldTransformFontSize() void WmfTest::testTdf93750() { - SvFileStream aFileStream(getFullUrl("tdf93750.emf"), StreamMode::READ); + SvFileStream aFileStream(getFullUrl(u"tdf93750.emf"), StreamMode::READ); GDIMetaFile aGDIMetaFile; ReadWindowMetafile(aFileStream, aGDIMetaFile); -- cgit