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 /cui/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 'cui/inc')
| -rw-r--r-- | cui/inc/strings.hrc | 2 | ||||
| -rw-r--r-- | cui/inc/treeopt.hrc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc index db0c46269e29..743c974caef4 100644 --- a/cui/inc/strings.hrc +++ b/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") diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc index 9f7b71c6f2ae..824e0fd369e8 100644 --- a/cui/inc/treeopt.hrc +++ b/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[] = { |