mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

error C2361: initialization of 's_fallbacks' is skipped by 'default'

Browse Source 
Change-Id: I63f7914b52af51b55a51d39953a1ee58636243a3
This commit is contained in:
Michael Stahl
2014-06-12 14:19:34 +02:00
parent 82dead2103
commit f3695bbc17
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sw/source/filter/ww8/writerwordglue.cxx
View File

@@ -725,6 +725,13 @@ namespace sw
OUString const& rFontName, OUString const& rAltName, OUString const& rFontName, OUString const& rAltName,
rtl_TextEncoding eTextEncoding) rtl_TextEncoding eTextEncoding)
{ {
static struct { rtl_TextEncoding enc; sal_uInt8 charset; }
const s_fallbacks [] = {
{ RTL_TEXTENCODING_MS_932, 0x80 }, // Shift-JIS
{ RTL_TEXTENCODING_MS_936, 0x86 }, // GB-2312
{ RTL_TEXTENCODING_MS_950, 0x88 }, // Big5
{ RTL_TEXTENCODING_MS_949, 0x81 }, // EUC-KR
};
sal_uInt8 nRet = sal_uInt8 nRet =
rtl_getBestWindowsCharsetFromTextEncoding(eTextEncoding); rtl_getBestWindowsCharsetFromTextEncoding(eTextEncoding);
switch (eTextEncoding) switch (eTextEncoding)
@@ -734,13 +741,6 @@ namespace sw
case RTL_TEXTENCODING_UTF7: case RTL_TEXTENCODING_UTF7:
case RTL_TEXTENCODING_UTF8: case RTL_TEXTENCODING_UTF8:
case RTL_TEXTENCODING_JAVA_UTF8: case RTL_TEXTENCODING_JAVA_UTF8:
static struct { rtl_TextEncoding enc; sal_uInt8 charset; }
const s_fallbacks [] = {
{ RTL_TEXTENCODING_MS_932, 0x80 }, // Shift-JIS
{ RTL_TEXTENCODING_MS_936, 0x86 }, // GB-2312
{ RTL_TEXTENCODING_MS_950, 0x88 }, // Big5
{ RTL_TEXTENCODING_MS_949, 0x81 }, // EUC-KR
};
for (size_t i = 0; i < SAL_N_ELEMENTS(s_fallbacks); ++i) for (size_t i = 0; i < SAL_N_ELEMENTS(s_fallbacks); ++i)
{ {
// fall back to a charset that can at least encode // fall back to a charset that can at least encode