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>

9 files changed, 10 insertions, 10 deletions

diff --git a/sw/inc/app.hrc b/sw/inc/app.hrc
index f92bdbfe1688..9b195c02e60d 100644
--- a/sw/inc/app.hrc
+++ b/sw/inc/app.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_APP_HRC
 #define INCLUDED_SW_INC_APP_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #include <svl/style.hxx>
 
diff --git a/sw/inc/cnttab.hrc b/sw/inc/cnttab.hrc
index 70eefcdac564..f0823fd24997 100644
--- a/sw/inc/cnttab.hrc
+++ b/sw/inc/cnttab.hrc
@@ -22,7 +22,7 @@
 
 #include "tox.hxx"
 
-#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*, SwTOOElements> RES_SRCTYPES[] =
 {
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index d602c4f2d548..47c4e0420300 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -22,7 +22,7 @@
 
 #include "rcid.hrc"
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 // Elements -----------------------------------------------------------------
 #define MM_PART_TITLE                   0
diff --git a/sw/inc/error.hrc b/sw/inc/error.hrc
index 1e61b007cf98..e15abf9cacf4 100644
--- a/sw/inc/error.hrc
+++ b/sw/inc/error.hrc
@@ -22,7 +22,7 @@
 
 #include "swerror.h"
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define ERR_CODE( class, err )  ErrCode(ErrCodeArea::Sw, class, err.GetCode())
 #define WARN_CODE( class, err ) ErrCode(ErrCodeArea::Sw, class, err.GetCode())
diff --git a/sw/inc/mmaddressblockpage.hrc b/sw/inc/mmaddressblockpage.hrc
index 3b5126d1d5c2..ba026a890411 100644
--- a/sw/inc/mmaddressblockpage.hrc
+++ b/sw/inc/mmaddressblockpage.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_MMADDRESSBLOCK_HRC
 #define INCLUDED_SW_INC_MMADDRESSBLOCK_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* RA_SALUTATION[] =
 {
diff --git a/sw/inc/optload.hrc b/sw/inc/optload.hrc
index 24463db8929b..9614b48b56fe 100644
--- a/sw/inc/optload.hrc
+++ b/sw/inc/optload.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_OPTLOAD_HRC
 #define INCLUDED_SW_INC_OPTLOAD_HRC
 
-#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> STR_ARR_METRIC[] =
 {
diff --git a/sw/inc/pageformatpanel.hrc b/sw/inc/pageformatpanel.hrc
index e35bd64c4997..ecad14cf51a2 100644
--- a/sw/inc/pageformatpanel.hrc
+++ b/sw/inc/pageformatpanel.hrc
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SW_INC_PAGEFORMATPANEL_HRC
 #define INCLUDED_SW_INC_PAGEFORMATPANEL_HRC
 
-#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 "Margins:", inch units
 const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 5866598a5214..f0a07cd6e1b0 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SW_INC_STRINGS_HRC
 #define INCLUDED_SW_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
-#define NNC_(Context, StringSingular, StringPlural) (Context "\004" u8##StringSingular "\004" u8##StringPlural)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
+#define NNC_(Context, StringSingular, StringPlural) reinterpret_cast<char const *>(Context "\004" u8##StringSingular "\004" u8##StringPlural)
 
 // Format names
 #define STR_POOLCHR_FOOTNOTE                    NC_("STR_POOLCHR_FOOTNOTE", "Footnote Characters")
diff --git a/sw/inc/utlui.hrc b/sw/inc/utlui.hrc
index 8a74ba247068..3d356fc9bc0c 100644
--- a/sw/inc/utlui.hrc
+++ b/sw/inc/utlui.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_INC_UTLUI_HRC
 #define INCLUDED_SW_INC_UTLUI_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* RID_SHELLRES_AUTOFMTSTRS[] =
 {