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 760CEDFD6 for ; Mon, 10 Sep 2012 02:29:55 +0000 (UTC) Received: (qmail 31180 invoked by uid 500); 10 Sep 2012 02:29:55 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 31067 invoked by uid 500); 10 Sep 2012 02:29:55 -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 31054 invoked by uid 99); 10 Sep 2012 02:29:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Sep 2012 02:29:54 +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, 10 Sep 2012 02:29:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CFFC02388900; Mon, 10 Sep 2012 02:29:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1382623 - /incubator/ooo/trunk/main/sd/source/filter/eppt/pptexanimations.cxx Date: Mon, 10 Sep 2012 02:29:08 -0000 To: ooo-commits@incubator.apache.org From: sunying@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120910022908.CFFC02388900@eris.apache.org> Author: sunying Date: Mon Sep 10 02:29:08 2012 New Revision: 1382623 URL: http://svn.apache.org/viewvc?rev=1382623&view=rev Log: #119711# support the delay var when export ppt file by AOO Reported by: Wang Li Feng Patch by: Ying Sun Review by: Jian Yuan Li Modified: incubator/ooo/trunk/main/sd/source/filter/eppt/pptexanimations.cxx Modified: incubator/ooo/trunk/main/sd/source/filter/eppt/pptexanimations.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/filter/eppt/pptexanimations.cxx?rev=1382623&r1=1382622&r2=1382623&view=diff ============================================================================== --- incubator/ooo/trunk/main/sd/source/filter/eppt/pptexanimations.cxx (original) +++ incubator/ooo/trunk/main/sd/source/filter/eppt/pptexanimations.cxx Mon Sep 10 02:29:08 2012 @@ -1377,8 +1377,7 @@ void AnimationExporter::exportAnimEvent( else if ( aAny >>= fTiming ) { bCreateEvent = sal_True; - if ( eTiming == Timing_INDEFINITE ) - nBegin = (sal_Int32)( fTiming * 1000.0 ); + nBegin = (sal_Int32)( fTiming * 1000.0 ); } } break;