From 6264205ee7f719f454585ada69be0a320ddc69cb Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@collabora.com>
Date: Fri, 18 Nov 2016 14:51:12 +0100
Subject: tdf#103960: The import of UCS2 data uses a different code path.

The commit b297f7bbfed83f87398231740e910afe6ebfbb97 was too eager from this
point of view, we shouldn't use SetSrcEncoding for UCS2 because in that case
we end up with RTL_TEXTENCODING_DONTKNOW in eSrcEnc.

Change-Id: Id8bcb08aee17c8258c074b481345a2795939edc0
---
 svtools/source/svrtf/svparser.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'svtools')

diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index ae6c1ebcffe0..0540e172be10 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -171,13 +171,13 @@ sal_uInt32 SvParser::GetNextChar()
                 {
                     if( 0xfe == c1 && 0xff == c2 )
                     {
-                        SetSrcEncoding(RTL_TEXTENCODING_UCS2);
+                        eSrcEnc = RTL_TEXTENCODING_UCS2;
                         bUCS2BSrcEnc = true;
                         bSeekBack = false;
                     }
                     else if( 0xff == c1 && 0xfe == c2 )
                     {
-                        SetSrcEncoding(RTL_TEXTENCODING_UCS2);
+                        eSrcEnc = RTL_TEXTENCODING_UCS2;
                         bUCS2BSrcEnc = false;
                         bSeekBack = false;
                     }
-- 
cgit