Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8AC879F86 for ; Mon, 25 Jun 2012 06:24:11 +0000 (UTC) Received: (qmail 36499 invoked by uid 500); 25 Jun 2012 06:24:11 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 36393 invoked by uid 500); 25 Jun 2012 06:24:10 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 36367 invoked by uid 99); 25 Jun 2012 06:24:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jun 2012 06:24:09 +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; Mon, 25 Jun 2012 06:24:08 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DE6EC23889BF; Mon, 25 Jun 2012 06:23:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1353398 - /incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx Date: Mon, 25 Jun 2012 06:23:48 -0000 To: ooo-commits@incubator.apache.org From: wangzcdl@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120625062348.DE6EC23889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: wangzcdl Date: Mon Jun 25 06:23:47 2012 New Revision: 1353398 URL: http://svn.apache.org/viewvc?rev=1353398&view=rev Log: for #119985# Modified: incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx Modified: incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx?rev=1353398&r1=1353397&r2=1353398&view=diff ============================================================================== --- incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx (original) +++ incubator/ooo/trunk/main/filter/source/msfilter/svdfppt.cxx Mon Jun 25 06:23:47 2012 @@ -5023,13 +5023,11 @@ sal_Bool PPTTextSpecInfoAtomInterpreter: } if ( nLang ) { - sal_uInt16 nScriptType = GetI18NScriptTypeOfLanguage( nLang ); - if ( nScriptType & SCRIPTTYPE_LATIN ) - pEntry->nLanguage[ 0 ] = nLang; - if ( nScriptType & SCRIPTTYPE_ASIAN ) - pEntry->nLanguage[ 1 ] = nLang; - if ( nScriptType & SCRIPTTYPE_COMPLEX ) - pEntry->nLanguage[ 2 ] = nLang; +// bug119985 2012.06.14 + if (i == 2) + { + pEntry->nLanguage[ 0 ] = pEntry->nLanguage[ 1 ] = pEntry->nLanguage[ 2 ] = nLang; + } } nFlags &= ~i; }