diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-28 14:12:35 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-29 08:53:22 +0200 |
commit | d3849255b76e92a42f653c266b88945708984c4f (patch) | |
tree | ff1eab21b9e5a1ea00e1573db4b4595ba51b0098 /vcl/qa | |
parent | f9b6bd6336b35de060f6f5bdd91517caf5e9a56e (diff) |
use more string_view in INetURLObject
Change-Id: I4462f7cf4740fa4d1b129d76a0775f4250f41bbd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133555
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/qa')
-rw-r--r-- | vcl/qa/cppunit/GraphicDescriptorTest.cxx | 2 | ||||
-rw-r--r-- | vcl/qa/cppunit/GraphicTest.cxx | 23 | ||||
-rw-r--r-- | vcl/qa/cppunit/graphicfilter/filters-test.cxx | 4 | ||||
-rw-r--r-- | vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx | 4 | ||||
-rw-r--r-- | vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx | 6 | ||||
-rw-r--r-- | vcl/qa/cppunit/jpeg/JpegWriterTest.cxx | 4 | ||||
-rw-r--r-- | vcl/qa/cppunit/pdfexport/pdfexport.cxx | 6 |
7 files changed, 24 insertions, 25 deletions
diff --git a/vcl/qa/cppunit/GraphicDescriptorTest.cxx b/vcl/qa/cppunit/GraphicDescriptorTest.cxx index 865202cedbf5..ace1a6c90a28 100644 --- a/vcl/qa/cppunit/GraphicDescriptorTest.cxx +++ b/vcl/qa/cppunit/GraphicDescriptorTest.cxx @@ -61,7 +61,7 @@ void createBitmapAndExportForType(SvStream& rStream, std::u16string_view sType) uno::Sequence<beans::PropertyValue> aFilterData; GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nFilterFormat = rGraphicFilter.GetExportFormatNumberForShortName(sType); - rGraphicFilter.ExportGraphic(aBitmapEx, "none", rStream, nFilterFormat, &aFilterData); + rGraphicFilter.ExportGraphic(aBitmapEx, u"none", rStream, nFilterFormat, &aFilterData); rStream.Seek(STREAM_SEEK_TO_BEGIN); } diff --git a/vcl/qa/cppunit/GraphicTest.cxx b/vcl/qa/cppunit/GraphicTest.cxx index 2e398c544c79..4bdd2854cae8 100644 --- a/vcl/qa/cppunit/GraphicTest.cxx +++ b/vcl/qa/cppunit/GraphicTest.cxx @@ -161,7 +161,7 @@ void createBitmapAndExportForType(SvStream& rStream, std::u16string_view sType, uno::Sequence<beans::PropertyValue> aFilterData; GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nFilterFormat = rGraphicFilter.GetExportFormatNumberForShortName(sType); - rGraphicFilter.ExportGraphic(aBitmapEx, "none", rStream, nFilterFormat, &aFilterData); + rGraphicFilter.ExportGraphic(aBitmapEx, u"none", rStream, nFilterFormat, &aFilterData); rStream.Seek(STREAM_SEEK_TO_BEGIN); } @@ -250,9 +250,8 @@ Graphic loadGraphic(std::u16string_view const& rFilename) GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); Graphic aGraphic; - CPPUNIT_ASSERT_EQUAL( - ERRCODE_NONE, - rGraphicFilter.ImportGraphic(aGraphic, OUString(), aFileStream, GRFILTER_FORMAT_DONTKNOW)); + CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, rGraphicFilter.ImportGraphic(aGraphic, u"", aFileStream, + GRFILTER_FORMAT_DONTKNOW)); return aGraphic; } @@ -336,7 +335,7 @@ void GraphicTest::testUnloadedGraphicWmf() Graphic aGraphic(aBitmapEx); aGraphic.SetPrefSize(Size(99, 99)); aGraphic.SetPrefMapMode(MapMode(MapUnit::Map100thMM)); - rGraphicFilter.ExportGraphic(aGraphic, "none", aStream, nFilterFormat); + rGraphicFilter.ExportGraphic(aGraphic, u"none", aStream, nFilterFormat); aStream.Seek(STREAM_SEEK_TO_BEGIN); // Now lazy-load this WMF data, with a custom preferred size of 42x42. @@ -404,7 +403,7 @@ void GraphicTest::testWMFRoundtrip() aTempFile.EnableKillingFile(); sal_uInt16 nFormat = rGraphicFilter.GetExportFormatNumberForShortName(u"WMF"); SvStream& rOutStream = *aTempFile.GetStream(StreamMode::READWRITE); - rGraphicFilter.ExportGraphic(aGraphic, OUString(), rOutStream, nFormat); + rGraphicFilter.ExportGraphic(aGraphic, u"", rOutStream, nFormat); // Check if we preserved the WMF data perfectly. sal_uInt64 nActualSize = rOutStream.TellEnd(); @@ -470,7 +469,7 @@ void GraphicTest::testWMFWithEmfPlusRoundtrip() else { sal_uInt16 nFormat = rGraphicFilter.GetExportFormatNumberForShortName(u"WMF"); - rGraphicFilter.ExportGraphic(aGraphic, OUString(), rOutStream, nFormat); + rGraphicFilter.ExportGraphic(aGraphic, u"", rOutStream, nFormat); } CPPUNIT_ASSERT_EQUAL(nExpectedSize, rOutStream.TellEnd()); @@ -502,14 +501,14 @@ void GraphicTest::testEmfToWmfConversion() // This similar to an application/x-openoffice-wmf mime type in manifest.xml in the ODF case. sal_uInt16 nFormat = aGraphicFilter.GetImportFormatNumberForShortName(u"WMF"); CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, - aGraphicFilter.ImportGraphic(aGraphic, OUString(), aStream, nFormat)); + aGraphicFilter.ImportGraphic(aGraphic, u"", aStream, nFormat)); CPPUNIT_ASSERT_EQUAL(VectorGraphicDataType::Wmf, aGraphic.getVectorGraphicData()->getType()); // Save as WMF. sal_uInt16 nFilterType = aGraphicFilter.GetExportFormatNumberForShortName(u"WMF"); SvMemoryStream aGraphicStream; - CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, aGraphicFilter.ExportGraphic(aGraphic, OUString(), - aGraphicStream, nFilterType)); + CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, + aGraphicFilter.ExportGraphic(aGraphic, u"", aGraphicStream, nFilterType)); aGraphicStream.Seek(0); vcl::GraphicFormatDetector aDetector(aGraphicStream, OUString()); CPPUNIT_ASSERT(aDetector.detect()); @@ -524,8 +523,8 @@ void GraphicTest::testEmfToWmfConversion() // Import the WMF result and check for traces of EMF+ in it. Graphic aWmfGraphic; aGraphicStream.Seek(0); - CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, aGraphicFilter.ImportGraphic(aWmfGraphic, OUString(), - aGraphicStream, nFormat)); + CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, + aGraphicFilter.ImportGraphic(aWmfGraphic, u"", aGraphicStream, nFormat)); int nCommentCount = 0; for (size_t i = 0; i < aWmfGraphic.GetGDIMetaFile().GetActionSize(); ++i) { diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx index f10de06fc837..e065cf6b5d09 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx @@ -119,14 +119,14 @@ void VclFiltersTest::checkExportImport(std::u16string_view aFilterShortName) }; sal_uInt16 aFilterType = mpGraphicFilter->GetExportFormatNumberForShortName(aFilterShortName); - mpGraphicFilter->ExportGraphic(BitmapEx(aBitmap), OUString(), aStream, aFilterType, &aFilterData ); + mpGraphicFilter->ExportGraphic(BitmapEx(aBitmap), u"", aStream, aFilterType, &aFilterData ); CPPUNIT_ASSERT(aStream.Tell() > 0); aStream.Seek( STREAM_SEEK_TO_BEGIN ); Graphic aLoadedGraphic; - mpGraphicFilter->ImportGraphic( aLoadedGraphic, OUString(), aStream ); + mpGraphicFilter->ImportGraphic( aLoadedGraphic, u"", aStream ); BitmapEx aLoadedBitmapEx = aLoadedGraphic.GetBitmapEx(); Size aSize = aLoadedBitmapEx.GetSizePixel(); diff --git a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx index 77e412088bf3..72f12ca565f5 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-tiff-test.cxx @@ -193,11 +193,11 @@ void TiffFilterTest::testRoundtrip() SvMemoryStream aStream; GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 nFilterFormat = rFilter.GetExportFormatNumberForShortName(u"tif"); - rFilter.ExportGraphic(Graphic(BitmapEx(aBitmap)), "none", aStream, nFilterFormat); + rFilter.ExportGraphic(Graphic(BitmapEx(aBitmap)), u"none", aStream, nFilterFormat); aStream.Seek(STREAM_SEEK_TO_BEGIN); Graphic aGraphic; - ErrCode bResult = rFilter.ImportGraphic(aGraphic, "none", aStream); + ErrCode bResult = rFilter.ImportGraphic(aGraphic, u"none", aStream); CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult); CPPUNIT_ASSERT_EQUAL(GfxLinkType::NativeTif, aGraphic.GetGfxLink().GetType()); Bitmap aResultBitmap = aGraphic.GetBitmapEx().GetBitmap(); diff --git a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx index 90528199c0ba..f9d0bfa842dc 100644 --- a/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx +++ b/vcl/qa/cppunit/graphicfilter/filters-webp-test.cxx @@ -111,11 +111,11 @@ void WebpFilterTest::testRoundtrip(bool lossy) comphelper::makePropertyValue("Lossless", !lossy), comphelper::makePropertyValue("Quality", sal_Int32(100)) }; - rFilter.ExportGraphic(Graphic(aBitmapEx), "none", aStream, nFilterFormat, &aFilterData); + rFilter.ExportGraphic(Graphic(aBitmapEx), u"none", aStream, nFilterFormat, &aFilterData); aStream.Seek(STREAM_SEEK_TO_BEGIN); Graphic aGraphic; - ErrCode bResult = rFilter.ImportGraphic(aGraphic, "none", aStream); + ErrCode bResult = rFilter.ImportGraphic(aGraphic, u"none", aStream); CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult); CPPUNIT_ASSERT_EQUAL(GfxLinkType::NativeWebp, aGraphic.GetGfxLink().GetType()); BitmapEx aResultBitmap = aGraphic.GetBitmapEx(); @@ -172,7 +172,7 @@ void WebpFilterTest::testRead(bool lossy, bool alpha) SvFileStream aFileStream(file, StreamMode::READ); Graphic aGraphic; GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); - ErrCode bResult = rFilter.ImportGraphic(aGraphic, "none", aFileStream); + ErrCode bResult = rFilter.ImportGraphic(aGraphic, u"none", aFileStream); CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult); CPPUNIT_ASSERT_EQUAL(GfxLinkType::NativeWebp, aGraphic.GetGfxLink().GetType()); BitmapEx aResultBitmap = aGraphic.GetBitmapEx(); diff --git a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx index f999c018df7c..f9b58c30843b 100644 --- a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx +++ b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx @@ -60,7 +60,7 @@ BitmapEx JpegWriterTest::roundtripJPG(const BitmapEx& bitmap) GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); sal_uInt16 exportFormatJPG = rFilter.GetExportFormatNumberForShortName(JPG_SHORTNAME); Graphic aExportGraphic(bitmap); - ErrCode bResult = rFilter.ExportGraphic(aExportGraphic, "memory", aStream, exportFormatJPG); + ErrCode bResult = rFilter.ExportGraphic(aExportGraphic, u"memory", aStream, exportFormatJPG); CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult); //Detect the magic bytes - we need to be sure the file is actually a JPEG aStream.Seek(0); @@ -71,7 +71,7 @@ BitmapEx JpegWriterTest::roundtripJPG(const BitmapEx& bitmap) aStream.Seek(0); Graphic aImportGraphic; sal_uInt16 importFormatJPG = rFilter.GetImportFormatNumberForShortName(JPG_SHORTNAME); - bResult = rFilter.ImportGraphic(aImportGraphic, "memory", aStream, importFormatJPG); + bResult = rFilter.ImportGraphic(aImportGraphic, u"memory", aStream, importFormatJPG); CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult); return aImportGraphic.GetBitmapEx(); } diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx index 42d9e15668e3..0bfebea97464 100644 --- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx +++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx @@ -1747,7 +1747,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf121615) GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); Graphic aGraphic; sal_uInt16 format; - ErrCode bResult = rFilter.ImportGraphic(aGraphic, OUString("import"), rObjectStream, + ErrCode bResult = rFilter.ImportGraphic(aGraphic, u"import", rObjectStream, GRFILTER_FORMAT_DONTKNOW, &format); CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult); @@ -1795,7 +1795,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf141171) GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); Graphic aGraphic; sal_uInt16 format; - ErrCode bResult = rFilter.ImportGraphic(aGraphic, OUString("import"), rObjectStream, + ErrCode bResult = rFilter.ImportGraphic(aGraphic, u"import", rObjectStream, GRFILTER_FORMAT_DONTKNOW, &format); CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult); @@ -1852,7 +1852,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf129085) GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); Graphic aGraphic; sal_uInt16 format; - ErrCode bResult = rFilter.ImportGraphic(aGraphic, OUString("import"), rObjectStream, + ErrCode bResult = rFilter.ImportGraphic(aGraphic, u"import", rObjectStream, GRFILTER_FORMAT_DONTKNOW, &format); CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult); |