diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-06-12 14:19:34 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-06-12 14:20:31 +0200 |
| commit | a6780affaf6a472e995dd3dca1f2bd45f4cc1db8 (patch) | |
| tree | 0e67719c5262a5dbaeb345dfce1222c7187329bd /sw | |
| parent | 2804c1d71fe8134c855d65daf1d7f9b0ea501e4b (diff) | |
error C2361: initialization of 's_fallbacks' is skipped by 'default'
Change-Id: I63f7914b52af51b55a51d39953a1ee58636243a3
(cherry picked from commit f3695bbc17a547b547876dd1175c0b74e5b3e90e)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/writerwordglue.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx index fe9538455ff3..d609345798bd 100644 --- a/sw/source/filter/ww8/writerwordglue.cxx +++ b/sw/source/filter/ww8/writerwordglue.cxx @@ -725,6 +725,13 @@ namespace sw OUString const& rFontName, OUString const& rAltName, 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 = rtl_getBestWindowsCharsetFromTextEncoding(eTextEncoding); switch (eTextEncoding) @@ -734,13 +741,6 @@ namespace sw case RTL_TEXTENCODING_UTF7: case RTL_TEXTENCODING_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) { // fall back to a charset that can at least encode |