[PATCH] fix proposed for fdo#49324

[Julien Nabet]

On 01/05/2012 14:28, Caolán McNamara wrote:
> On Tue, 2012-05-01 at 14:20 +0200, Julien Nabet wrote:
>> On 01/05/2012 14:06, Caolán McNamara wrote:
>>> On Tue, 2012-05-01 at 04:25 -0700, julien2412 wrote:
>>>> Hello,
>>>>
>>>> I reproduced the problem of fdo#49324 (Does not recognize VBA macro in
>>>> JAPANESE of LibreOffice 3.5.2) on master with Debian pc x86-64.
>>>> I noticed this line appeared twice in the log of the file which failed (see
>>>> https://bugs.freedesktop.org/show_bug.cgi?id=49324#c3)
>>>> warn:legacy.osl:17148:1:/home/julien/compile-libreoffice/libo/oox/source/helper/textinputstream.cxx:203:
>>>> TextInputStream::createXTextInputStream - unsupported text encoding
>>>> So I tested this patch :
>>>> http://nabble.documentfoundation.org/file/n3952784/patch_49324.txt
>>>> patch_49324.txt  and it worked.
>>> What happens if you replace the use of
>>> rtl_getMimeCharsetFromTextEncoding
>>> with
>>> rtl_getBestWindowsCharsetFromTextEncoding
>>> instead ?
>>>
>>> C.
>> Did you mean with or without the patch I proposed ?
>> I let the patch and just changed the line you quoted, I've got this when
>> I recompile oox :
> ah sorry, wrong one, I mean try
> rtl_getBestMimeCharsetFromTextEncoding instead of
> rtl_getMimeCharsetFromTextEncoding
> (without your patch)
>
> C.
>
I tryed 2 things :
- the patch I proposed + your patch : it worked (no warning message in 
console during file opening + macro visible and editable)
- your patch only : it worked too (same remarks)

I suppose I must take only your patch ? If yes, I can commit and push on 
master.

Julien.