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>

accessibility/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
 #define ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define RID_STR_ACC_NAME_BROWSEBUTTON           NC_("RID_STR_ACC_NAME_BROWSEBUTTON", "Browse")
 #define STR_SVT_ACC_ACTION_EXPAND               NC_("STR_SVT_ACC_ACTION_EXPAND", "Expand" )

avmedia/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_AVMEDIA_INC_STRINGS_HRC
 #define INCLUDED_AVMEDIA_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define AVMEDIA_STR_OPEN            NC_("AVMEDIA_STR_OPEN", "Open")
 #define AVMEDIA_STR_INSERT          NC_("AVMEDIA_STR_INSERT", "Apply")

basctl/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef BASCTL_INC_BASIDESH_HRC
 #define BASCTL_INC_BASIDESH_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define RID_STR_FILTER_ALLFILES             NC_("RID_STR_FILTER_ALLFILES", "<All>")
 #define RID_STR_NOMODULE                    NC_("RID_STR_NOMODULE", "< No Module >")

basic/inc/basic.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_BASIC_INC_STRINGS_HRC
 #define INCLUDED_BASIC_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 std::pair<const char*, ErrCode> const RID_BASIC_START[] =
 {

basic/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_BASIC_INC_STRINGS_HRC
 #define INCLUDED_BASIC_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_BASICKEY_FORMAT_ON          NC_("STR_BASICKEY_FORMAT_ON", "On")
 #define STR_BASICKEY_FORMAT_OFF         NC_("STR_BASICKEY_FORMAT_OFF", "Off")

chart2/inc/strings.hrc

@@ -19,7 +19,7 @@
 #ifndef CHART_STRINGS_HRC
 #define CHART_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_DLG_CHART_WIZARD                        NC_("STR_DLG_CHART_WIZARD", "Chart Wizard")
 #define STR_DLG_SMOOTH_LINE_PROPERTIES              NC_("STR_DLG_SMOOTH_LINE_PROPERTIES", "Smooth Lines")

compilerplugins/clang/test/stringconstant.cxx

@@ -67,7 +67,9 @@ int main() {
 
     (void) OUString("xxx", 2, RTL_TEXTENCODING_ASCII_US); // expected-error {{suspicious 'rtl::OUString' constructor with literal of length 3 and non-matching length argument 2 [loplugin:stringconstant]}}
 
+#if !defined __cpp_char8_t
     (void) OUString(u8"xxx", 3, RTL_TEXTENCODING_ASCII_US); // expected-error {{simplify construction of 'OUString' with string constant argument [loplugin:stringconstant]}}
+#endif
 
     (void) OUString("\x80", 1, RTL_TEXTENCODING_UTF8); // expected-error {{suspicious 'rtl::OUString' constructor with text encoding 'RTL_TEXTENCODING_UTF8' but non-UTF-8 content [loplugin:stringconstant]}}
 

connectivity/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef CONNECTIVITY_STRINGS_HRC
 #define CONNECTIVITY_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 // = the mozab driver's resource strings
 #define STR_ERR_EXECUTING_QUERY                 NC_("STR_ERR_EXECUTING_QUERY", "An error occurred while executing the query.")

cui/inc/strings.hrc

@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CUI_INC_STRINGS_HRC
 #define INCLUDED_CUI_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define RID_SVXSTR_KEY_CONFIG_DIR                   NC_("RID_SVXSTR_KEY_CONFIG_DIR", "Configuration")
 #define RID_SVXSTR_KEY_WORK_PATH                    NC_("RID_SVXSTR_KEY_WORK_PATH", "My Documents")

cui/inc/treeopt.hrc

@@ -23,7 +23,7 @@
 #include <sal/types.h>
 #include <sfx2/pageids.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*, sal_uInt16> SID_GENERAL_OPTIONS_RES[] =
 {

dbaccess/inc/query.hrc

@@ -19,7 +19,7 @@
 #ifndef INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
 #define INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* RSC_QUERY_OBJECT_TYPE[] =
 {

dbaccess/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC
 #define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define RID_STR_CONNECTION_INVALID                  NC_("RID_STR_CONNECTION_INVALID", "No connection could be established.")
 #define RID_STR_TABLE_IS_FILTERED                   NC_("RID_STR_TABLE_IS_FILTERED", "The table $name$ already exists. It is not visible because it has been filtered out.")

desktop/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_STRINGS_HRC
 #define INCLUDED_VCL_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define RID_STR_COPYING_PACKAGE                             NC_("RID_STR_COPYING_PACKAGE", "Copying: ")
 #define RID_STR_ERROR_WHILE_ADDING                          NC_("RID_STR_ERROR_WHILE_ADDING", "Error while adding: ")

extensions/inc/command.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_EXTENSIONS_INC_COMMAND_HRC
 #define INCLUDED_EXTENSIONS_INC_COMMAND_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 namespace {
 

extensions/inc/showhide.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC
 #define INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 namespace {
 

extensions/inc/stringarrays.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_EXTENSIONS_INC_STRINGARRAYS_HRC
 #define INCLUDED_EXTENSIONS_INC_STRINGARRAYS_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_ENUM_VERTICAL_ALIGN[] =
 {

extensions/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_EXTENSIONS_INC_STRINGS_HRC
 #define INCLUDED_EXTENSIONS_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define RID_STR_EDITMASK                        NC_("RID_STR_EDITMASK", "Edit mask")
 #define RID_STR_LITERALMASK                     NC_("RID_STR_LITERALMASK", "Literal mask")

extensions/inc/yesno.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_EXTENSIONS_INC_YESNO_HRC
 #define INCLUDED_EXTENSIONS_INC_YESNO_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 namespace {
 

external/icu/UnpackedTarball_icu.mk

@@ -37,6 +37,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
 	external/icu/icu4c-khmerbreakengine.patch.1 \
 	external/icu/icu4c-61-werror-shadow.patch.1 \
 	external/icu/gcc9.patch \
+	external/icu/char8_t.patch \
 ))
 
 $(eval $(call gb_UnpackedTarball_add_file,icu,source/data/brkitr/khmerdict.dict,external/icu/khmerdict.dict))

external/icu/char8_t.patch

+--- source/common/ucasemap.cpp
++++ source/common/ucasemap.cpp
+@@ -687,13 +687,13 @@
+             if (change) {
+                 ByteSinkUtil::appendTwoBytes(upper, sink);
+                 if ((data & HAS_EITHER_DIALYTIKA) != 0) {
+-                    sink.Append(u8"\u0308", 2);  // restore or add a dialytika
++                    sink.Append(reinterpret_cast<char const *>(u8"\u0308"), 2);  // restore or add a dialytika
+                 }
+                 if (addTonos) {
+-                    sink.Append(u8"\u0301", 2);
++                    sink.Append(reinterpret_cast<char const *>(u8"\u0301"), 2);
+                 }
+                 while (numYpogegrammeni > 0) {
+-                    sink.Append(u8"\u0399", 2);
++                    sink.Append(reinterpret_cast<char const *>(u8"\u0399"), 2);
+                     --numYpogegrammeni;
+                 }
+             }

filter/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FILTER_INC_STRINGS_HRC
 #define INCLUDED_FILTER_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_COLUMN_HEADER_NAME                  NC_("STR_COLUMN_HEADER_NAME", "Name")
 #define STR_COLUMN_HEADER_TYPE                  NC_("STR_COLUMN_HEADER_TYPE", "Type")

forms/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_STRINGS_HRC
 #define INCLUDED_VCL_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define RID_BASELISTBOX_ERROR_FILLLIST              NC_("RID_BASELISTBOX_ERROR_FILLLIST", "The contents of a combo box or list field could not be determined.")
 #define RID_STR_IMPORT_GRAPHIC                      NC_("RID_STR_IMPORT_GRAPHIC", "Insert Image" )

formula/inc/core_resource.hrc

@@ -23,7 +23,7 @@
 #include <formula/compiler.hxx>
 #include <utility>
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 /** These English names are used to store/load ODFF as of ODF v1.2. */
 // NAMES CAN ONLY BE CHANGED WHEN PROVIDING BACKWARD AND FORWARD COMPATIBILITY

formula/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_STRINGS_HRC
 #define INCLUDED_VCL_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_OPTIONAL        NC_("STR_OPTIONAL", "(optional)")
 #define STR_REQUIRED        NC_("STR_REQUIRED", "(required)")

fpicker/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_STRINGS_HRC
 #define INCLUDED_VCL_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_EXPLORERFILE_OPEN                       NC_("STR_EXPLORERFILE_OPEN", "Open")
 #define STR_EXPLORERFILE_SAVE                       NC_("STR_EXPLORERFILE_SAVE", "Save as")

framework/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_STRINGS_HRC
 #define INCLUDED_FRAMEWORK_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_MENU_HEADFOOTALL                        NC_("STR_MENU_HEADFOOTALL", "All" )
 #define STR_UPDATEDOC                               NC_("STR_UPDATEDOC", "~Update" )

include/editeng/editrids.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_INCLUDE_EDITENG_EDITRIDS_HRC
 #define INCLUDED_INCLUDE_EDITENG_EDITRIDS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 // enum SvxBreak ------------------------------------------------------------
 #define RID_SVXITEMS_BREAK_NONE                 NC_("RID_SVXITEMS_BREAK_NONE", "No break")

include/fpicker/strings.hrc

@@ -9,7 +9,7 @@
 #ifndef INCLUDED_FPICKER_FPICKER_HRC
 #define INCLUDED_FPICKER_FPICKER_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_SVT_FILEPICKER_AUTO_EXTENSION           NC_("STR_SVT_FILEPICKER_AUTO_EXTENSION", "~Automatic file name extension")
 #define STR_SVT_FILEPICKER_PASSWORD                 NC_("STR_SVT_FILEPICKER_PASSWORD", "Save with pass~word")

include/rtl/string.hxx

@@ -1804,6 +1804,10 @@ struct SAL_WARN_UNUSED OStringLiteral
 {
     template< int N >
     explicit OStringLiteral( const char (&str)[ N ] ) : size( N - 1 ), data( str ) { assert( strlen( str ) == N - 1 ); }
+#if defined __cpp_char8_t
+    template< int N >
+    explicit OStringLiteral( const char8_t (&str)[ N ] ) : size( N - 1 ), data( reinterpret_cast<char const *>(str) ) { assert( strlen( data ) == N - 1 ); }
+#endif
     int size;
     const char* data;
 };

include/rtl/stringutils.hxx

@@ -207,6 +207,28 @@ struct ConstCharArrayDetector< const char[ 1 ], T >
 };
 #endif
 
+#if defined LIBO_INTERNAL_ONLY && defined __cpp_char8_t
+template<std::size_t N, typename T>
+struct ConstCharArrayDetector<char8_t const [N], T> {
+    using Type = T;
+    static constexpr bool const ok = true;
+    static constexpr std::size_t const length = N - 1;
+#if HAVE_CXX14_CONSTEXPR
+    constexpr
+#endif
+    static bool isValid(char8_t const (& literal)[N]) {
+        for (std::size_t i = 0; i != N - 1; ++i) {
+            if (literal[i] == u8'\0') {
+                return false;
+            }
+        }
+        return literal[N - 1] == u8'\0';
+    }
+    static constexpr char const * toPointer(char8_t const (& literal)[N])
+    { return reinterpret_cast<char const *>(literal); }
+};
+#endif
+
 #if defined LIBO_INTERNAL_ONLY
 template<std::size_t N, typename T>
 struct ConstCharArrayDetector<sal_Unicode const [N], T> {

include/sfx2/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SFX2_INC_STRINGS_HRC
 #define INCLUDED_SFX2_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_TEMPLATE_FILTER                     NC_("STR_TEMPLATE_FILTER", "Templates")
 #define STR_SAVEDOC                             NC_("STR_SAVEDOC", "~Save")

include/svl/svl.hrc

@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SVL_SVL_HRC
 #define INCLUDED_SVL_SVL_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 //  Internet Media Type Presentations
 

include/svtools/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVTOOLS_INC_STRINGS_HRC
 #define INCLUDED_SVTOOLS_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_UNDO                                NC_("STR_UNDO", "Undo: ")
 #define STR_REDO                                NC_("STR_REDO", "Re~do: ")

include/svx/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_INC_STRINGS_HRC
 #define INCLUDED_SVX_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_ObjNameSingulNONE                               NC_("STR_ObjNameSingulNONE", "Drawing object")
 #define STR_ObjNamePluralNONE                               NC_("STR_ObjNamePluralNONE", "Drawing objects")

include/svx/svxitems.hrc

@@ -26,7 +26,7 @@
 #include <editeng/editids.hrc>
 #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*, sal_uInt16> RID_ATTR_NAMES[] =
 {

reportdesign/inc/stringarray.hrc

@@ -10,7 +10,7 @@
 #ifndef INCLUDED_REPORTDESIGN_INC_FNP_HRC
 #define INCLUDED_REPORTDESIGN_INC_FNP_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* RID_STR_FORCENEWPAGE_CONST[] =
 {

reportdesign/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_REPORTDESIGN_INC_STRINGS_HRC
 #define INCLUDED_REPORTDESIGN_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define RID_STR_PROPPAGE_DEFAULT                NC_("RID_STR_PROPPAGE_DEFAULT", "General")
 #define RID_STR_PROPPAGE_DATA                   NC_("RID_STR_PROPPAGE_DATA", "Data")

sal/qa/rtl/textenc/rtl_textcvt.cxx

@@ -2918,11 +2918,12 @@ void Test::testInvalidUtf8() {
         auto const converter = rtl_createTextToUnicodeConverter(
             RTL_TEXTENCODING_JAVA_UTF8);
         CPPUNIT_ASSERT(converter != nullptr);
+        OStringLiteral const input(u8"\U00010000");
         sal_Unicode buf[TEST_STRING_SIZE];
         sal_uInt32 info;
         sal_Size converted;
         auto const size = rtl_convertTextToUnicode(
-            converter, nullptr, RTL_CONSTASCII_STRINGPARAM(u8"\U00010000"), buf,
+            converter, nullptr, input.data, input.size, buf,
             TEST_STRING_SIZE,
             (RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR
              | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR

sc/inc/compiler.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_INC_COMPILER_HRC
 #define INCLUDED_SC_INC_COMPILER_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* RID_FUNCTION_CATEGORIES[] =
 {

sc/inc/globstr.hrc

@@ -20,8 +20,8 @@
 #ifndef SC_GLOBSTR_HRC
 #define SC_GLOBSTR_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)
 
 /*
  * This file is reserved for string IDs of permanently loaded resident string

sc/inc/pvfundlg.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_INC_PVFUNDLG_HRC
 #define INCLUDED_SC_INC_PVFUNDLG_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* SCSTR_DPFUNCLISTBOX[] =
 {

sc/inc/scerrors.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_INC_SCERRORS_HRC
 #define INCLUDED_SC_INC_SCERRORS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #include "scerrors.hxx"
 

sc/inc/scfuncs.hrc

@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SC_INC_SCFUNCS_HRC
 #define INCLUDED_SC_INC_SCFUNCS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 /* Resource file for the function wizard / autopilot.
  *

sc/inc/scstyles.hrc

@@ -22,7 +22,7 @@
 
 #include <svl/style.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*, SfxStyleSearchBits> RID_CELLSTYLEFAMILY[] =
 {

sc/inc/strings.hrc

@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SC_INC_STRINGS_HRC
 #define INCLUDED_SC_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)
 
 // Strings for interface names -------------------------------------------
 

sc/inc/units.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SC_INC_UNITS_HRC
 #define INCLUDED_SC_INC_UNITS_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> SCSTR_UNIT[] =
 {

scaddins/inc/analysis.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SCADDINS_INC_ANALYSIS_HRC
 #define INCLUDED_SCADDINS_INC_ANALYSIS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* ANALYSIS_Workday[] =
 {

scaddins/inc/datefunc.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SCADDINS_INC_PRICING_HRC
 #define INCLUDED_SCADDINS_INC_PRICING_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* DATE_FUNCDESC_DiffWeeks[] =
 {

scaddins/inc/pricing.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SCADDINS_INC_PRICING_HRC
 #define INCLUDED_SCADDINS_INC_PRICING_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 // function and parameter description
 const char* PRICING_FUNCDESC_OptBarrier[] =

scaddins/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SCADDINS_INC_STRINGS_HRC
 #define INCLUDED_SCADDINS_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 // function names as accessible from cells
 #define PRICING_FUNCNAME_OptBarrier                     NC_("PRICING_FUNCNAME_OptBarrier", "OPT_BARRIER")

sccomp/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SCCOMP_INC_STRINGS_HRC
 #define INCLUDED_SCCOMP_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define RID_SOLVER_COMPONENT        NC_("RID_SOLVER_COMPONENT", "%PRODUCTNAME Linear Solver")
 #define RID_COINMP_SOLVER_COMPONENT NC_("RID_COINMP_SOLVER_COMPONENT", "%PRODUCTNAME CoinMP Linear Solver")

sd/inc/DocumentRenderer.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SD_INC_DOCUMENTRENDERER_HRC
 #define INCLUDED_SD_INC_DOCUMENTRENDERER_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* STR_IMPRESS_PRINT_UI_CONTENT_CHOICES[] =
 {

sd/inc/errhdl.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SD_INC_ERRHDL_HRC
 #define INCLUDED_SD_INC_ERRHDL_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #include "sderror.hxx"
 

sd/inc/family.hrc

@@ -22,7 +22,7 @@
 
 #include <svl/style.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*, SfxStyleSearchBits> RID_GRAPHICSTYLEFAMILY[] =
 {

sd/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SD_INC_STRINGS_HRC
 #define INCLUDED_SD_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_NULL                                        NC_("STR_NULL", "None")
 #define STR_INSERTPAGE                                  NC_("STR_INSERTPAGE", "Insert Slide")

sfx2/inc/dinfdlg.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SFX2_INC_DINFDLG_HRC
 #define INCLUDED_SFX2_INC_DINFDLG_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* SFX_CB_PROPERTY_STRINGARRAY[] =
 {

sfx2/inc/doctempl.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SFX2_INC_DOCTEMPL_HRC
 #define INCLUDED_SFX2_INC_DOCTEMPL_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* TEMPLATE_LONG_NAMES_ARY[] =
 {

starmath/inc/smmod.hrc

@@ -9,7 +9,7 @@
 #ifndef INCLUDED_VCL_INC_STRINGS_HRC
 #define INCLUDED_VCL_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* RID_UI_SYMBOLSET_NAMES[] =
 {

starmath/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SM_INC_STRINGS_HRC
 #define INCLUDED_SM_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define RID_PLUSX_HELP                      NC_("RID_PLUSX_HELP", "+ Sign" )
 #define RID_MINUSX_HELP                     NC_("RID_MINUSX_HELP", "- Sign" )

svtools/inc/borderline.hrc

@@ -11,7 +11,7 @@
 
 #include <editeng/borderline.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*, SvxBorderLineStyle> RID_SVXSTR_BORDERLINE[] =
 {

svtools/inc/errtxt.hrc

@@ -23,7 +23,7 @@
 #include <svtools/sfxecode.hxx>
 #include <svtools/soerr.hxx>
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const ErrMsgCode RID_ERRCTX[] =
 {

svtools/inc/langtab.hrc

@@ -22,7 +22,7 @@
 
 #include <i18nlangtag/lang.h>
 
-#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*, LanguageType> STR_ARR_SVT_LANGUAGE_TABLE[] =
 {

svtools/inc/templwin.hrc

@@ -22,7 +22,7 @@
 
 #include <svtools/controldims.hxx>
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define DI_TITLE                1
 #define DI_FROM                 2

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[] =
 {

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[] =
 {

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[] =
 {

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[] =
 {

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[] =
 {

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[] =

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>

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[] =

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[] =
 {

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.
 

svx/source/dialog/page.hrc

@@ -23,7 +23,7 @@
 #include <i18nutil/paper.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*, int> RID_SVXSTRARY_PAPERSIZE_STD[] =
 {

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>
 

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[] =
 {

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

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())

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[] =
 {

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[] =
 {

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[] =

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")

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[] =
 {

uui/inc/ids.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UUI_INC_IDS_HRC
 #define INCLUDED_UUI_INC_IDS_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*, ErrCode> RID_UUI_ERRHDL[] =
 {

uui/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UUI_INC_STRINGS_HRC
 #define INCLUDED_UUI_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_ENTER_PASSWORD_TO_OPEN              NC_("STR_ENTER_PASSWORD_TO_OPEN", "Enter password to open file: \n")
 #define STR_ENTER_PASSWORD_TO_MODIFY            NC_("STR_ENTER_PASSWORD_TO_MODIFY", "Enter password to modify file: \n")

vcl/inc/font/OpenTypeFeatureStrings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_FONT_OPENTYPEFEATRESTRINGS_HRC
 #define INCLUDED_VCL_INC_FONT_OPENTYPEFEATRESTRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_FONT_FEATURE_ID_AALT          NC_("STR_FONT_FEATURE_ID_AALT", "Access All Alternates")
 #define STR_FONT_FEATURE_ID_AFRC          NC_("STR_FONT_FEATURE_ID_AFRC", "Alternative (Vertical) Fractions")

vcl/inc/print.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_PRINT_HRC
 #define INCLUDED_VCL_INC_PRINT_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* RID_STR_PAPERNAMES[] =
 {

vcl/inc/printaccessoryview.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
 #define INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 const char* SV_PRINT_NATIVE_STRINGS[] =
 {

vcl/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_STRINGS_HRC
 #define INCLUDED_VCL_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define SV_RESID_STRING_NOSELECTIONPOSSIBLE          NC_("SV_RESID_STRING_NOSELECTIONPOSSIBLE", "<No selection possible>")
 

vcl/inc/units.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_INC_UNITS_HRC
 #define INCLUDED_VCL_INC_UNITS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 std::pair<const char*, FieldUnit> SV_FUNIT_STRINGS[] =
 {

writerperfect/inc/strings.hrc

@@ -10,7 +10,7 @@
 #ifndef INCLUDED_WRITERPERFECT_INC_STRINGS_HRC
 #define INCLUDED_WRITERPERFECT_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_ENCODING_DIALOG_TITLE               NC_("STR_ENCODING_DIALOG_TITLE", "Import file")
 #define STR_ENCODING_DIALOG_TITLE_MSMULTIPLAN   NC_("STR_ENCODING_DIALOG_TITLE_MSMULTIPLAN", "Import MS Multiplan for DOS file")

xmlsecurity/inc/strings.hrc

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_XMLSECURITY_INC_STRINGS_HRC
 #define INCLUDED_XMLSECURITY_INC_STRINGS_HRC
 
-#define NC_(Context, String) (Context "\004" u8##String)
+#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
 #define STR_CERTIFICATE_NOT_VALIDATED               NC_("STR_CERTIFICATE_NOT_VALIDATED", "The certificate could not be validated.")
 #define STR_HEADERBAR                               NC_("STR_HEADERBAR", "Field\tValue")