INTEGRATION: CWS presfixes12 (1.1.2); FILE ADDED
2007/01/29 14:02:10 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
061b2a156e
commit
e52b803f6a
2 changed files with 289 additions and 0 deletions
177
slideshow/source/engine/shapes/viewappletshape.hxx
Normal file
177
slideshow/source/engine/shapes/viewappletshape.hxx
Normal file
|
|
@ -0,0 +1,177 @@
|
|||
/*************************************************************************
|
||||
*
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* $RCSfile: viewappletshape.hxx,v $
|
||||
*
|
||||
* $Revision: 1.2 $
|
||||
*
|
||||
* last change: $Author: obo $ $Date: 2007-07-17 14:54:55 $
|
||||
*
|
||||
* 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_VIEWAPPLETSHAPE_HXX
|
||||
#define INCLUDED_SLIDESHOW_VIEWAPPLETSHAPE_HXX
|
||||
|
||||
#include <basegfx/range/b2drectangle.hxx>
|
||||
#include <com/sun/star/awt/Point.hpp>
|
||||
|
||||
#include <boost/utility.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
#include "viewlayer.hxx"
|
||||
|
||||
namespace com { namespace sun { namespace star {
|
||||
namespace frame {
|
||||
class XSynchronousFrameLoader;
|
||||
class XFrame;
|
||||
}
|
||||
namespace uno {
|
||||
class XComponentContext;
|
||||
}
|
||||
namespace drawing {
|
||||
class XShape;
|
||||
}}}}
|
||||
|
||||
namespace slideshow
|
||||
{
|
||||
namespace internal
|
||||
{
|
||||
/** This class is the viewable representation of a draw
|
||||
document's applet object, associated to a specific View
|
||||
|
||||
The class is able to render the associated applet on View
|
||||
implementations.
|
||||
*/
|
||||
class ViewAppletShape : private boost::noncopyable
|
||||
{
|
||||
public:
|
||||
/** Create a ViewAppletShape for the given View
|
||||
|
||||
@param rViewLayer
|
||||
The associated View object.
|
||||
|
||||
@param rxShape
|
||||
The associated Shape
|
||||
|
||||
@param rServiceName
|
||||
The service name to use, when actually creating the
|
||||
viewer component
|
||||
|
||||
@param pPropCopyTable
|
||||
Table of plain ASCII property names, to copy from
|
||||
xShape to applet.
|
||||
|
||||
@param nNumPropEntries
|
||||
Number of property table entries (in pPropCopyTable)
|
||||
*/
|
||||
ViewAppletShape( const ViewLayerSharedPtr& rViewLayer,
|
||||
const ::com::sun::star::uno::Reference<
|
||||
::com::sun::star::drawing::XShape >& rxShape,
|
||||
const ::rtl::OUString& rServiceName,
|
||||
const char** pPropCopyTable,
|
||||
sal_Size nNumPropEntries,
|
||||
const ::com::sun::star::uno::Reference<
|
||||
::com::sun::star::uno::XComponentContext >& rxContext );
|
||||
|
||||
/** destroy the object
|
||||
*/
|
||||
virtual ~ViewAppletShape();
|
||||
|
||||
/** Query the associated view layer of this shape
|
||||
*/
|
||||
ViewLayerSharedPtr getViewLayer() const;
|
||||
|
||||
// animation methods
|
||||
//------------------------------------------------------------------
|
||||
|
||||
/** Notify the ViewShape that an animation starts now
|
||||
|
||||
This method enters animation mode on the associate
|
||||
target view. The shape can be animated in parallel on
|
||||
different views.
|
||||
|
||||
@param rBounds
|
||||
The current applet shape bounds
|
||||
|
||||
@return whether the mode change finished successfully.
|
||||
*/
|
||||
bool startApplet( const ::basegfx::B2DRectangle& rBounds );
|
||||
|
||||
/** Notify the ViewShape that it is no longer animated
|
||||
|
||||
This methods ends animation mode on the associate
|
||||
target view
|
||||
*/
|
||||
void endApplet();
|
||||
|
||||
// render methods
|
||||
//------------------------------------------------------------------
|
||||
|
||||
/** Render the ViewShape
|
||||
|
||||
This method renders the ViewAppletShape on the associated view.
|
||||
|
||||
@param rBounds
|
||||
The current applet shape bounds
|
||||
|
||||
@return whether the rendering finished successfully.
|
||||
*/
|
||||
bool render( const ::basegfx::B2DRectangle& rBounds ) const;
|
||||
|
||||
/** Resize the ViewShape
|
||||
|
||||
This method resizes the ViewAppletShape on the
|
||||
associated view. It does not render.
|
||||
|
||||
@param rBounds
|
||||
The current applet shape bounds
|
||||
|
||||
@return whether the resize finished successfully.
|
||||
*/
|
||||
bool resize( const ::basegfx::B2DRectangle& rBounds ) const;
|
||||
|
||||
private:
|
||||
|
||||
ViewLayerSharedPtr mpViewLayer;
|
||||
|
||||
/// the actual viewer component for this applet
|
||||
::com::sun::star::uno::Reference<
|
||||
::com::sun::star::frame::XSynchronousFrameLoader> mxViewer;
|
||||
|
||||
/// the frame containing the applet
|
||||
::com::sun::star::uno::Reference<
|
||||
::com::sun::star::frame::XFrame> mxFrame;
|
||||
::com::sun::star::uno::Reference<
|
||||
::com::sun::star::uno::XComponentContext> mxComponentContext;
|
||||
};
|
||||
|
||||
typedef ::boost::shared_ptr< ViewAppletShape > ViewAppletShapeSharedPtr;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* INCLUDED_SLIDESHOW_VIEWAPPLETSHAPE_HXX */
|
||||
112
slideshow/source/engine/shapes/viewbackgroundshape.hxx
Normal file
112
slideshow/source/engine/shapes/viewbackgroundshape.hxx
Normal file
|
|
@ -0,0 +1,112 @@
|
|||
/*************************************************************************
|
||||
*
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* $RCSfile: viewbackgroundshape.hxx,v $
|
||||
*
|
||||
* $Revision: 1.2 $
|
||||
*
|
||||
* last change: $Author: obo $ $Date: 2007-07-17 14:55:20 $
|
||||
*
|
||||
* 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_VIEWBACKGROUNDSHAPE_HXX
|
||||
#define INCLUDED_SLIDESHOW_VIEWBACKGROUNDSHAPE_HXX
|
||||
|
||||
#include <com/sun/star/uno/Reference.hxx>
|
||||
#include <com/sun/star/rendering/XBitmap.hpp>
|
||||
|
||||
#include <basegfx/range/b2drectangle.hxx>
|
||||
#include <basegfx/matrix/b2dhommatrix.hxx>
|
||||
#include <cppcanvas/spritecanvas.hxx>
|
||||
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/utility.hpp>
|
||||
|
||||
#include "gdimtftools.hxx"
|
||||
#include "viewlayer.hxx"
|
||||
|
||||
|
||||
namespace slideshow
|
||||
{
|
||||
namespace internal
|
||||
{
|
||||
/** This class is the viewable representation of a draw
|
||||
document's background, associated to a specific View
|
||||
|
||||
The class is able to render the associated background on
|
||||
View implementations.
|
||||
*/
|
||||
class ViewBackgroundShape : private boost::noncopyable
|
||||
{
|
||||
public:
|
||||
/** Create a ViewBackgroundShape for the given View
|
||||
|
||||
@param rView
|
||||
The associated View object.
|
||||
|
||||
@param rShapeBounds
|
||||
Bounds of the background shape, in document coordinate
|
||||
system.
|
||||
*/
|
||||
ViewBackgroundShape( const ViewLayerSharedPtr& rViewLayer,
|
||||
const ::basegfx::B2DRectangle& rShapeBounds );
|
||||
|
||||
/** Query the associated view layer of this shape
|
||||
*/
|
||||
ViewLayerSharedPtr getViewLayer() const;
|
||||
|
||||
bool render( const GDIMetaFileSharedPtr& rMtf ) const;
|
||||
|
||||
private:
|
||||
/** Prefetch bitmap for given canvas
|
||||
*/
|
||||
bool prefetch( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
|
||||
const GDIMetaFileSharedPtr& rMtf ) const;
|
||||
|
||||
/** The view layer this object is part of.
|
||||
*/
|
||||
ViewLayerSharedPtr mpViewLayer;
|
||||
|
||||
/// Generated content bitmap, already with correct output size
|
||||
mutable ::com::sun::star::uno::Reference<
|
||||
::com::sun::star::rendering::XBitmap > mxBitmap;
|
||||
|
||||
/// The last metafile a render object was generated for
|
||||
mutable GDIMetaFileSharedPtr mpLastMtf;
|
||||
|
||||
/// The canvas, mpRenderer is associated with
|
||||
mutable ::basegfx::B2DHomMatrix maLastTransformation;
|
||||
|
||||
const ::basegfx::B2DRectangle maBounds;
|
||||
};
|
||||
|
||||
typedef ::boost::shared_ptr< ViewBackgroundShape > ViewBackgroundShapeSharedPtr;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* INCLUDED_SLIDESHOW_VIEWBACKGROUNDSHAPE_HXX */
|
||||
Loading…
Reference in a new issue