[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/source

[Caolán McNamara]

 oox/source/helper/textinputstream.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6ad690ea62829fcbb7d4b270ba02c1aaba02bcde
Author: Julien Nabet <serval2...@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
    (cherry picked from commit d04fb45caa46db829d21a7f9b96878655ce0f479)
    
    Signed-off-by: Caolán McNamara <caol...@redhat.com>

diff --git a/oox/source/helper/textinputstream.cxx 
b/oox/source/helper/textinputstream.cxx
index e98ed86..f64f0e6 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
     {

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits