summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-11-19 09:50:52 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-11-24 13:23:59 +0100
commita069fac4a08f93db74799d00f047e04f1a0735cd (patch)
treeb16c457bab72bd6bc69435ba1a4b610b3cc8d6a0 /extensions
parentd9c85f5059000b129ca627df9f971396e4ee30d2 (diff)
loplugin:stringliteraldefine in comphelper
Change-Id: I60ccd6049db65fef2397798ab916b0d1e24c0fdc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125531 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/activex/so_activex.cxx78
1 files changed, 39 insertions, 39 deletions
diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx
index 5840e36b6521..c8e8828bdd93 100644
--- a/extensions/source/activex/so_activex.cxx
+++ b/extensions/source/activex/so_activex.cxx
@@ -178,43 +178,43 @@ const char* const aFileExt[] = { ".vor",
".sxw", ".sxc", ".sxi", ".sxd", ".sxg", ".sxm",
".ott", ".otg", ".otp", ".ots", ".otf",
".odt", ".oth", ".odm", ".odg", ".odp", ".ods", ".odf"};
-const char* const aMimeType[] = {
- "application/vnd.stardivision.writer",
-
- "application/vnd.stardivision.chart",
- "application/vnd.stardivision.draw",
- "application/vnd.stardivision.impress",
- "application/vnd.stardivision.impress-packed",
- "application/vnd.stardivision.calc",
- "application/vnd.stardivision.writer",
- "application/vnd.stardivision.math",
-
- MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII,
- MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII,
- MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII,
- MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII,
-
- MIMETYPE_VND_SUN_XML_WRITER_ASCII,
- MIMETYPE_VND_SUN_XML_CALC_ASCII,
- MIMETYPE_VND_SUN_XML_IMPRESS_ASCII,
- MIMETYPE_VND_SUN_XML_DRAW_ASCII,
- MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII,
- MIMETYPE_VND_SUN_XML_MATH_ASCII,
-
- MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII,
- MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII,
- MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII,
- MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII,
- MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII,
- MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII,
-
- MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII,
- MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII,
- MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII,
- MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII,
- MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII,
- MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII,
- MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII };
+const sal_Unicode* const aMimeType[] = {
+ u"application/vnd.stardivision.writer",
+
+ u"application/vnd.stardivision.chart",
+ u"application/vnd.stardivision.draw",
+ u"application/vnd.stardivision.impress",
+ u"application/vnd.stardivision.impress-packed",
+ u"application/vnd.stardivision.calc",
+ u"application/vnd.stardivision.writer",
+ u"application/vnd.stardivision.math",
+
+ MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII.getStr(),
+ MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII.getStr(),
+ MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII.getStr(),
+ MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII.getStr(),
+
+ MIMETYPE_VND_SUN_XML_WRITER_ASCII.getStr(),
+ MIMETYPE_VND_SUN_XML_CALC_ASCII.getStr(),
+ MIMETYPE_VND_SUN_XML_IMPRESS_ASCII.getStr(),
+ MIMETYPE_VND_SUN_XML_DRAW_ASCII.getStr(),
+ MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII.getStr(),
+ MIMETYPE_VND_SUN_XML_MATH_ASCII.getStr(),
+
+ MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII.getStr(),
+ MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII.getStr(),
+ MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII.getStr(),
+ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII.getStr(),
+ MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII.getStr(),
+ MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII.getStr(),
+
+ MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII.getStr(),
+ MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII.getStr(),
+ MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII.getStr(),
+ MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII.getStr(),
+ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII.getStr(),
+ MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII.getStr(),
+ MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII.getStr() };
const int nForModes[] = { 16,
1, 2, 4, 4, 8, 16, 32,
@@ -423,7 +423,7 @@ static HRESULT DllRegisterServerNative_Impl( int nMode, bool bForAllUsers, REGSA
{
if (nForModes[ind] & nMode)
{
- wsprintfA(aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMimeType[ind]);
+ wsprintfA(aSubKey, "%sMIME\\DataBase\\Content Type\\%ls", aPrefix, aMimeType[ind]);
HRegKey hkey;
s.upd(RegCreateKeyExA(bForAllUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER,
aSubKey, 0, nullptr, REG_OPTION_NON_VOLATILE, nKeyAccess,
@@ -495,7 +495,7 @@ static HRESULT DllUnregisterServerNative_Impl( int nMode, bool bForAllUsers, REG
if( nForModes[ind] & nMode )
{
DWORD nSubKeys = 0, nValues = 0;
- wsprintfA(aSubKey, "%sMIME\\DataBase\\Content Type\\%s", aPrefix, aMimeType[ind]);
+ wsprintfA(aSubKey, "%sMIME\\DataBase\\Content Type\\%ls", aPrefix, aMimeType[ind]);
Status s1(false); // no throw
{
HRegKey hkey;