diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-07-30 17:49:42 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-07-31 12:55:48 +0200 |
commit | ef59252a7a3e9474569710866ab4ff5c1225cff7 (patch) | |
tree | 2e44048187b5606567e6e89771605437adeaf895 /sc/source/filter/oox | |
parent | b890de156e335eb10ba70530d9b0599d602ccf07 (diff) |
Improved loplugin:stringconstant (now that GCC 7 supports it): sc
Change-Id: I1bfd2bb623aac5ac457a0b719da64ab393ccd0ba
Reviewed-on: https://gerrit.libreoffice.org/76654
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc/source/filter/oox')
-rw-r--r-- | sc/source/filter/oox/drawingfragment.cxx | 24 | ||||
-rw-r--r-- | sc/source/filter/oox/excelfilter.cxx | 2 | ||||
-rw-r--r-- | sc/source/filter/oox/ooxformulaparser.cxx | 4 | ||||
-rw-r--r-- | sc/source/filter/oox/querytablebuffer.cxx | 2 |
4 files changed, 16 insertions, 16 deletions
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index 70701e193c28..0aa475a64f94 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -425,19 +425,19 @@ OUString VmlDrawing::getShapeBaseName( const ::oox::vml::ShapeBase& rShape ) con { switch( pClientData->mnObjType ) { - case XML_Button: return OUString( "Button" ); - case XML_Checkbox: return OUString( "Check Box" ); - case XML_Dialog: return OUString( "Dialog Frame" ); - case XML_Drop: return OUString( "Drop Down" ); - case XML_Edit: return OUString( "Edit Box" ); - case XML_GBox: return OUString( "Group Box" ); - case XML_Label: return OUString( "Label" ); - case XML_List: return OUString( "List Box" ); - case XML_Note: return OUString( "Comment" ); + case XML_Button: return "Button"; + case XML_Checkbox: return "Check Box"; + case XML_Dialog: return "Dialog Frame"; + case XML_Drop: return "Drop Down"; + case XML_Edit: return "Edit Box"; + case XML_GBox: return "Group Box"; + case XML_Label: return "Label"; + case XML_List: return "List Box"; + case XML_Note: return "Comment"; case XML_Pict: return (pClientData->mbDde || getOleObjectInfo( rShape.getShapeId() )) ? OUString( "Object" ) : OUString( "Picture" ); - case XML_Radio: return OUString( "Option Button" ); - case XML_Scroll: return OUString( "Scroll Bar" ); - case XML_Spin: return OUString( "Spinner" ); + case XML_Radio: return "Option Button"; + case XML_Scroll: return "Scroll Bar"; + case XML_Spin: return "Spinner"; } } return ::oox::vml::Drawing::getShapeBaseName( rShape ); diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index fcf582a5bc26..dfca3600283a 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -244,7 +244,7 @@ sal_Bool SAL_CALL ExcelFilter::filter( const css::uno::Sequence< css::beans::Pro OUString ExcelFilter::getImplementationName() { - return OUString( "com.sun.star.comp.oox.xls.ExcelFilter" ); + return "com.sun.star.comp.oox.xls.ExcelFilter"; } } // namespace xls diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index eb94e35b2d62..ce280cbf8b1a 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -110,7 +110,7 @@ OOXMLFormulaParser::~OOXMLFormulaParser() // com.sun.star.lang.XServiceInfo interface ----------------------------------- OUString SAL_CALL OOXMLFormulaParser::getImplementationName() { - return OUString( "com.sun.star.comp.oox.xls.FormulaParser"); + return "com.sun.star.comp.oox.xls.FormulaParser"; } sal_Bool SAL_CALL OOXMLFormulaParser::supportsService( const OUString& rService ) @@ -138,7 +138,7 @@ void SAL_CALL OOXMLFormulaParser::initialize( const Sequence< Any >& rArgs ) OUString SAL_CALL OOXMLFormulaParser::getSupportedNamespace() { - return OUString( "http://schemas.microsoft.com/office/excel/formula"); + return "http://schemas.microsoft.com/office/excel/formula"; } // com.sun.star.sheet.XFormulaParser interface -------------------------------- diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index 437dd4e263ad..cf16040337fe 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -86,7 +86,7 @@ void lclAppendWebQueryTableIndex( OUStringBuffer& rTables, sal_Int32 nTableIndex OUString lclBuildWebQueryTables( const WebPrModel::TablesVector& rTables ) { if( rTables.empty() ) - return OUString( "HTML_tables" ); + return "HTML_tables"; OUStringBuffer aTables; for( const auto& rTable : rTables ) |