Return-Path: X-Original-To: apmail-openoffice-commits-archive@www.apache.org Delivered-To: apmail-openoffice-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 67116105AC for ; Tue, 7 Jan 2014 08:48:37 +0000 (UTC) Received: (qmail 53381 invoked by uid 500); 7 Jan 2014 08:46:50 -0000 Delivered-To: apmail-openoffice-commits-archive@openoffice.apache.org Received: (qmail 53162 invoked by uid 500); 7 Jan 2014 08:46:29 -0000 Mailing-List: contact commits-help@openoffice.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openoffice.apache.org Delivered-To: mailing list commits@openoffice.apache.org Received: (qmail 53074 invoked by uid 99); 7 Jan 2014 08:46:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jan 2014 08:46:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jan 2014 08:46:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 73838238889B; Tue, 7 Jan 2014 08:45:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1556146 - /openoffice/trunk/main/svx/source/accessibility/charmapacc.cxx Date: Tue, 07 Jan 2014 08:45:57 -0000 To: commits@openoffice.apache.org From: hdu@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140107084557.73838238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hdu Date: Tue Jan 7 08:45:56 2014 New Revision: 1556146 URL: http://svn.apache.org/r1556146 Log: #i123986# fix charmap accessibility for code points beyond the unicode baseplane Modified: openoffice/trunk/main/svx/source/accessibility/charmapacc.cxx Modified: openoffice/trunk/main/svx/source/accessibility/charmapacc.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/accessibility/charmapacc.cxx?rev=1556146&r1=1556145&r2=1556146&view=diff ============================================================================== --- openoffice/trunk/main/svx/source/accessibility/charmapacc.cxx (original) +++ openoffice/trunk/main/svx/source/accessibility/charmapacc.cxx Tue Jan 7 08:45:56 2014 @@ -705,11 +705,12 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc ensureAlive(); String sDescription = SVX_RESSTR( RID_SVXSTR_CHARACTER_CODE ); - sal_Unicode c = mpParent->maText.GetChar(0); + const rtl::OUString aCharStr( mpParent->maText); + sal_Int32 nStrIndex = 0; + const sal_UCS4 c = aCharStr.iterateCodePoints( &nStrIndex ); + const int tmp_len = (c < 0x10000) ? 4 : 6; char buf[16] = "0x0000"; - sal_Unicode c_Shifted = c; - int tmp_len = 4; - if(c_Shifted>0xFFFF) tmp_len = 8; + sal_UCS4 c_Shifted = c; for( int i = 0; i < tmp_len; ++i ) { char h = c_Shifted & 0x0F;