[Libreoffice-commits] .: oox/source
Julien Nabet
serval2412 at kemper.freedesktop.org
Tue May 1 09:49:18 PDT 2012
oox/source/helper/textinputstream.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d04fb45caa46db829d21a7f9b96878655ce0f479
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Tue May 1 18:46:14 2012 +0200
Resolves: fdo#49324 (Does not recognize VBA macro in JAPANESE...)
Thank you Caolán for your advice!
Change-Id: I72c5ae37d04961e261b275ba4625d3a376629d49
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index f374cc9..5ecd738 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -199,7 +199,8 @@ 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 );
+ // TODO JUL 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
{
More information about the Libreoffice-commits
mailing list