INTEGRATION: CWS presfixes12 (1.1.2); FILE ADDED
2007/01/29 14:02:08 thb 1.1.2.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
This commit is contained in:
Oliver Bolte
parent
a82624dcbd
commit
864ba9d0b6
2 changed files with 152 additions and 0 deletions
|
|
@ -0,0 +1,84 @@
|
|||
/*************************************************************************
|
||||
*
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* $RCSfile: intrinsicanimationactivity.hxx,v $
|
||||
*
|
||||
* $Revision: 1.2 $
|
||||
*
|
||||
* last change: $Author: obo $ $Date: 2007-07-17 14:53:49 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
*
|
||||
*
|
||||
* GNU Lesser General Public License Version 2.1
|
||||
* =============================================
|
||||
* Copyright 2005 by Sun Microsystems, Inc.
|
||||
* 901 San Antonio Road, Palo Alto, CA 94303, USA
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License version 2.1, as published by the Free Software Foundation.
|
||||
*
|
||||
* This library 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 for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
* MA 02111-1307 USA
|
||||
*
|
||||
************************************************************************/
|
||||
|
||||
#ifndef INCLUDED_SLIDESHOW_INTRINSICANIMATIONACTIVITY_HXX
|
||||
#define INCLUDED_SLIDESHOW_INTRINSICANIMATIONACTIVITY_HXX
|
||||
|
||||
#include "wakeupevent.hxx"
|
||||
#include "activity.hxx"
|
||||
#include "slideshowcontext.hxx"
|
||||
#include "drawshape.hxx"
|
||||
#include "tools.hxx"
|
||||
|
||||
/* Definition of IntrinsicAnimationActivity class */
|
||||
|
||||
namespace slideshow
|
||||
{
|
||||
namespace internal
|
||||
{
|
||||
/** Create an IntrinsicAnimationActivity.
|
||||
|
||||
This is an Activity interface implementation for intrinsic
|
||||
shape animations. Intrinsic shape animations are
|
||||
animations directly within a shape, e.g. drawing layer
|
||||
animations, or GIF animations.
|
||||
|
||||
@param rContext
|
||||
Common slideshow objects
|
||||
|
||||
@param rDrawShape
|
||||
Shape to control the intrinsic animation for
|
||||
|
||||
@param rWakeupEvent
|
||||
Externally generated wakeup event, to set this
|
||||
activity to sleep during inter-frame intervals. Must
|
||||
come frome the outside, since wakeup event and this
|
||||
object have mutual references to each other.
|
||||
|
||||
@param rTimeouts
|
||||
Vector of timeout values, to wait before the next
|
||||
frame is shown.
|
||||
*/
|
||||
ActivitySharedPtr createIntrinsicAnimationActivity(
|
||||
const SlideShowContext& rContext,
|
||||
const DrawShapeSharedPtr& rDrawShape,
|
||||
const WakeupEventSharedPtr& rWakeupEvent,
|
||||
const ::std::vector<double>& rTimeouts,
|
||||
::std::size_t nNumLoops,
|
||||
CycleMode eCycleMode );
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* INCLUDED_SLIDESHOW_INTRINSICANIMATIONACTIVITY_HXX */
|
||||
68
slideshow/source/engine/shapes/makefile.mk
Normal file
68
slideshow/source/engine/shapes/makefile.mk
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
#*************************************************************************
|
||||
#
|
||||
# OpenOffice.org - a multi-platform office productivity suite
|
||||
#
|
||||
# $RCSfile: makefile.mk,v $
|
||||
#
|
||||
# $Revision: 1.2 $
|
||||
#
|
||||
# last change: $Author: obo $ $Date: 2007-07-17 14:54:00 $
|
||||
#
|
||||
# The Contents of this file are made available subject to
|
||||
# the terms of GNU Lesser General Public License Version 2.1.
|
||||
#
|
||||
#
|
||||
# GNU Lesser General Public License Version 2.1
|
||||
# =============================================
|
||||
# Copyright 2005 by Sun Microsystems, Inc.
|
||||
# 901 San Antonio Road, Palo Alto, CA 94303, USA
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
# License version 2.1, as published by the Free Software Foundation.
|
||||
#
|
||||
# This library 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 for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public
|
||||
# License along with this library; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
||||
# MA 02111-1307 USA
|
||||
#
|
||||
#*************************************************************************
|
||||
|
||||
PRJ=..$/..$/..
|
||||
|
||||
PRJNAME=slideshow
|
||||
TARGET=shapes
|
||||
ENABLE_EXCEPTIONS=TRUE
|
||||
PRJINC=..$/..
|
||||
|
||||
# --- Settings -----------------------------------------------------------
|
||||
|
||||
.INCLUDE : settings.mk
|
||||
.INCLUDE : $(PRJ)$/util$/makefile.pmk
|
||||
|
||||
# --- Common ----------------------------------------------------------
|
||||
|
||||
SLOFILES = $(SLO)$/appletshape.obj \
|
||||
$(SLO)$/backgroundshape.obj \
|
||||
$(SLO)$/drawinglayeranimation.obj \
|
||||
$(SLO)$/drawshape.obj \
|
||||
$(SLO)$/drawshapesubsetting.obj \
|
||||
$(SLO)$/externalshapebase.obj \
|
||||
$(SLO)$/gdimtftools.obj \
|
||||
$(SLO)$/intrinsicanimationactivity.obj \
|
||||
$(SLO)$/mediashape.obj \
|
||||
$(SLO)$/shapeimporter.obj \
|
||||
$(SLO)$/viewappletshape.obj \
|
||||
$(SLO)$/viewbackgroundshape.obj \
|
||||
$(SLO)$/viewmediashape.obj \
|
||||
$(SLO)$/viewshape.obj
|
||||
|
||||
|
||||
# ==========================================================================
|
||||
|
||||
.INCLUDE : target.mk
|
||||
Loading…
Reference in a new issue