summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-23 13:16:31 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-26 14:51:15 +0100
commita3d0091d185f39eddabf4d372ebe0ac3061dbb89 (patch)
tree4d70cedc274972ccc21b6b8e7105f042090cf5d6 /writerfilter
parentaf791fb775e35c11ad01c42a7085dd121ab9c7a6 (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 'writerfilter')
-rw-r--r--writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx2
-rw-r--r--writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx2
-rw-r--r--writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx2
-rw-r--r--writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx2
-rw-r--r--writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx2
-rw-r--r--writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx2
-rw-r--r--writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx2
-rw-r--r--writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx2
-rw-r--r--writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx2
-rw-r--r--writerfilter/source/dmapper/FormControlHelper.cxx2
-rw-r--r--writerfilter/source/dmapper/TextEffectsHandler.cxx2
11 files changed, 11 insertions, 11 deletions
diff --git a/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx b/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx
index 646d0968b7e5..a834cf1173ec 100644
--- a/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx
@@ -46,7 +46,7 @@ void Test::tearDown()
test::BootstrapFixture::tearDown();
}
-char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/dmapper/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/";
CPPUNIT_TEST_FIXTURE(Test, test129205)
{
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx
index d6e6830b88fb..4090d6a05381 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper.cxx
@@ -50,7 +50,7 @@ void Test::tearDown()
test::BootstrapFixture::tearDown();
}
-char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/dmapper/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/";
CPPUNIT_TEST_FIXTURE(Test, testLargeParaTopMargin)
{
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
index e49ea59d9cb5..d84fcac50d51 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
@@ -48,7 +48,7 @@ void Test::tearDown()
test::BootstrapFixture::tearDown();
}
-char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/dmapper/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/";
CPPUNIT_TEST_FIXTURE(Test, test1cellInsidevRightborder)
{
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
index 355b61898cf8..41d1d4065206 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
@@ -50,7 +50,7 @@ void Test::tearDown()
test::BootstrapFixture::tearDown();
}
-char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/dmapper/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/";
CPPUNIT_TEST_FIXTURE(Test, testPageBreakFooterTable)
{
diff --git a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
index 28a0cc178410..1d88c651a149 100644
--- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
@@ -50,7 +50,7 @@ void Test::tearDown()
test::BootstrapFixture::tearDown();
}
-char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/dmapper/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/";
CPPUNIT_TEST_FIXTURE(Test, testGroupShapeRotation)
{
diff --git a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx b/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
index 2c7586649c01..473f77a5c783 100644
--- a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
@@ -47,7 +47,7 @@ void Test::tearDown()
test::BootstrapFixture::tearDown();
}
-char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/dmapper/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/";
CPPUNIT_TEST_FIXTURE(Test, testFloatingTableHeader)
{
diff --git a/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx b/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx
index d48a35e25dc1..b3b7e5b1b11f 100644
--- a/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx
@@ -45,7 +45,7 @@ void Test::tearDown()
test::BootstrapFixture::tearDown();
}
-char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/dmapper/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/dmapper/data/";
CPPUNIT_TEST_FIXTURE(Test, testSemiTransparentText)
{
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx b/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx
index 64c679f6e5cc..6e8b09211ea3 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtfsdrimport.cxx
@@ -46,7 +46,7 @@ void Test::tearDown()
test::BootstrapFixture::tearDown();
}
-char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/rtftok/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/";
CPPUNIT_TEST_FIXTURE(Test, testPictureInTextframe)
{
diff --git a/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx b/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx
index 9f5ec63e8b3f..5a39d0b8f9cf 100644
--- a/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/rtfsprm.cxx
@@ -46,7 +46,7 @@ void Test::tearDown()
test::BootstrapFixture::tearDown();
}
-char const DATA_DIRECTORY[] = "/writerfilter/qa/cppunittests/rtftok/data/";
+OUStringLiteral const DATA_DIRECTORY = u"/writerfilter/qa/cppunittests/rtftok/data/";
CPPUNIT_TEST_FIXTURE(Test, testLeftMarginDedup)
{
diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx
index 180cbec10e85..599faebf535b 100644
--- a/writerfilter/source/dmapper/FormControlHelper.cxx
+++ b/writerfilter/source/dmapper/FormControlHelper.cxx
@@ -89,7 +89,7 @@ uno::Reference<form::XForm> const & FormControlHelper::FormControlHelper_Impl::g
if (xFormsSupplier.is())
{
uno::Reference<container::XNameContainer> xFormsNamedContainer(xFormsSupplier->getForms());
- static const char sDOCXForm[] = "DOCX-Standard";
+ static const OUStringLiteral sDOCXForm = u"DOCX-Standard";
OUString sFormName(sDOCXForm);
sal_uInt16 nUnique = 0;
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index 13fed5237051..7f707fbb845b 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -70,7 +70,7 @@ OUString lclGetNameForElementId(sal_uInt32 aId)
return aIdMap[aId];
}
-const char constAttributesSequenceName[] = "attributes";
+const OUStringLiteral constAttributesSequenceName = u"attributes";
}