From ooo-commits-return-11910-apmail-incubator-ooo-commits-archive=incubator.apache.org@incubator.apache.org Mon Jul 2 16:37:32 2012 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 8B8A39D0D for ; Mon, 2 Jul 2012 16:37:32 +0000 (UTC) Received: (qmail 42546 invoked by uid 500); 2 Jul 2012 16:37:32 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 42520 invoked by uid 500); 2 Jul 2012 16:37:32 -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 42513 invoked by uid 99); 2 Jul 2012 16:37:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Jul 2012 16:37:32 +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, 02 Jul 2012 16:37:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 69AD0238897D; Mon, 2 Jul 2012 16:37:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1356327 - in /incubator/ooo/branches/AOO34/main: editeng/source/editeng/impedit4.cxx sw/source/core/txtnode/txtedt.cxx Date: Mon, 02 Jul 2012 16:37:11 -0000 To: ooo-commits@incubator.apache.org From: hdu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120702163711.69AD0238897D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: hdu Date: Mon Jul 2 16:37:10 2012 New Revision: 1356327 URL: http://svn.apache.org/viewvc?rev=1356327&view=rev Log: #i120045# use namespace to avoid name clash of different TransliterationChgData structs Modified: incubator/ooo/branches/AOO34/main/editeng/source/editeng/impedit4.cxx incubator/ooo/branches/AOO34/main/sw/source/core/txtnode/txtedt.cxx Modified: incubator/ooo/branches/AOO34/main/editeng/source/editeng/impedit4.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/editeng/source/editeng/impedit4.cxx?rev=1356327&r1=1356326&r2=1356327&view=diff ============================================================================== --- incubator/ooo/branches/AOO34/main/editeng/source/editeng/impedit4.cxx (original) +++ incubator/ooo/branches/AOO34/main/editeng/source/editeng/impedit4.cxx Mon Jul 2 16:37:10 2012 @@ -2812,7 +2812,8 @@ void ImpEditEngine::SetAutoCompleteText( #endif // !SVX_LIGHT } - +namespace editeng // #i120045# namespace to avoid XCode template-misoptimization +{ struct TransliterationChgData { sal_uInt16 nStart; @@ -2821,6 +2822,8 @@ struct TransliterationChgData String aNewText; uno::Sequence< sal_Int32 > aOffsets; }; +} +using editeng::TransliterationChgData; EditSelection ImpEditEngine::TransliterateText( const EditSelection& rSelection, sal_Int32 nTransliterationMode ) Modified: incubator/ooo/branches/AOO34/main/sw/source/core/txtnode/txtedt.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/sw/source/core/txtnode/txtedt.cxx?rev=1356327&r1=1356326&r2=1356327&view=diff ============================================================================== --- incubator/ooo/branches/AOO34/main/sw/source/core/txtnode/txtedt.cxx (original) +++ incubator/ooo/branches/AOO34/main/sw/source/core/txtnode/txtedt.cxx Mon Jul 2 16:37:10 2012 @@ -1590,7 +1590,8 @@ void SwLinguStatistik::Flush() #endif - +namespace sw // #i120045# namespace to avoid XCode template-misoptimization +{ struct TransliterationChgData { xub_StrLen nStart; @@ -1598,6 +1599,8 @@ struct TransliterationChgData String sChanged; Sequence< sal_Int32 > aOffsets; }; +} +using sw::TransliterationChgData; // change text to Upper/Lower/Hiragana/Katagana/... void SwTxtNode::TransliterateText(