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 /sd/inc | |
| parent | drop unused SvTreeListBoxFlags::IS_EXPANDING (diff) | |
| download | core-c89a4996b82881988eb9cc1eeaf24e0d8f9e6dce.tar.gz core-c89a4996b82881988eb9cc1eeaf24e0d8f9e6dce.zip | |
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 'sd/inc')
| -rw-r--r-- | sd/inc/DocumentRenderer.hrc | 2 | ||||
| -rw-r--r-- | sd/inc/errhdl.hrc | 2 | ||||
| -rw-r--r-- | sd/inc/family.hrc | 2 | ||||
| -rw-r--r-- | sd/inc/strings.hrc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sd/inc/DocumentRenderer.hrc b/sd/inc/DocumentRenderer.hrc index 137f406e35d5..d64235ef3873 100644 --- a/sd/inc/DocumentRenderer.hrc +++ b/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[] = { diff --git a/sd/inc/errhdl.hrc b/sd/inc/errhdl.hrc index f568a0292f62..309dbfc47324 100644 --- a/sd/inc/errhdl.hrc +++ b/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" diff --git a/sd/inc/family.hrc b/sd/inc/family.hrc index 2d10e42b7305..fdf02a73729d 100644 --- a/sd/inc/family.hrc +++ b/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[] = { diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc index 986b318f4628..b211873b8fa2 100644 --- a/sd/inc/strings.hrc +++ b/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") |