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 /svx/source/tbxctrls | |
| 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 'svx/source/tbxctrls')
| -rw-r--r-- | svx/source/tbxctrls/extrusioncontrols.cxx | 4 | ||||
| -rw-r--r-- | svx/source/tbxctrls/fontworkgallery.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 092a7ab53539..387957e95d9c 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -326,8 +326,8 @@ double ExtrusionDepthDialog::getDepth() const double const aDepthListInch[] = { 0, 1270,2540,5080,10160 }; double const aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 }; -const OUStringLiteral gsExtrusionDepth( u".uno:ExtrusionDepth" ); -const OUStringLiteral gsMetricUnit( u".uno:MetricUnit" ); +constexpr OUStringLiteral gsExtrusionDepth( u".uno:ExtrusionDepth" ); +constexpr OUStringLiteral gsMetricUnit( u".uno:MetricUnit" ); ExtrusionDepthWindow::ExtrusionDepthWindow(svt::PopupWindowController* pControl, weld::Widget* pParent) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/depthwindow.ui", "DepthWindow") diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index d51f2e647422..24fa16afbe39 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -278,7 +278,7 @@ private: } -const OUStringLiteral gsFontworkAlignment(u".uno:FontworkAlignment"); +constexpr OUStringLiteral gsFontworkAlignment(u".uno:FontworkAlignment"); FontworkAlignmentWindow::FontworkAlignmentWindow(svt::PopupWindowController* pControl, weld::Widget* pParent) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/fontworkalignmentcontrol.ui", "FontworkAlignmentControl") @@ -464,8 +464,8 @@ private: } -const OUStringLiteral gsFontworkCharacterSpacing(u".uno:FontworkCharacterSpacing"); -const OUStringLiteral gsFontworkKernCharacterPairs(u".uno:FontworkKernCharacterPairs"); +constexpr OUStringLiteral gsFontworkCharacterSpacing(u".uno:FontworkCharacterSpacing"); +constexpr OUStringLiteral gsFontworkKernCharacterPairs(u".uno:FontworkKernCharacterPairs"); FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow(svt::PopupWindowController* pControl, weld::Widget* pParent) : WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/fontworkcharacterspacingcontrol.ui", "FontworkCharacterSpacingControl") |