From bc9fc85452a4da18df592be190347e9781dbba0a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 19 Oct 2023 10:30:27 +0200 Subject: Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: sdext Change-Id: I13d1279050de77e8ea054c6ee3a3bce97cec584b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158219 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sdext/qa/unit/pdfimport.cxx | 14 +++++++------- sdext/source/minimizer/informationdialog.cxx | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'sdext') diff --git a/sdext/qa/unit/pdfimport.cxx b/sdext/qa/unit/pdfimport.cxx index 2d7cee1295a4..8a65dff940ee 100644 --- a/sdext/qa/unit/pdfimport.cxx +++ b/sdext/qa/unit/pdfimport.cxx @@ -231,9 +231,9 @@ namespace CPPUNIT_ASSERT_MESSAGE( "Line width is 0", rtl::math::approxEqual(rContext.LineWidth, 28.3) ); - static constexpr OUStringLiteral sExportString = u"m53570 7650-35430 24100"; + static constexpr OUString sExportString = u"m53570 7650-35430 24100"_ustr; CPPUNIT_ASSERT_EQUAL_MESSAGE( "Stroke is m535.7 518.5-354.3-241", - OUString(sExportString), basegfx::utils::exportToSvgD( aPath, true, true, false ) ); + sExportString, basegfx::utils::exportToSvgD( aPath, true, true, false ) ); m_bGreenStrokeSeen = true; } @@ -253,9 +253,9 @@ namespace CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "Line width is 0", 0, rContext.LineWidth, 0.0000001 ); - static constexpr OUStringLiteral sExportString = u"m49890 5670.00000000001-35430 24090"; + static constexpr OUString sExportString = u"m49890 5670.00000000001-35430 24090"_ustr; CPPUNIT_ASSERT_EQUAL_MESSAGE( "Stroke is m49890 5670.00000000001-35430 24090", - OUString(sExportString), basegfx::utils::exportToSvgD( aPath, true, true, false ) ); + sExportString, basegfx::utils::exportToSvgD( aPath, true, true, false ) ); m_bDashedLineSeen = true; } @@ -310,11 +310,11 @@ namespace CPPUNIT_ASSERT_EQUAL_MESSAGE( "Font id is 0", sal_Int32(0), rContext.FontId ); - static constexpr OUStringLiteral sExportString + static constexpr OUString sExportString = u"m12050 49610c-4310 0-7800-3490-7800-7800 0-4300 " - "3490-7790 7800-7790 4300 0 7790 3490 7790 7790 0 4310-3490 7800-7790 7800z"; + "3490-7790 7800-7790 4300 0 7790 3490 7790 7790 0 4310-3490 7800-7790 7800z"_ustr; CPPUNIT_ASSERT_EQUAL_MESSAGE( "Stroke is a 4-bezier circle", - OUString(sExportString), basegfx::utils::exportToSvgD( aPath, true, true, false ) ); + sExportString, basegfx::utils::exportToSvgD( aPath, true, true, false ) ); m_bRedCircleSeen = true; } diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index dc4b03042895..caea0fc1d787 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -83,7 +83,7 @@ void InformationDialog::InitDialog() aURL.Complete = maSaveAsURL; xURLTransformer->parseSmart( aURL, OUString() ); - static constexpr OUStringLiteral sFileProtocol( u"file:///" ); + static constexpr OUString sFileProtocol( u"file:///"_ustr ); aPresentationURL.Complete = sFileProtocol + aURL.Name; aTitle = xURLTransformer->getPresentation( aPresentationURL, false ); @@ -93,8 +93,8 @@ void InformationDialog::InitDialog() OUString sPrimary( getString( STR_INFO_PRIMARY ) ); OUString sSecondary( getString( eInfoString ) ); - static constexpr OUStringLiteral aOldSizePlaceholder( u"%OLDFILESIZE" ); - static constexpr OUStringLiteral aNewSizePlaceholder( u"%NEWFILESIZE" ); + static constexpr OUString aOldSizePlaceholder( u"%OLDFILESIZE"_ustr ); + static constexpr OUString aNewSizePlaceholder( u"%NEWFILESIZE"_ustr ); const OUString aTitlePlaceholder( !aTitle.isEmpty() ? OUString("%TITLE" ) : OUString("'%TITLE'") ); -- cgit