[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

[Michael Stahl]

 sw/source/filter/ww8/writerwordglue.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3cacb754dac80c8ac559405367fd64cce7c1c704
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jun 26 17:09:07 2014 +0200

    sw: avoid calling convertToString() with unsupported encodings
    
    Change-Id: If0b589c884cd306ca7c94d3366af66276a120176
    (cherry picked from commit b51d9c633c2b5d03478be7b175fdbea367376c72)
    Reviewed-on: https://gerrit.libreoffice.org/9936
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 56f9284..ddc8313 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -728,7 +728,8 @@ namespace sw
             sal_uInt8 nRet =
                 rtl_getBestWindowsCharsetFromTextEncoding(eTextEncoding);
             rtl_TextEncoding enc2 = rtl_getTextEncodingFromWindowsCharset(nRet);
-            if (!(CanEncode(rFontName, enc2) && CanEncode(rAltName, enc2)))
+            if (!rtl_isOctetTextEncoding(enc2) /* check to avoid asserts */ ||
+                !(CanEncode(rFontName, enc2) && CanEncode(rAltName, enc2)))
             {
                 static struct { rtl_TextEncoding enc; sal_uInt8 charset; }
                 const s_fallbacks [] = {