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 800419307 for ; Fri, 15 Jun 2012 07:12:10 +0000 (UTC) Received: (qmail 55860 invoked by uid 500); 15 Jun 2012 07:12:09 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 55743 invoked by uid 500); 15 Jun 2012 07:12:08 -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 55707 invoked by uid 99); 15 Jun 2012 07:12:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Jun 2012 07:12:07 +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; Fri, 15 Jun 2012 07:12:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 135752388860; Fri, 15 Jun 2012 07:11:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1350481 - /incubator/ooo/trunk/main/animations/source/animcore/targetpropertiescreator.cxx Date: Fri, 15 Jun 2012 07:11:46 -0000 To: ooo-commits@incubator.apache.org From: af@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120615071146.135752388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: af Date: Fri Jun 15 07:11:45 2012 New Revision: 1350481 URL: http://svn.apache.org/viewvc?rev=1350481&view=rev Log: #i119966# Fixed the handling of the "visibility" flag of animations. Patch by: Steve Yin Review by: Andre Fischer Modified: incubator/ooo/trunk/main/animations/source/animcore/targetpropertiescreator.cxx Modified: incubator/ooo/trunk/main/animations/source/animcore/targetpropertiescreator.cxx URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/animations/source/animcore/targetpropertiescreator.cxx?rev=1350481&r1=1350480&r2=1350481&view=diff ============================================================================== --- incubator/ooo/trunk/main/animations/source/animcore/targetpropertiescreator.cxx (original) +++ incubator/ooo/trunk/main/animations/source/animcore/targetpropertiescreator.cxx Fri Jun 15 07:11:45 2012 @@ -276,9 +276,9 @@ namespace animcore // FALLTHROUGH intended case animations::AnimationNodeType::AUDIO: // FALLTHROUGH intended - default: + /*default: // ignore this node, no valuable content for now. - break; + break;*/ case animations::AnimationNodeType::SET: { @@ -343,9 +343,9 @@ namespace animcore // initially. This is currently the only place // where a shape effect influences shape // attributes outside it's effective duration. + sal_Bool bVisible( sal_False ); if( xAnimateNode->getAttributeName().equalsIgnoreAsciiCaseAscii("visibility") ) { - sal_Bool bVisible( sal_False ); uno::Any aAny( xAnimateNode->getTo() ); @@ -371,22 +371,27 @@ namespace animcore } } - if( bVisible ) + /*if( bVisible ) { // target is set to 'visible' at the // first relevant effect. Thus, target // must be initially _hidden_, for the // effect to have visible impact. - mrShapeHash.insert( + */ + } + // target is set the 'visible' value, + // so we should record the opposite value + mrShapeHash.insert( XShapeHash::value_type( aTarget, VectorOfNamedValues( 1, beans::NamedValue( - xAnimateNode->getAttributeName(), - uno::makeAny( sal_False ) ) ) ) ); - } - } + //xAnimateNode->getAttributeName(), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("visibility")), + uno::makeAny( !bVisible ) ) ) ) ); + //} + //} } break; }