diff options
| author | Zhe Wang <wangzcdl@apache.org> | 2012-06-25 05:23:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 21:01:19 +0000 |
| commit | 8a5ad76b4e69b4ec742ed27d1825262681fb6f11 (patch) | |
| tree | 8c6041aec874d190bd4a221c110519957d88c4be /filter | |
| parent | 6e38e82b7ce2aeb3d7628ad518437c9af6eec0a8 (diff) | |
Related: #i119985# date/time is displayed as different language
(cherry picked from commit 2a3c87a5ea5e3308a138e461dffae19483c0184c)
Change-Id: I3ef171481b206f7a9d356110d1b4a1559cd5e837
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index fa1d06f49f7d..392e30e3846b 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -4780,13 +4780,16 @@ sal_Bool PPTTextSpecInfoAtomInterpreter::Read( SvStream& rIn, const DffRecordHea } if ( nLang ) { - sal_uInt16 nScriptType = GetI18NScriptTypeOfLanguage( nLang ); - if ( nScriptType & SCRIPTTYPE_LATIN ) - pEntry->nLanguage[ 0 ] = nLang; - if ( nScriptType & SCRIPTTYPE_ASIAN ) - pEntry->nLanguage[ 1 ] = nLang; - if ( nScriptType & SCRIPTTYPE_COMPLEX ) - pEntry->nLanguage[ 2 ] = nLang; + // #i119985#, we could probably handle this better if we have a + // place to over-ride the final language for weak + // characters/fields to fallback to, rather than the current + // application locale. Assuming that we can determine what the + // default fallback language for a given .ppt, etc is during + // load time. + if (i == 2) + { + pEntry->nLanguage[ 0 ] = pEntry->nLanguage[ 1 ] = pEntry->nLanguage[ 2 ] = nLang; + } } nFlags &= ~i; } |