diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-17 15:46:38 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-11-17 17:17:26 +0100 |
| commit | c89a4996b82881988eb9cc1eeaf24e0d8f9e6dce (patch) | |
| tree | 4583d522e843ee4e52e107cbaeace2aed09019b3 /sc | |
| parent | 1ee42f427fc80a4f3a63ee9fffbf9d187f1253ba (diff) | |
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>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/compiler.hrc | 2 | ||||
| -rw-r--r-- | sc/inc/globstr.hrc | 4 | ||||
| -rw-r--r-- | sc/inc/pvfundlg.hrc | 2 | ||||
| -rw-r--r-- | sc/inc/scerrors.hrc | 2 | ||||
| -rw-r--r-- | sc/inc/scfuncs.hrc | 2 | ||||
| -rw-r--r-- | sc/inc/scstyles.hrc | 2 | ||||
| -rw-r--r-- | sc/inc/strings.hrc | 4 | ||||
| -rw-r--r-- | sc/inc/units.hrc | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/sc/inc/compiler.hrc b/sc/inc/compiler.hrc index 1df61083bbf9..a97948f55b59 100644 --- a/sc/inc/compiler.hrc +++ b/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[] = { diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 849db2c574d0..aba2cceea750 100644 --- a/sc/inc/globstr.hrc +++ b/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 diff --git a/sc/inc/pvfundlg.hrc b/sc/inc/pvfundlg.hrc index 5759cb3656fb..e4aa89264892 100644 --- a/sc/inc/pvfundlg.hrc +++ b/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[] = { diff --git a/sc/inc/scerrors.hrc b/sc/inc/scerrors.hrc index 3672a27b1a70..d7095c3be6a2 100644 --- a/sc/inc/scerrors.hrc +++ b/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" diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc index 90a07857b33b..e09a12f4e4c7 100644 --- a/sc/inc/scfuncs.hrc +++ b/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. * diff --git a/sc/inc/scstyles.hrc b/sc/inc/scstyles.hrc index fcc78b9258de..ab47ff33ed9a 100644 --- a/sc/inc/scstyles.hrc +++ b/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[] = { diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc index faaf973452a3..eac103571466 100644 --- a/sc/inc/strings.hrc +++ b/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 ------------------------------------------- diff --git a/sc/inc/units.hrc b/sc/inc/units.hrc index db6417ac7f40..1ce44ba00197 100644 --- a/sc/inc/units.hrc +++ b/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[] = { |