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 /vcl | |
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 'vcl')
-rw-r--r-- | vcl/qa/api/XGraphicTest.cxx | 2 | ||||
-rw-r--r-- | vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx | 2 | ||||
-rw-r--r-- | vcl/qa/cppunit/jpeg/JpegReaderTest.cxx | 2 | ||||
-rw-r--r-- | vcl/qa/cppunit/jpeg/JpegWriterTest.cxx | 2 | ||||
-rw-r--r-- | vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/IconThemeInfo.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/printer/ppdparser.cxx | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/vcl/qa/api/XGraphicTest.cxx b/vcl/qa/api/XGraphicTest.cxx index 52374ff77070..3694e52ce38f 100644 --- a/vcl/qa/api/XGraphicTest.cxx +++ b/vcl/qa/api/XGraphicTest.cxx @@ -22,7 +22,7 @@ namespace { using namespace css; -OUStringLiteral const gaDataUrl = u"/vcl/qa/api/data/"; +constexpr OUStringLiteral gaDataUrl = u"/vcl/qa/api/data/"; class XGraphicTest : public test::BootstrapFixture { diff --git a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx index 9c560459c24a..d13696571a9e 100644 --- a/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx +++ b/vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx @@ -21,7 +21,7 @@ #include <svdata.hxx> #include <salinst.hxx> -OUStringLiteral const gaDataUrl = u"/vcl/qa/cppunit/bitmaprender/data/"; +constexpr OUStringLiteral gaDataUrl = u"/vcl/qa/cppunit/bitmaprender/data/"; class BitmapRenderTest : public test::BootstrapFixture { diff --git a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx index 953a35df93b1..65f5f8047bb6 100644 --- a/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx +++ b/vcl/qa/cppunit/jpeg/JpegReaderTest.cxx @@ -13,7 +13,7 @@ #include <bitmapwriteaccess.hxx> #include <tools/stream.hxx> -OUStringLiteral const gaDataUrl(u"/vcl/qa/cppunit/jpeg/data/"); +constexpr OUStringLiteral gaDataUrl(u"/vcl/qa/cppunit/jpeg/data/"); class JpegReaderTest : public test::BootstrapFixtureBase { diff --git a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx index 2b89f9427395..fcd343ec4edc 100644 --- a/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx +++ b/vcl/qa/cppunit/jpeg/JpegWriterTest.cxx @@ -13,7 +13,7 @@ #include <vcl/bitmapaccess.hxx> #include <tools/stream.hxx> -OUStringLiteral const gaDataUrl(u"/vcl/qa/cppunit/jpeg/data/"); +constexpr OUStringLiteral gaDataUrl(u"/vcl/qa/cppunit/jpeg/data/"); class JpegWriterTest : public test::BootstrapFixtureBase { diff --git a/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx b/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx index ca2eb15a5b98..ac5accc5c940 100644 --- a/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx +++ b/vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx @@ -16,7 +16,7 @@ namespace { -OUStringLiteral const gaDataUrl(u"/vcl/qa/cppunit/widgetdraw/data/"); +constexpr OUStringLiteral gaDataUrl(u"/vcl/qa/cppunit/widgetdraw/data/"); class WidgetDefinitionReaderTest : public test::BootstrapFixtureBase { diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx index d37519549962..aa7a5cf7c1bd 100644 --- a/vcl/source/app/IconThemeInfo.cxx +++ b/vcl/source/app/IconThemeInfo.cxx @@ -18,9 +18,9 @@ namespace { -const OUStringLiteral KARASA_JAGA_ID(u"karasa_jaga"); -const OUStringLiteral KARASA_JAGA_DISPLAY_NAME(u"Karasa Jaga"); -const OUStringLiteral HELPIMG_FAKE_THEME(u"helpimg"); +constexpr OUStringLiteral KARASA_JAGA_ID(u"karasa_jaga"); +constexpr OUStringLiteral KARASA_JAGA_DISPLAY_NAME(u"Karasa Jaga"); +constexpr OUStringLiteral HELPIMG_FAKE_THEME(u"helpimg"); OUString filename_from_url(const OUString& url) diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index 88338abb9cb9..b3137fd2b00c 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -962,7 +962,7 @@ void PPDParser::parse( ::std::vector< OString >& rLines ) // ppd_group_t structure. Groups can be specified in the PPD file; if an // option is not associated with a group, it is put in a "General" or // "Extra" group depending on the option. - static const OStringLiteral aDefaultPPDGroupName("General"); + static constexpr OStringLiteral aDefaultPPDGroupName("General"); std::vector< OString >::iterator line = rLines.begin(); PPDParser::hash_type::const_iterator keyit; |