From dac086ca0f9615f3960ff7020f4a913dfe8a1cb0 Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@lazarus-ide.org>
Date: Fri, 14 Dec 2012 11:59:46 +0000
Subject: [PATCH] Adds more encoding conversion support, patch from bug #23446

git-svn-id: trunk@39536 -
---
 components/lazutils/lconvencoding.pas | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/components/lazutils/lconvencoding.pas b/components/lazutils/lconvencoding.pas
index 2c9ed5441c..cac3686b6d 100644
--- a/components/lazutils/lconvencoding.pas
+++ b/components/lazutils/lconvencoding.pas
@@ -6527,6 +6527,14 @@ begin
       Result:=KOI8ToUTF8(s);
       Encoded := true;
     end
+    else if AFrom = EncodingUCS2LE then begin
+      Result := UCS2LEToUTF8(s);
+      Encoded := true;
+    end
+    else if AFrom = EncodingUCS2BE then begin
+      Result := UCS2BEToUTF8(s);
+      Encoded := true;
+    end
     else if (AFrom=SysEnc) and Assigned(ConvertAnsiToUTF8) then begin
       Result:=ConvertAnsiToUTF8(s);
       Encoded := true;
@@ -6621,6 +6629,14 @@ begin
         Result:=UTF8ToKOI8(Result);
         Encoded := true;
       end
+      else if ATo = EncodingUCS2LE then begin
+        Result := UTF8ToUCS2LE(Result);
+        Encoded := true;
+      end
+      else if ATo = EncodingUCS2BE then begin
+        Result := UTF8ToUCS2BE(Result);
+        Encoded := true;
+      end
       else if (ATo=SysEnc) and Assigned(ConvertUTF8ToAnsi) then begin
         Result:=ConvertUTF8ToAnsi(Result);
         Encoded := true;