diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-23 13:16:31 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-26 14:51:15 +0100 |
| commit | a3d0091d185f39eddabf4d372ebe0ac3061dbb89 (patch) | |
| tree | 4d70cedc274972ccc21b6b8e7105f042090cf5d6 /filter | |
| parent | af791fb775e35c11ad01c42a7085dd121ab9c7a6 (diff) | |
New loplugin:stringliteralvar
See the comment at the top of compilerplugins/clang/stringliteralvar.cxx for
details.
(Turned some affected variables in included files into inline variables, to
avoid GCC warnings about unused variables.)
Change-Id: Ie77219e6adfdaaceaa8b4e590b08971f2f04c83a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108239
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/qa/unit/svg.cxx | 2 | ||||
| -rw-r--r-- | filter/qa/unit/textfilterdetect.cxx | 2 | ||||
| -rw-r--r-- | filter/source/svg/svgexport.cxx | 6 | ||||
| -rw-r--r-- | filter/source/svg/svgfilter.cxx | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/filter/qa/unit/svg.cxx b/filter/qa/unit/svg.cxx index 792964cb00d9..d870307a1c4d 100644 --- a/filter/qa/unit/svg.cxx +++ b/filter/qa/unit/svg.cxx @@ -20,7 +20,7 @@ using namespace ::com::sun::star; -char const DATA_DIRECTORY[] = "/filter/qa/unit/data/"; +OUStringLiteral const DATA_DIRECTORY = u"/filter/qa/unit/data/"; /// SVG filter tests. class SvgFilterTest : public test::BootstrapFixture, public unotest::MacrosTest, public XmlTestTools diff --git a/filter/qa/unit/textfilterdetect.cxx b/filter/qa/unit/textfilterdetect.cxx index fb1ff1d2ac7e..1efbebc47b93 100644 --- a/filter/qa/unit/textfilterdetect.cxx +++ b/filter/qa/unit/textfilterdetect.cxx @@ -54,7 +54,7 @@ void TextFilterDetectTest::tearDown() test::BootstrapFixture::tearDown(); } -char const DATA_DIRECTORY[] = "/filter/qa/unit/data/"; +OUStringLiteral const DATA_DIRECTORY = u"/filter/qa/unit/data/"; CPPUNIT_TEST_FIXTURE(TextFilterDetectTest, testTdf114428) { diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index bcf97a8b0678..a77457687076 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -83,7 +83,7 @@ using namespace ::xmloff::token; #define SVG_PROP_POSITIONED_CHARACTERS "UsePositionedCharacters" // ooo xml elements -constexpr char16_t aOOOElemTextField[] = u"" NSPREFIX "text_field"; +constexpr OUStringLiteral aOOOElemTextField = u"" NSPREFIX "text_field"; // ooo xml attributes for meta_slide @@ -93,13 +93,13 @@ const char aOOOAttrBackgroundVisibility[] = NSPREFIX "background-visibility"; const char aOOOAttrMasterObjectsVisibility[] = NSPREFIX "master-objects-visibility"; const char aOOOAttrSlideDuration[] = NSPREFIX "slide-duration"; const OUString aOOOAttrDateTimeField = NSPREFIX "date-time-field"; -const char aOOOAttrFooterField[] = NSPREFIX "footer-field"; +const OUStringLiteral aOOOAttrFooterField = u"" NSPREFIX "footer-field"; const char aOOOAttrHasTransition[] = NSPREFIX "has-transition"; // ooo xml attributes for pages and shapes const char aOOOAttrName[] = NSPREFIX "name"; -const char constSvgNamespace[] = "http://www.w3.org/2000/svg"; +const OUStringLiteral constSvgNamespace = u"http://www.w3.org/2000/svg"; /** Text Field Class Hierarchy diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 8025550b5837..a15dc12f53e6 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -63,8 +63,8 @@ using namespace ::com::sun::star; namespace { - const char constFilterNameDraw[] = "svg_Scalable_Vector_Graphics_Draw"; - const char constFilterName[] = "svg_Scalable_Vector_Graphics"; + const OUStringLiteral constFilterNameDraw = u"svg_Scalable_Vector_Graphics_Draw"; + const OUStringLiteral constFilterName = u"svg_Scalable_Vector_Graphics"; } SVGFilter::SVGFilter( const Reference< XComponentContext >& rxCtx ) : |