diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-09-20 12:53:27 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-22 12:58:14 +0200 |
commit | de74d98c58db604aafc0ee623c252f3aa25ac4b7 (patch) | |
tree | 1ff996e3f5bc27c10c7c64313a357a5a9c2bfa86 /chart2 | |
parent | be8a33c0f03b83357d2ae37dda6bf65313267cea (diff) |
OUStringLiteral/OStringLiteral coverity PARSE_ERROR workaround
do more like
commit 121771e37f7e2de41cd5643475861062bf25627b
Date: Mon Sep 21 09:17:54 2020 +0200
Make some OUStringLiteral vars constexpr
cause coverity can live with that
Change-Id: I9efd7f848289c4865997a44c6780373068422227
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103147
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2')
-rw-r--r-- | chart2/source/controller/dialogs/DialogModel.cxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/dialogs/tp_DataSource.cxx | 2 | ||||
-rw-r--r-- | chart2/source/controller/sidebar/ChartColorWrapper.cxx | 2 | ||||
-rw-r--r-- | chart2/source/model/main/ChartModel.cxx | 4 | ||||
-rw-r--r-- | chart2/source/view/main/ChartView.cxx | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index cb4bc4413f20..7e7d10896d03 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -54,7 +54,7 @@ using ::com::sun::star::uno::Sequence; namespace { -const OUStringLiteral lcl_aLabelRole( u"label" ); +constexpr OUStringLiteral lcl_aLabelRole( u"label" ); struct lcl_ChartTypeToSeriesCnt { diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 99b24f47d5f4..6ac626957517 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -46,7 +46,7 @@ using ::com::sun::star::uno::Sequence; namespace { -const OUStringLiteral lcl_aLabelRole( u"label" ); +constexpr OUStringLiteral lcl_aLabelRole( u"label" ); void lcl_UpdateCurrentRange(weld::TreeView& rOutListBox, const OUString & rRole, const OUString& rRange) diff --git a/chart2/source/controller/sidebar/ChartColorWrapper.cxx b/chart2/source/controller/sidebar/ChartColorWrapper.cxx index aace24ef7830..962c5b935004 100644 --- a/chart2/source/controller/sidebar/ChartColorWrapper.cxx +++ b/chart2/source/controller/sidebar/ChartColorWrapper.cxx @@ -100,7 +100,7 @@ void ChartColorWrapper::updateModel(const css::uno::Reference<css::frame::XModel void ChartColorWrapper::updateData() { - static const OUStringLiteral aLineColor = u"LineColor"; + static constexpr OUStringLiteral aLineColor = u"LineColor"; static const std::u16string_view aCommands[2] = {u".uno:XLineColor", u".uno:FillColor"}; css::uno::Reference<css::beans::XPropertySet> xPropSet = getPropSet(mxModel); diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 14d96c15a874..0b75c82319d1 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -69,9 +69,9 @@ using namespace ::chart::CloneHelper; namespace { -const OUStringLiteral lcl_aGDIMetaFileMIMEType( +constexpr OUStringLiteral lcl_aGDIMetaFileMIMEType( u"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\""); -const OUStringLiteral lcl_aGDIMetaFileMIMETypeHighContrast( +constexpr OUStringLiteral lcl_aGDIMetaFileMIMETypeHighContrast( u"application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\""); } // anonymous namespace diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 126a041fe832..bfb7ed2bda20 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1108,9 +1108,9 @@ void ChartView::impl_deleteCoordinateSystems() // datatransfer::XTransferable namespace { -const OUStringLiteral lcl_aGDIMetaFileMIMEType( +constexpr OUStringLiteral lcl_aGDIMetaFileMIMEType( u"application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ); -const OUStringLiteral lcl_aGDIMetaFileMIMETypeHighContrast( +constexpr OUStringLiteral lcl_aGDIMetaFileMIMETypeHighContrast( u"application/x-openoffice-highcontrast-gdimetafile;windows_formatname=\"GDIMetaFile\"" ); } // anonymous namespace |