[Libreoffice-commits] core.git: filter/source

[Caolán McNamara]

 filter/source/graphicfilter/idxf/dxfreprd.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit cc04bc76c49dc6881cc7752a8e34fb84bddf7262
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 21 14:46:31 2018 +0000

    ofz#5539 stricter on strings in dxf
    
    Change-Id: I06823d9d767ffe11061531ec905f62ed3a5d302e
    Reviewed-on: https://gerrit.libreoffice.org/48267
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/filter/source/graphicfilter/idxf/dxfreprd.cxx b/filter/source/graphicfilter/idxf/dxfreprd.cxx
index 5920eaddab83..636d9197153c 100644
--- a/filter/source/graphicfilter/idxf/dxfreprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfreprd.cxx
@@ -454,7 +454,10 @@ namespace {
 
 OUString DXFRepresentation::ToOUString(const OString& s) const
 {
-    OUString result = OStringToOUString(s, getTextEncoding());
+    OUString result = OStringToOUString(s, getTextEncoding(),
+                                           RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR
+                                         | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
+                                         | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR);
     result = result.replaceAll("%%o", "")                     // Overscore - simply remove
                    .replaceAll("%%u", "")                     // Underscore - simply remove
                    .replaceAll("%%d", OUStringLiteral1(0x00B0)) // Degrees symbol (°)