From ec7a52125cd0674b58f58d0678e23885d67e1484 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 30 Jul 2019 17:49:08 +0200 Subject: Improved loplugin:stringconstant (now that GCC 7 supports it): sdext Change-Id: I3124c3e91c2bbf918113544d5d01b55a3f6b6005 Reviewed-on: https://gerrit.libreoffice.org/76649 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- sdext/source/minimizer/configurationaccess.cxx | 2 +- sdext/source/minimizer/pppoptimizerdialog.cxx | 2 +- sdext/source/pdfimport/filterdet.cxx | 2 +- sdext/source/pdfimport/inc/pdfihelper.hxx | 12 ++++++------ sdext/source/pdfimport/pdfiadaptor.cxx | 2 +- sdext/source/pdfimport/sax/saxattrlist.cxx | 2 +- sdext/source/presenter/PresenterProtocolHandler.cxx | 2 +- sdext/source/presenter/PresenterScreen.cxx | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) (limited to 'sdext') diff --git a/sdext/source/minimizer/configurationaccess.cxx b/sdext/source/minimizer/configurationaccess.cxx index bf6a472a1e68..32cad4b53a91 100644 --- a/sdext/source/minimizer/configurationaccess.cxx +++ b/sdext/source/minimizer/configurationaccess.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::container; static OUString GetPathToConfigurationRoot() { - return OUString("org.openoffice.Office.PresentationMinimizer"); + return "org.openoffice.Office.PresentationMinimizer"; } void OptimizerSettings::LoadSettingsFromConfiguration( const Reference< XNameAccess >& rSettings ) diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx index 8c0d0a28d26d..66efb3e29824 100644 --- a/sdext/source/minimizer/pppoptimizerdialog.cxx +++ b/sdext/source/minimizer/pppoptimizerdialog.cxx @@ -148,7 +148,7 @@ void SAL_CALL PPPOptimizerDialog::removeStatusListener( const Reference< XStatus OUString PPPOptimizerDialog_getImplementationName() { - return OUString( "com.sun.star.comp.PresentationMinimizerImp" ); + return "com.sun.star.comp.PresentationMinimizerImp"; } Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames() diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 01a1177f70e7..9ef8cccd6b9d 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -385,7 +385,7 @@ OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rF OUString PDFDetector::getImplementationName() { - return OUString("org.libreoffice.comp.documents.PDFDetector"); + return "org.libreoffice.comp.documents.PDFDetector"; } sal_Bool PDFDetector::supportsService(OUString const & ServiceName) diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx index 4a7fd569688e..6557ffad8612 100644 --- a/sdext/source/pdfimport/inc/pdfihelper.hxx +++ b/sdext/source/pdfimport/inc/pdfihelper.hxx @@ -154,11 +154,11 @@ namespace pdfi { default: case css::rendering::PathJoinType::MITER: - return OUString("miter"); + return "miter"; case css::rendering::PathJoinType::ROUND: - return OUString("round"); + return "round"; case css::rendering::PathJoinType::BEVEL: - return OUString("bevel"); + return "bevel"; } } @@ -168,11 +168,11 @@ namespace pdfi { default: case css::rendering::PathCapType::BUTT: - return OUString("butt"); + return "butt"; case css::rendering::PathCapType::ROUND: - return OUString("round"); + return "round"; case css::rendering::PathCapType::SQUARE: - return OUString("square"); + return "square"; } } diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index ee415ed31255..060795a47762 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -198,7 +198,7 @@ void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang:: OUString PDFIHybridAdaptor::getImplementationName() { - return OUString("org.libreoffice.comp.documents.HybridPDFImport"); + return "org.libreoffice.comp.documents.HybridPDFImport"; } sal_Bool PDFIHybridAdaptor::supportsService(OUString const & ServiceName) diff --git a/sdext/source/pdfimport/sax/saxattrlist.cxx b/sdext/source/pdfimport/sax/saxattrlist.cxx index 8efb6b4c9acc..538f6f4479b5 100644 --- a/sdext/source/pdfimport/sax/saxattrlist.cxx +++ b/sdext/source/pdfimport/sax/saxattrlist.cxx @@ -36,7 +36,7 @@ SaxAttrList::SaxAttrList( const std::unordered_map< OUString, OUString >& rMap ) namespace { OUString getCDATAString() { - return OUString( "CDATA" ); + return "CDATA"; } } diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx index a78b2ac32014..35b528d5ba9e 100644 --- a/sdext/source/presenter/PresenterProtocolHandler.cxx +++ b/sdext/source/presenter/PresenterProtocolHandler.cxx @@ -229,7 +229,7 @@ private: OUString PresenterProtocolHandler::getImplementationName_static() { - return OUString("org.libreoffice.comp.PresenterScreenProtocolHandler"); + return "org.libreoffice.comp.PresenterScreenProtocolHandler"; } Sequence PresenterProtocolHandler::getSupportedServiceNames_static() diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx index 8689934bf58d..7d7139f9161e 100644 --- a/sdext/source/presenter/PresenterScreen.cxx +++ b/sdext/source/presenter/PresenterScreen.cxx @@ -92,7 +92,7 @@ namespace { OUString PresenterScreenJob::getImplementationName_static() { - return OUString("org.libreoffice.comp.PresenterScreenJob"); + return "org.libreoffice.comp.PresenterScreenJob"; } Sequence PresenterScreenJob::getSupportedServiceNames_static() -- cgit