Adapt to C++2a char_t

u8 literals incompatibly change their type (as implemented by recent Clang
trunk)

Change-Id: Ia4f7b91f5d86656a056303d2754981ab2093a739
Reviewed-on: https://gerrit.libreoffice.org/63494
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

10 files changed, 10 insertions, 10 deletions

diff --git a/svx/inc/fieldunit.hrc b/svx/inc/fieldunit.hrc
index b4c4a97e4c31..f16238550efe 100644
--- a/svx/inc/fieldunit.hrc
+++ b/svx/inc/fieldunit.hrc
@@ -23,7 +23,7 @@
 #include <tools/fldunit.hxx>
 #include <utility>
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const std::pair<const char*, FieldUnit> RID_SVXSTR_FIELDUNIT_TABLE[] =
 {
diff --git a/svx/inc/fmstring.hrc b/svx/inc/fmstring.hrc
index 3b4c9b07fe4a..7a78d0ae2623 100644
--- a/svx/inc/fmstring.hrc
+++ b/svx/inc/fmstring.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_INC_FMSTRING_HRC
 #define INCLUDED_SVX_INC_FMSTRING_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* RID_RSC_SQL_INTERNATIONAL[] =
 {
diff --git a/svx/inc/frmsel.hrc b/svx/inc/frmsel.hrc
index 8b3e0fb25e4d..da3c258b293c 100644
--- a/svx/inc/frmsel.hrc
+++ b/svx/inc/frmsel.hrc
@@ -22,7 +22,7 @@
 
 #include <utility>
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 std::pair<const char*, sal_uInt16> RID_SVXSTR_FRMSEL_TEXTS[] =
 {
diff --git a/svx/inc/numberingtype.hrc b/svx/inc/numberingtype.hrc
index 3dcf0d89655b..989f0be0aec4 100644
--- a/svx/inc/numberingtype.hrc
+++ b/svx/inc/numberingtype.hrc
@@ -22,7 +22,7 @@
 
 #include <utility>
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const std::pair<const char*, int> RID_SVXSTRARY_NUMBERINGTYPE[] =
 {
diff --git a/svx/inc/samecontent.hrc b/svx/inc/samecontent.hrc
index 7c7ffe5445f1..b4a6bc8d667d 100644
--- a/svx/inc/samecontent.hrc
+++ b/svx/inc/samecontent.hrc
@@ -11,7 +11,7 @@
 
 #include <utility>
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const std::pair<const char*, int> RID_SVXSTRARY_SAMECONTENT[] =
 {
diff --git a/svx/inc/spacing.hrc b/svx/inc/spacing.hrc
index 2f2b219f5242..3d4e93dc02b3 100644
--- a/svx/inc/spacing.hrc
+++ b/svx/inc/spacing.hrc
@@ -11,7 +11,7 @@
 
 #include <utility>
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 // To translators: this is a listbox labelled by "Spacing:", inch units
 const std::pair<const char*, int> RID_SVXSTRARY_SPACING_INCH[] =
diff --git a/svx/inc/svxerr.hrc b/svx/inc/svxerr.hrc
index 8a02afa34acc..79409d118b41 100644
--- a/svx/inc/svxerr.hrc
+++ b/svx/inc/svxerr.hrc
@@ -22,7 +22,7 @@
 
 #include <utility>
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #include <svx/svxerr.hxx>
 #include <editeng/editerr.hxx>
diff --git a/svx/inc/swframeposstrings.hrc b/svx/inc/swframeposstrings.hrc
index f45b06531478..df4d92a976fb 100644
--- a/svx/inc/swframeposstrings.hrc
+++ b/svx/inc/swframeposstrings.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_INC_SWFRAMEPOSSTRINGS_HRC
 #define INCLUDED_SVX_INC_SWFRAMEPOSSTRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 //the following string have to match the (enum values) positions in svx/swframeposstrings.hxx!
 const char* RID_SVXSW_FRAMEPOSITIONS[] =
diff --git a/svx/inc/tabwin.hrc b/svx/inc/tabwin.hrc
index ac0a1221efda..8ab1888038da 100644
--- a/svx/inc/tabwin.hrc
+++ b/svx/inc/tabwin.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_INC_TABWIN_HRC
 #define INCLUDED_SVX_INC_TABWIN_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* RID_RSC_TABWIN_PREFIX[] =
 {
diff --git a/svx/inc/txenctab.hrc b/svx/inc/txenctab.hrc
index 6481cb722804..e7171fbd1097 100644
--- a/svx/inc/txenctab.hrc
+++ b/svx/inc/txenctab.hrc
@@ -23,7 +23,7 @@
 #include <rtl/textenc.h>
 #include <utility>
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 // Encodings for which no conversion exist yet are commented out.