From 2518b37e322ba93879703d9f8aaa6b2fe960211a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Amor=20Garc=C3=ADa?= <jamor@zentyal.com>
Date: Thu, 12 Nov 2015 16:17:31 +0100
Subject: [PATCH] Fixed RTF support for unicode characters greater than 32767

---
 OpenChange/RTFHandler.m | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/OpenChange/RTFHandler.m b/OpenChange/RTFHandler.m
index 1add58bcc..7cd7ab404 100644
--- a/OpenChange/RTFHandler.m
+++ b/OpenChange/RTFHandler.m
@@ -1180,13 +1180,19 @@ const unsigned short ansicpg874[256] = {
               [_html appendBytes: "</strike>"  length: 9];
               formattingOptions->strikethrough = NO;
             }
-          else if ([s hasPrefix: @"u"] && [s length] > 1 && isdigit([s characterAtIndex: 1]))
+          else if ([s hasPrefix: @"u"] && [s length] > 1 && 
+                   (isdigit([s characterAtIndex: 1]) || '-' == [s characterAtIndex: 1]))
             {
-              // XXX TPFOX u argumrnt can be negative
               NSData *d;
               unichar ch;
+              int arg;
+              
+              arg = [[s substringFromIndex: 1] intValue];
+              if (arg < 0) 
+                // a negative value means a value greater than 32767
+                arg = 32767 - arg;
 
-              ch = (unichar)[[s substringFromIndex: 1] intValue];
+              ch = (unichar) arg;
               s = [NSString stringWithCharacters: &ch length: 1];
               d = [s dataUsingEncoding: NSUTF8StringEncoding];
               [_html appendData: d];