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 /svtools/inc | |
| 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 'svtools/inc')
| -rw-r--r-- | svtools/inc/borderline.hrc | 2 | ||||
| -rw-r--r-- | svtools/inc/errtxt.hrc | 2 | ||||
| -rw-r--r-- | svtools/inc/langtab.hrc | 2 | ||||
| -rw-r--r-- | svtools/inc/templwin.hrc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/svtools/inc/borderline.hrc b/svtools/inc/borderline.hrc index 07e4f1cf79c1..1b6ddcf4337a 100644 --- a/svtools/inc/borderline.hrc +++ b/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[] = { diff --git a/svtools/inc/errtxt.hrc b/svtools/inc/errtxt.hrc index d341a91ee503..e5694df18ffd 100644 --- a/svtools/inc/errtxt.hrc +++ b/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[] = { diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc index 0ff23912f9a1..9de0eb1dfb66 100644 --- a/svtools/inc/langtab.hrc +++ b/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[] = { diff --git a/svtools/inc/templwin.hrc b/svtools/inc/templwin.hrc index 5eef305ef0e0..c90fdcc1031f 100644 --- a/svtools/inc/templwin.hrc +++ b/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 |