summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2012-05-01 18:46:14 +0200
committerCaolán McNamara <caolanm@redhat.com>2012-05-02 12:15:42 +0100
commit6ad690ea62829fcbb7d4b270ba02c1aaba02bcde (patch)
treee3505645f286de77cefe4f105f9a1b8ea907a0fe
parent0fcd27f28aea1c850c8d8f11485b6a5d9bb974ea (diff)
Resolves: fdo#49324 (Does not recognize VBA macro in JAPANESE...)
Thank you Caolán for your advice! Change-Id: I72c5ae37d04961e261b275ba4625d3a376629d49 (cherry picked from commit d04fb45caa46db829d21a7f9b96878655ce0f479) Signed-off-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--oox/source/helper/textinputstream.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index e98ed861ed83..f64f0e6cd294 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -199,7 +199,7 @@ OUString TextInputStream::readToChar( sal_Unicode cChar, bool bIncludeChar )
const Reference< XComponentContext >& rxContext, const Reference< XInputStream >& rxInStrm, rtl_TextEncoding eTextEnc )
{
Reference< XTextInputStream > xTextStrm;
- const char* pcCharset = rtl_getMimeCharsetFromTextEncoding( eTextEnc );
+ const char* pcCharset = rtl_getBestMimeCharsetFromTextEncoding( eTextEnc );
OSL_ENSURE( pcCharset, "TextInputStream::createXTextInputStream - unsupported text encoding" );
if( rxContext.is() && rxInStrm.is() && pcCharset ) try
{