From e0c33ec15f53a01fa3ee07489871bbe09bb5c9c3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 6 Oct 2023 09:42:38 +0200 Subject: loplugin:ostr: automatic rewrite Change-Id: I2d09b2b83e1b50493ec88d0b2c323a83c0c86395 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157647 Reviewed-by: Stephan Bergmann Tested-by: Jenkins --- filter/qa/unit/textfilterdetect.cxx | 6 +++--- filter/source/pdf/pdfexport.cxx | 2 +- filter/source/svg/svgexport.cxx | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'filter') diff --git a/filter/qa/unit/textfilterdetect.cxx b/filter/qa/unit/textfilterdetect.cxx index 293f211a46e3..e8de97a8df61 100644 --- a/filter/qa/unit/textfilterdetect.cxx +++ b/filter/qa/unit/textfilterdetect.cxx @@ -138,7 +138,7 @@ CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testEmptyFile) uno::Reference xParagraph(xEnum->nextElement(), uno::UNO_QUERY_THROW); // Make sure the template's text was loaded - CPPUNIT_ASSERT_EQUAL(OUString(u"Writer template’s first line"), xParagraph->getString()); + CPPUNIT_ASSERT_EQUAL(u"Writer template’s first line"_ustr, xParagraph->getString()); } loadFromURL(u"empty.ods"); @@ -148,7 +148,7 @@ CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testEmptyFile) uno::Reference xC(xRA->getCellByPosition(0, 0, 0), uno::UNO_QUERY_THROW); // Make sure the template's text was loaded - CPPUNIT_ASSERT_EQUAL(OUString(u"Calc template’s first cell"), xC->getString()); + CPPUNIT_ASSERT_EQUAL(u"Calc template’s first cell"_ustr, xC->getString()); } loadFromURL(u"empty.odp"); @@ -169,7 +169,7 @@ CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testEmptyFile) uno::Reference xParagraph(xEnum->nextElement(), uno::UNO_QUERY_THROW); // Make sure the template's text was loaded - CPPUNIT_ASSERT_EQUAL(OUString(u"Writer template’s first line"), xParagraph->getString()); + CPPUNIT_ASSERT_EQUAL(u"Writer template’s first line"_ustr, xParagraph->getString()); } } } diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index a9a717a56cc5..bfa67aea1787 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -958,7 +958,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& else if (aSrcMimetype == "application/vnd.oasis.opendocument.graphics") aExt = ".odg"; std::unique_ptr pStream(new PDFExportStreamDoc(mxSrcDoc, aPreparedPermissionPassword)); - aPDFWriter.AddAttachedFile("Original" + aExt, aSrcMimetype, u"Embedded original document of this PDF file", std::move(pStream)); + aPDFWriter.AddAttachedFile("Original" + aExt, aSrcMimetype, u"Embedded original document of this PDF file"_ustr, std::move(pStream)); } if ( pOut ) diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 98a21eeed5c1..1e7756b8657a 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -308,7 +308,7 @@ public: OUString sDateTimeFormat = sDateFormat + " " + sTimeFormat; - pSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "date-time-format", sDateTimeFormat ); + pSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "date-time-format"_ustr, sDateTimeFormat ); SvXMLElementExport aExp( *pSVGExport, XML_NAMESPACE_NONE, "g", true, true ); } virtual void growCharSet( SVGFilter::UCharSetMapMap & aTextFieldCharSets ) const override @@ -1220,13 +1220,13 @@ void SVGFilter::implGenerateMetaData() // we wrap all meta presentation info into a svg:defs element SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", NSPREFIX "meta_slides" ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "number-of-slides", OUString::number( nCount ) ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "start-slide-number", OUString::number( mnVisiblePage ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", NSPREFIX "meta_slides"_ustr ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "number-of-slides"_ustr, OUString::number( nCount ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "start-slide-number"_ustr, OUString::number( mnVisiblePage ) ); if( mpSVGExport->IsUsePositionedCharacters() ) { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "use-positioned-chars", "true" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "use-positioned-chars"_ustr, "true" ); } // Add a (global) Page Numbering Type attribute for the document @@ -1267,20 +1267,20 @@ void SVGFilter::implGenerateMetaData() break; } if( !sNumberingType.isEmpty() ) - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "page-numbering-type", sNumberingType ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "page-numbering-type"_ustr, sNumberingType ); } { SvXMLElementExport aExp( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); - const OUString aId( NSPREFIX "meta_slide" ); + const OUString aId( NSPREFIX "meta_slide"_ustr ); const OUString aElemTextFieldId( aOOOElemTextField ); std::vector< std::unique_ptr > aFieldSet; // dummy slide - used as leaving slide for transition on the first slide if( mbPresentation ) { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", NSPREFIX "meta_dummy_slide" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", NSPREFIX "meta_dummy_slide"_ustr ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrSlide, "dummy-slide" ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrMaster, "dummy-master-page" ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrBackgroundVisibility, "hidden" ); @@ -1353,7 +1353,7 @@ void SVGFilter::implGenerateMetaData() bPageNumberVisibility = bPageNumberVisibility && ( nPageNumberingType != css::style::NumberingType::NUMBER_NONE ); if( bPageNumberVisibility ) // visibility default value: 'hidden' { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "page-number-visibility", "visible" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "page-number-visibility"_ustr, "visible" ); } // DateTime Field @@ -1377,7 +1377,7 @@ void SVGFilter::implGenerateMetaData() xPropSet->getPropertyValue( "IsDateTimeVisible" ) >>= bDateTimeVisibility; if( !bDateTimeVisibility ) // visibility default value: 'visible' { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "date-time-visibility", "hidden" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "date-time-visibility"_ustr, "hidden" ); } // Footer Field @@ -1390,7 +1390,7 @@ void SVGFilter::implGenerateMetaData() xPropSet->getPropertyValue( "IsFooterVisible" ) >>= bFooterVisibility; if( !bFooterVisibility ) // visibility default value: 'visible' { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "footer-visibility", "hidden" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "footer-visibility"_ustr, "hidden" ); } } else @@ -1534,7 +1534,7 @@ void SVGFilter::implExportTextShapeIndex() if( !rPageId.isEmpty() && !sTextShapeIdList.isEmpty() ) { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrSlide, rPageId ); - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "id-list", sTextShapeIdList ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "id-list"_ustr, sTextShapeIdList ); SvXMLElementExport aGElem( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); } } @@ -2203,7 +2203,7 @@ bool SVGFilter::implExportShape( const Reference< css::drawing::XShape >& rxShap default: break; } - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "text-adjust", sTextAdjust ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, NSPREFIX "text-adjust"_ustr, sTextAdjust ); } } mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", aShapeClass ); -- cgit