diff options
author | Noel Grandin <noel@peralex.com> | 2016-07-21 14:23:23 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-16 06:30:09 +0000 |
commit | 127f70d66ac32b7a4ec818adaf1bdccb71865ee5 (patch) | |
tree | a020d2002c2eea81484297421f0fbe3ee84c2db0 /reportdesign | |
parent | ce95e39f8e952159844e9dc04a1df402bb103634 (diff) |
new loplugin to check for static OUStrings
that are better declared as OUStringLiteral
Change-Id: Ifb5d9a12bb31a68641940bec16971a8181a46567
Reviewed-on: https://gerrit.libreoffice.org/27377
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/core/api/ReportDefinition.cxx | 42 | ||||
-rw-r--r-- | reportdesign/source/ui/inspection/DataProviderHandler.cxx | 12 | ||||
-rw-r--r-- | reportdesign/source/ui/inspection/metadata.cxx | 108 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 22 |
4 files changed, 91 insertions, 93 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 141338d2ad88..f2a686d10102 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -2195,27 +2195,27 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames() throw( uno::RuntimeException, std::exception ) { - static const OUString aSvxComponentServiceNameList[] = - { - OUString("com.sun.star.form.component.FixedText"), - OUString("com.sun.star.form.component.DatabaseImageControl"), - OUString("com.sun.star.style.PageStyle"), - OUString("com.sun.star.style.GraphicStyle"), - OUString("com.sun.star.style.FrameStyle"), - OUString("com.sun.star.drawing.Defaults"), - OUString("com.sun.star.document.ImportEmbeddedObjectResolver"), - OUString("com.sun.star.document.ExportEmbeddedObjectResolver"), - OUString("com.sun.star.document.ImportGraphicObjectResolver"), - OUString("com.sun.star.document.ExportGraphicObjectResolver"), - OUString("com.sun.star.chart2.data.DataProvider"), - OUString("com.sun.star.xml.NamespaceMap"), - OUString("com.sun.star.document.Settings"), - OUString("com.sun.star.drawing.GradientTable"), - OUString("com.sun.star.drawing.HatchTable"), - OUString("com.sun.star.drawing.BitmapTable"), - OUString("com.sun.star.drawing.TransparencyGradientTable"), - OUString("com.sun.star.drawing.DashTable"), - OUString("com.sun.star.drawing.MarkerTable") + static const OUStringLiteral aSvxComponentServiceNameList[] = + { + OUStringLiteral("com.sun.star.form.component.FixedText"), + OUStringLiteral("com.sun.star.form.component.DatabaseImageControl"), + OUStringLiteral("com.sun.star.style.PageStyle"), + OUStringLiteral("com.sun.star.style.GraphicStyle"), + OUStringLiteral("com.sun.star.style.FrameStyle"), + OUStringLiteral("com.sun.star.drawing.Defaults"), + OUStringLiteral("com.sun.star.document.ImportEmbeddedObjectResolver"), + OUStringLiteral("com.sun.star.document.ExportEmbeddedObjectResolver"), + OUStringLiteral("com.sun.star.document.ImportGraphicObjectResolver"), + OUStringLiteral("com.sun.star.document.ExportGraphicObjectResolver"), + OUStringLiteral("com.sun.star.chart2.data.DataProvider"), + OUStringLiteral("com.sun.star.xml.NamespaceMap"), + OUStringLiteral("com.sun.star.document.Settings"), + OUStringLiteral("com.sun.star.drawing.GradientTable"), + OUStringLiteral("com.sun.star.drawing.HatchTable"), + OUStringLiteral("com.sun.star.drawing.BitmapTable"), + OUStringLiteral("com.sun.star.drawing.TransparencyGradientTable"), + OUStringLiteral("com.sun.star.drawing.DashTable"), + OUStringLiteral("com.sun.star.drawing.MarkerTable") }; static const sal_uInt16 nSvxComponentServiceNameListCount = SAL_N_ELEMENTS(aSvxComponentServiceNameList); diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 0d4dff5affbb..6349cb0e66dd 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -366,15 +366,15 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope { rptui::OPropertyInfoService::getExcludeProperties( aNewProps, m_xFormComponentHandler ); beans::Property aValue; - static const OUString s_pProperties[] = + static const OUStringLiteral s_pProperties[] = { - OUString(PROPERTY_CHARTTYPE) - ,OUString(PROPERTY_MASTERFIELDS) - ,OUString(PROPERTY_DETAILFIELDS) - ,OUString(PROPERTY_PREVIEW_COUNT) + OUStringLiteral(PROPERTY_CHARTTYPE) + ,OUStringLiteral(PROPERTY_MASTERFIELDS) + ,OUStringLiteral(PROPERTY_DETAILFIELDS) + ,OUStringLiteral(PROPERTY_PREVIEW_COUNT) }; - for (const OUString & rName : s_pProperties) + for (const auto & rName : s_pProperties) { aValue.Name = rName; aNewProps.push_back(aValue); diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index e9882d71937e..480e19c83d15 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -232,61 +232,61 @@ namespace rptui void OPropertyInfoService::getExcludeProperties(::std::vector< beans::Property >& _rExcludeProperties,const css::uno::Reference< css::inspection::XPropertyHandler >& _xFormComponentHandler) { uno::Sequence< beans::Property > aProps = _xFormComponentHandler->getSupportedProperties(); - static const OUString pExcludeProperties[] = + static const OUStringLiteral pExcludeProperties[] = { - OUString("Enabled"), - OUString("Printable"), - OUString("WordBreak"), - OUString("MultiLine"), - OUString("Tag"), - OUString("HelpText"), - OUString("HelpURL"), - OUString("MaxTextLen"), - OUString("ReadOnly"), - OUString("Tabstop"), - OUString("TabIndex"), - OUString("ValueMin"), - OUString("ValueMax"), - OUString("Spin"), - OUString("SpinValue"), - OUString("SpinValueMin"), - OUString("SpinValueMax"), - OUString("DefaultSpinValue"), - OUString("SpinIncrement"), - OUString("Repeat"), - OUString("RepeatDelay"), - OUString("ControlLabel"), /// TODO: has to be checked - OUString("LabelControl"), - OUString("Title"), // comment this out if you want to have title feature for charts - OUString(PROPERTY_MAXTEXTLEN), - OUString(PROPERTY_EFFECTIVEDEFAULT), - OUString(PROPERTY_EFFECTIVEMAX), - OUString(PROPERTY_EFFECTIVEMIN), - OUString("HideInactiveSelection"), - OUString("SubmitAction"), - OUString("InputRequired"), - OUString("VerticalAlign"), - OUString(PROPERTY_ALIGN), - OUString(PROPERTY_EMPTY_IS_NULL), - OUString(PROPERTY_FILTERPROPOSAL) - ,OUString(PROPERTY_POSITIONX) - ,OUString(PROPERTY_POSITIONY) - ,OUString(PROPERTY_WIDTH) - ,OUString(PROPERTY_HEIGHT) - ,OUString(PROPERTY_FONT) - ,OUString(PROPERTY_LABEL) - ,OUString(PROPERTY_LINECOLOR) - ,OUString(PROPERTY_BORDER) - ,OUString(PROPERTY_BORDERCOLOR) - ,OUString(PROPERTY_BACKTRANSPARENT) - ,OUString(PROPERTY_CONTROLBACKGROUND) - ,OUString(PROPERTY_BACKGROUNDCOLOR) - ,OUString(PROPERTY_CONTROLBACKGROUNDTRANSPARENT) - ,OUString(PROPERTY_FORMULALIST) - ,OUString(PROPERTY_SCOPE) - ,OUString(PROPERTY_TYPE) - ,OUString(PROPERTY_DATASOURCENAME) - ,OUString(PROPERTY_VERTICALALIGN) + OUStringLiteral("Enabled"), + OUStringLiteral("Printable"), + OUStringLiteral("WordBreak"), + OUStringLiteral("MultiLine"), + OUStringLiteral("Tag"), + OUStringLiteral("HelpText"), + OUStringLiteral("HelpURL"), + OUStringLiteral("MaxTextLen"), + OUStringLiteral("ReadOnly"), + OUStringLiteral("Tabstop"), + OUStringLiteral("TabIndex"), + OUStringLiteral("ValueMin"), + OUStringLiteral("ValueMax"), + OUStringLiteral("Spin"), + OUStringLiteral("SpinValue"), + OUStringLiteral("SpinValueMin"), + OUStringLiteral("SpinValueMax"), + OUStringLiteral("DefaultSpinValue"), + OUStringLiteral("SpinIncrement"), + OUStringLiteral("Repeat"), + OUStringLiteral("RepeatDelay"), + OUStringLiteral("ControlLabel"), /// TODO: has to be checked + OUStringLiteral("LabelControl"), + OUStringLiteral("Title"), // comment this out if you want to have title feature for charts + OUStringLiteral(PROPERTY_MAXTEXTLEN), + OUStringLiteral(PROPERTY_EFFECTIVEDEFAULT), + OUStringLiteral(PROPERTY_EFFECTIVEMAX), + OUStringLiteral(PROPERTY_EFFECTIVEMIN), + OUStringLiteral("HideInactiveSelection"), + OUStringLiteral("SubmitAction"), + OUStringLiteral("InputRequired"), + OUStringLiteral("VerticalAlign"), + OUStringLiteral(PROPERTY_ALIGN), + OUStringLiteral(PROPERTY_EMPTY_IS_NULL), + OUStringLiteral(PROPERTY_FILTERPROPOSAL) + ,OUStringLiteral(PROPERTY_POSITIONX) + ,OUStringLiteral(PROPERTY_POSITIONY) + ,OUStringLiteral(PROPERTY_WIDTH) + ,OUStringLiteral(PROPERTY_HEIGHT) + ,OUStringLiteral(PROPERTY_FONT) + ,OUStringLiteral(PROPERTY_LABEL) + ,OUStringLiteral(PROPERTY_LINECOLOR) + ,OUStringLiteral(PROPERTY_BORDER) + ,OUStringLiteral(PROPERTY_BORDERCOLOR) + ,OUStringLiteral(PROPERTY_BACKTRANSPARENT) + ,OUStringLiteral(PROPERTY_CONTROLBACKGROUND) + ,OUStringLiteral(PROPERTY_BACKGROUNDCOLOR) + ,OUStringLiteral(PROPERTY_CONTROLBACKGROUNDTRANSPARENT) + ,OUStringLiteral(PROPERTY_FORMULALIST) + ,OUStringLiteral(PROPERTY_SCOPE) + ,OUStringLiteral(PROPERTY_TYPE) + ,OUStringLiteral(PROPERTY_DATASOURCENAME) + ,OUStringLiteral(PROPERTY_VERTICALALIGN) }; beans::Property* pPropsIter = aProps.getArray(); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 0ca28052c41b..4e12a3d852b9 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2069,15 +2069,15 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _ { if ( _xLayoutManager.is() ) { - static const OUString s_sMenu[] = { - OUString("private:resource/statusbar/statusbar") - ,OUString("private:resource/toolbar/reportcontrols") - ,OUString("private:resource/toolbar/drawbar") - ,OUString("private:resource/toolbar/Formatting") - ,OUString("private:resource/toolbar/alignmentbar") - ,OUString("private:resource/toolbar/sectionalignmentbar") - ,OUString("private:resource/toolbar/resizebar") - ,OUString("private:resource/toolbar/sectionshrinkbar") + static const OUStringLiteral s_sMenu[] = { + OUStringLiteral("private:resource/statusbar/statusbar") + ,OUStringLiteral("private:resource/toolbar/reportcontrols") + ,OUStringLiteral("private:resource/toolbar/drawbar") + ,OUStringLiteral("private:resource/toolbar/Formatting") + ,OUStringLiteral("private:resource/toolbar/alignmentbar") + ,OUStringLiteral("private:resource/toolbar/sectionalignmentbar") + ,OUStringLiteral("private:resource/toolbar/resizebar") + ,OUStringLiteral("private:resource/toolbar/sectionshrinkbar") }; for (const auto & i : s_sMenu) { @@ -4063,9 +4063,7 @@ OUString SAL_CALL OReportController::getMode( ) throw (css::uno::RuntimeExcepti } css::uno::Sequence< OUString > SAL_CALL OReportController::getSupportedModes( ) throw (css::uno::RuntimeException, std::exception) { - static const OUString s_sModes[] = { OUString("remote"), - OUString("normal") }; - return uno::Sequence< OUString> (&s_sModes[0],SAL_N_ELEMENTS(s_sModes)); + return uno::Sequence< OUString> { OUString("remote"), OUString("normal") }; } sal_Bool SAL_CALL OReportController::supportsMode( const OUString& aMode ) throw (css::uno::RuntimeException, std::exception) { |