diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-28 17:56:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-29 16:42:33 +0100 |
| commit | 042033f1e6da22616cb76c8d950c20c9efecbad5 (patch) | |
| tree | 26b3f1f42d067506f44550b410f3fb9640616a5b /vcl/qa/cppunit/bitmaprender | |
| parent | ccfd8e9d09f9ac0a0ea92d0f378391006faaf934 (diff) | |
loplugin:stringviewparam: operator +
Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/qa/cppunit/bitmaprender')
| -rw-r--r-- | vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx index 10e6f82fc219..201d10e56fd3 100644 --- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx +++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx @@ -7,6 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <sal/config.h> + +#include <string_view> + #include <test/bootstrapfixture.hxx> #include <vcl/virdev.hxx> @@ -25,7 +29,7 @@ constexpr OUStringLiteral gaDataUrl = u"/vcl/qa/cppunit/bitmaprender/data/"; class BitmapRenderTest : public test::BootstrapFixture { - OUString getFullUrl(const OUString& sFileName) + OUString getFullUrl(std::u16string_view sFileName) { return m_directories.getURLFromSrc(gaDataUrl) + sFileName; } @@ -62,7 +66,7 @@ void BitmapRenderTest::testTdf104141() // Load animated GIF and draw it on green background GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); Graphic aGraphic; - const OUString aURL(getFullUrl("tdf104141.gif")); + const OUString aURL(getFullUrl(u"tdf104141.gif")); SvFileStream aFileStream(aURL, StreamMode::READ); ErrCode bResult = rFilter.ImportGraphic(aGraphic, aURL, aFileStream); CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult); @@ -85,7 +89,7 @@ void BitmapRenderTest::testTdf113918() GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); Graphic aGraphic; - const OUString aURL(getFullUrl("tdf113918.png")); + const OUString aURL(getFullUrl(u"tdf113918.png")); SvFileStream aFileStream(aURL, StreamMode::READ); ErrCode bResult = rFilter.ImportGraphic(aGraphic, aURL, aFileStream); CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult); @@ -128,7 +132,7 @@ void BitmapRenderTest::testDrawAlphaBitmapEx() CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetPixel(Point(1, 1))); CPPUNIT_ASSERT_EQUAL(COL_WHITE, pVDev->GetPixel(Point(2, 2))); - SvFileStream aFileStream(getFullUrl("ImageRGBA.png"), StreamMode::READ); + SvFileStream aFileStream(getFullUrl(u"ImageRGBA.png"), StreamMode::READ); vcl::PngImageReader aPngReader(aFileStream); BitmapEx aBitmapEx; @@ -238,7 +242,7 @@ void BitmapRenderTest::testTdf116888() // didn't properly release mpUserBuffer after ReadTexture() failure. GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); Graphic aGraphic; - const OUString aURL(getFullUrl("tdf116888.gif")); + const OUString aURL(getFullUrl(u"tdf116888.gif")); SvFileStream aFileStream(aURL, StreamMode::READ); ErrCode bResult = rFilter.ImportGraphic(aGraphic, aURL, aFileStream); CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult); |