2010-10-12 15:51:52 +02:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
2005-01-21 16:03:21 +00:00
|
|
|
/*************************************************************************
|
|
|
|
*
|
2008-04-10 23:41:33 +00:00
|
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
2005-01-21 16:03:21 +00:00
|
|
|
*
|
2010-02-12 15:01:35 +01:00
|
|
|
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
2005-01-21 16:03:21 +00:00
|
|
|
*
|
2008-04-10 23:41:33 +00:00
|
|
|
* OpenOffice.org - a multi-platform office productivity suite
|
2005-01-21 16:03:21 +00:00
|
|
|
*
|
2008-04-10 23:41:33 +00:00
|
|
|
* This file is part of OpenOffice.org.
|
2005-01-21 16:03:21 +00:00
|
|
|
*
|
2008-04-10 23:41:33 +00:00
|
|
|
* OpenOffice.org is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU Lesser General Public License version 3
|
|
|
|
* only, as published by the Free Software Foundation.
|
2005-01-21 16:03:21 +00:00
|
|
|
*
|
2008-04-10 23:41:33 +00:00
|
|
|
* OpenOffice.org is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU Lesser General Public License version 3 for more details
|
|
|
|
* (a copy is included in the LICENSE file that accompanied this code).
|
2005-01-21 16:03:21 +00:00
|
|
|
*
|
2008-04-10 23:41:33 +00:00
|
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
|
|
* version 3 along with OpenOffice.org. If not, see
|
|
|
|
* <http://www.openoffice.org/license.html>
|
|
|
|
* for a copy of the LGPLv3 License.
|
2005-01-21 16:03:21 +00:00
|
|
|
*
|
|
|
|
************************************************************************/
|
|
|
|
|
2006-09-17 07:34:34 +00:00
|
|
|
// MARKER(update_precomp.py): autogen include statement, do not remove
|
|
|
|
#include "precompiled_slideshow.hxx"
|
|
|
|
|
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/02/06 17:18:06 thb 1.8.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/29 14:02:01 thb 1.8.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
2007-07-17 13:47:59 +00:00
|
|
|
#include <canvas/debug.hxx>
|
|
|
|
#include <canvas/verbosetrace.hxx>
|
|
|
|
|
2006-07-26 06:32:34 +00:00
|
|
|
#include "animationfactory.hxx"
|
|
|
|
#include "setactivity.hxx"
|
|
|
|
#include "animationsetnode.hxx"
|
|
|
|
#include "nodetools.hxx"
|
|
|
|
#include "tools.hxx"
|
|
|
|
#include "delayevent.hxx"
|
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/02/06 17:18:06 thb 1.8.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/29 14:02:01 thb 1.8.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
2007-07-17 13:47:59 +00:00
|
|
|
|
|
|
|
#include <boost/bind.hpp>
|
2005-01-21 16:03:21 +00:00
|
|
|
|
2006-07-26 06:32:34 +00:00
|
|
|
using namespace com::sun::star;
|
2005-01-21 16:03:21 +00:00
|
|
|
|
2006-12-13 14:30:46 +00:00
|
|
|
namespace slideshow {
|
2006-07-26 06:32:34 +00:00
|
|
|
namespace internal {
|
2005-01-21 16:03:21 +00:00
|
|
|
|
2006-07-26 06:32:34 +00:00
|
|
|
void AnimationSetNode::implScheduleDeactivationEvent()
|
|
|
|
{
|
|
|
|
scheduleDeactivationEvent();
|
|
|
|
}
|
2005-01-21 16:03:21 +00:00
|
|
|
|
2006-07-26 06:32:34 +00:00
|
|
|
AnimationActivitySharedPtr AnimationSetNode::createActivity() const
|
2005-01-21 16:03:21 +00:00
|
|
|
{
|
2006-07-26 06:32:34 +00:00
|
|
|
ActivitiesFactory::CommonParameters aParms( fillCommonParameters() );
|
|
|
|
uno::Reference<animations::XAnimate> const xAnimateNode = getXAnimateNode();
|
|
|
|
rtl::OUString const attrName( xAnimateNode->getAttributeName() );
|
|
|
|
AttributableShapeSharedPtr const pShape( getShape() );
|
|
|
|
|
|
|
|
// make deactivation a two-step procedure. Normally, we
|
|
|
|
// could solely rely on
|
|
|
|
// BaseNode::scheduleDeactivationEvent() to deactivate()
|
|
|
|
// us. Unfortunately, that method on the one hand ignores
|
|
|
|
// indefinite timing, on the other hand generates
|
|
|
|
// zero-timeout delays, which might get fired _before_ our
|
|
|
|
// set activity has taken place. Therefore, we enforce
|
|
|
|
// sequentiality by letting only the set activity schedule
|
|
|
|
// the deactivation event (and AnimationBaseNode
|
|
|
|
// takes care for the fact when mpActivity should be zero).
|
|
|
|
|
|
|
|
// AnimationBaseNode::fillCommonParameters() has set up
|
|
|
|
// immediate deactivation as default when activity ends, but
|
|
|
|
if (! isIndefiniteTiming( xAnimateNode->getDuration() )) {
|
|
|
|
boost::shared_ptr<AnimationSetNode> const pSelf(
|
|
|
|
boost::dynamic_pointer_cast<AnimationSetNode>(getSelf()) );
|
2008-06-24 11:07:40 +00:00
|
|
|
ENSURE_OR_THROW(
|
2006-12-13 14:30:46 +00:00
|
|
|
pSelf, "cannot cast getSelf() to my type!" );
|
2006-07-26 06:32:34 +00:00
|
|
|
aParms.mpEndEvent = makeEvent(
|
|
|
|
boost::bind( &AnimationSetNode::implScheduleDeactivationEvent,
|
2009-04-27 11:42:05 +00:00
|
|
|
pSelf ),
|
|
|
|
"AnimationSetNode::implScheduleDeactivationEvent");
|
2006-07-26 06:32:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
switch (AnimationFactory::classifyAttributeName( attrName )) {
|
|
|
|
default:
|
|
|
|
case AnimationFactory::CLASS_UNKNOWN_PROPERTY:
|
2008-06-24 11:07:40 +00:00
|
|
|
ENSURE_OR_THROW(
|
2006-07-26 06:32:34 +00:00
|
|
|
false, "AnimationSetNode::createSetActivity(): "
|
|
|
|
"Unexpected attribute class" );
|
|
|
|
break;
|
|
|
|
|
|
|
|
case AnimationFactory::CLASS_NUMBER_PROPERTY:
|
|
|
|
{
|
|
|
|
NumberAnimation::ValueType aValue;
|
|
|
|
|
2008-06-24 11:07:40 +00:00
|
|
|
ENSURE_OR_THROW(
|
2006-07-26 06:32:34 +00:00
|
|
|
extractValue( aValue,
|
|
|
|
xAnimateNode->getTo(),
|
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/02/06 17:18:06 thb 1.8.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/29 14:02:01 thb 1.8.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
2007-07-17 13:47:59 +00:00
|
|
|
pShape,
|
|
|
|
getSlideSize() ),
|
2006-07-26 06:32:34 +00:00
|
|
|
"AnimationSetNode::createSetActivity(): "
|
|
|
|
"Could not import numeric to value" );
|
|
|
|
|
|
|
|
return makeSetActivity(
|
|
|
|
aParms,
|
|
|
|
AnimationFactory::createNumberPropertyAnimation(
|
|
|
|
attrName,
|
|
|
|
pShape,
|
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/02/06 17:18:06 thb 1.8.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/29 14:02:01 thb 1.8.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
2007-07-17 13:47:59 +00:00
|
|
|
getContext().mpSubsettableShapeManager,
|
|
|
|
getSlideSize(),
|
2006-07-26 06:32:34 +00:00
|
|
|
AnimationFactory::FLAG_NO_SPRITE ),
|
|
|
|
aValue );
|
|
|
|
}
|
|
|
|
|
|
|
|
case AnimationFactory::CLASS_ENUM_PROPERTY:
|
|
|
|
{
|
|
|
|
EnumAnimation::ValueType aValue;
|
|
|
|
|
2008-06-24 11:07:40 +00:00
|
|
|
ENSURE_OR_THROW(
|
2006-07-26 06:32:34 +00:00
|
|
|
extractValue( aValue,
|
|
|
|
xAnimateNode->getTo(),
|
|
|
|
pShape,
|
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/02/06 17:18:06 thb 1.8.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/29 14:02:01 thb 1.8.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
2007-07-17 13:47:59 +00:00
|
|
|
getSlideSize() ),
|
2006-07-26 06:32:34 +00:00
|
|
|
"AnimationSetNode::createSetActivity(): "
|
|
|
|
"Could not import enum to value" );
|
|
|
|
|
|
|
|
return makeSetActivity(
|
|
|
|
aParms,
|
|
|
|
AnimationFactory::createEnumPropertyAnimation(
|
|
|
|
attrName,
|
|
|
|
pShape,
|
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/02/06 17:18:06 thb 1.8.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/29 14:02:01 thb 1.8.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
2007-07-17 13:47:59 +00:00
|
|
|
getContext().mpSubsettableShapeManager,
|
|
|
|
getSlideSize(),
|
2006-07-26 06:32:34 +00:00
|
|
|
AnimationFactory::FLAG_NO_SPRITE ),
|
|
|
|
aValue );
|
|
|
|
}
|
|
|
|
|
|
|
|
case AnimationFactory::CLASS_COLOR_PROPERTY:
|
2005-01-21 16:03:21 +00:00
|
|
|
{
|
2006-07-26 06:32:34 +00:00
|
|
|
ColorAnimation::ValueType aValue;
|
|
|
|
|
2008-06-24 11:07:40 +00:00
|
|
|
ENSURE_OR_THROW(
|
2006-07-26 06:32:34 +00:00
|
|
|
extractValue( aValue,
|
|
|
|
xAnimateNode->getTo(),
|
|
|
|
pShape,
|
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/02/06 17:18:06 thb 1.8.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/29 14:02:01 thb 1.8.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
2007-07-17 13:47:59 +00:00
|
|
|
getSlideSize() ),
|
2006-07-26 06:32:34 +00:00
|
|
|
"AnimationSetNode::createSetActivity(): "
|
|
|
|
"Could not import color to value" );
|
|
|
|
|
|
|
|
return makeSetActivity(
|
|
|
|
aParms,
|
|
|
|
AnimationFactory::createColorPropertyAnimation(
|
|
|
|
attrName,
|
|
|
|
pShape,
|
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/02/06 17:18:06 thb 1.8.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/29 14:02:01 thb 1.8.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
2007-07-17 13:47:59 +00:00
|
|
|
getContext().mpSubsettableShapeManager,
|
|
|
|
getSlideSize(),
|
2006-07-26 06:32:34 +00:00
|
|
|
AnimationFactory::FLAG_NO_SPRITE ),
|
|
|
|
aValue );
|
2005-01-21 16:03:21 +00:00
|
|
|
}
|
2006-07-26 06:32:34 +00:00
|
|
|
|
|
|
|
case AnimationFactory::CLASS_STRING_PROPERTY:
|
|
|
|
{
|
|
|
|
StringAnimation::ValueType aValue;
|
|
|
|
|
2008-06-24 11:07:40 +00:00
|
|
|
ENSURE_OR_THROW(
|
2006-07-26 06:32:34 +00:00
|
|
|
extractValue( aValue,
|
|
|
|
xAnimateNode->getTo(),
|
|
|
|
pShape,
|
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/02/06 17:18:06 thb 1.8.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/29 14:02:01 thb 1.8.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
2007-07-17 13:47:59 +00:00
|
|
|
getSlideSize() ),
|
2006-07-26 06:32:34 +00:00
|
|
|
"AnimationSetNode::createSetActivity(): "
|
|
|
|
"Could not import string to value" );
|
|
|
|
|
|
|
|
return makeSetActivity(
|
|
|
|
aParms,
|
|
|
|
AnimationFactory::createStringPropertyAnimation(
|
|
|
|
attrName,
|
|
|
|
pShape,
|
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/02/06 17:18:06 thb 1.8.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/29 14:02:01 thb 1.8.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
2007-07-17 13:47:59 +00:00
|
|
|
getContext().mpSubsettableShapeManager,
|
|
|
|
getSlideSize(),
|
2006-07-26 06:32:34 +00:00
|
|
|
AnimationFactory::FLAG_NO_SPRITE ),
|
|
|
|
aValue );
|
|
|
|
}
|
|
|
|
|
|
|
|
case AnimationFactory::CLASS_BOOL_PROPERTY:
|
|
|
|
{
|
|
|
|
BoolAnimation::ValueType aValue;
|
|
|
|
|
2008-06-24 11:07:40 +00:00
|
|
|
ENSURE_OR_THROW(
|
2006-07-26 06:32:34 +00:00
|
|
|
extractValue( aValue,
|
|
|
|
xAnimateNode->getTo(),
|
|
|
|
pShape,
|
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/02/06 17:18:06 thb 1.8.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/29 14:02:01 thb 1.8.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
2007-07-17 13:47:59 +00:00
|
|
|
getSlideSize() ),
|
2006-07-26 06:32:34 +00:00
|
|
|
"AnimationSetNode::createSetActivity(): "
|
|
|
|
"Could not import bool to value" );
|
|
|
|
|
|
|
|
return makeSetActivity(
|
|
|
|
aParms,
|
|
|
|
AnimationFactory::createBoolPropertyAnimation(
|
|
|
|
attrName,
|
|
|
|
pShape,
|
INTEGRATION: CWS presfixes12 (1.8.12); FILE MERGED
2007/02/06 17:18:06 thb 1.8.12.2: #i37778# Moved clear() method from View to ViewLayer (also sprites need to be cleared); fixed a few more cases of local code style violations; removed redundant inline keywords; finished Layer/LayerManager rework (Layer now represents ViewLayers, shapes and rendering are fully under LayerManager control); made shape comparator reusable
2007/01/29 14:02:01 thb 1.8.12.1: Issue number: #i37778#
Larger slideshow refactoring. Wrote design and coding style manifest,
and adapted the code to actually conform to this. In detail:
- cleaned up ownership/disposable/weak_ptr story. removed hacks and
explicit Disposable implementations, where workaround were available
- removed object mutices, where superfluous
- reworked EventMultiplexer (using templatized listener class now), added
more events. EventMultiplexer now serves as a true blackboard
- reworked directory structure: disjunct parts are now physically separated
into directories, instantiation happens via factories & abstract interfaces
- added CursorManager, to make setting mouse cursor less hackish
- reworked DrawShape, to implement SeparateListener pattern
- reworked IntrinsicAnimationActivity, to avoid cyclic references
- modified hyperlink & shape cursor handling to communicate via
EventMultiplexer
- renamed & cleaned up files (presentation.cxx now named slideshowimpl.cxx,
etc.)
- added first version of the z-order fix to layer/layermanager
- cleaned up include guards and include syntax
2007-07-17 13:47:59 +00:00
|
|
|
getContext().mpSubsettableShapeManager,
|
|
|
|
getSlideSize(),
|
2006-07-26 06:32:34 +00:00
|
|
|
AnimationFactory::FLAG_NO_SPRITE ),
|
|
|
|
aValue );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return AnimationActivitySharedPtr();
|
2005-01-21 16:03:21 +00:00
|
|
|
}
|
2006-07-26 06:32:34 +00:00
|
|
|
|
|
|
|
} // namespace internal
|
2006-12-13 14:30:46 +00:00
|
|
|
} // namespace slideshow
|
2006-07-26 06:32:34 +00:00
|
|
|
|
2010-10-12 15:51:52 +02:00
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|