mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS canvas05 (1.3.56); FILE MERGED

Browse Source 
2008/06/09 12:51:48 thb 1.3.56.4: #i88081# Join from CWS impress144 (fixing the dxcanvas crash), extended for the other canvas impls
2008/04/21 07:27:22 thb 1.3.56.3: RESYNC: (1.3-1.4); FILE MERGED
2007/12/20 22:18:58 thb 1.3.56.2: #i81092# #i78888# #i78925# #i79258# #i79437# #i84784# Large canvas rework, completing various areas such as color spaces, bitmap data access, true sprite and non-sprite implementations, and upstreaming the canvas parts of rodos emf+ rendering
2007/10/01 13:02:02 thb 1.3.56.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom
This commit is contained in:
Kurt Zenker
2008-06-24 09:44:46 +00:00
parent b2a95c6918
commit 6ddded01c7
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
canvas/source/null/null_spritecanvas.hxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: null_spritecanvas.hxx,v $ * $RCSfile: null_spritecanvas.hxx,v $
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
@@ -41,15 +41,14 @@
#include <com/sun/star/rendering/XIntegerBitmap.hpp> #include <com/sun/star/rendering/XIntegerBitmap.hpp>
#include <com/sun/star/rendering/XGraphicDevice.hpp> #include <com/sun/star/rendering/XGraphicDevice.hpp>
#include <com/sun/star/rendering/XBufferController.hpp> #include <com/sun/star/rendering/XBufferController.hpp>
#include <com/sun/star/rendering/XColorSpace.hpp>
#include <com/sun/star/rendering/XParametricPolyPolygon2DFactory.hpp> #include <com/sun/star/rendering/XParametricPolyPolygon2DFactory.hpp>
#include <cppuhelper/compbase9.hxx> #include <cppuhelper/compbase8.hxx>
#include <comphelper/uno3.hxx> #include <comphelper/uno3.hxx>
#include <canvas/base/spritecanvasbase.hxx> #include <canvas/base/spritecanvasbase.hxx>
#include <canvas/base/basemutexhelper.hxx> #include <canvas/base/basemutexhelper.hxx>
#include <canvas/base/windowgraphicdevicebase.hxx> #include <canvas/base/bufferedgraphicdevicebase.hxx>
#include "null_spritecanvashelper.hxx" #include "null_spritecanvashelper.hxx"
#include "null_devicehelper.hxx" #include "null_devicehelper.hxx"
@@ -58,19 +57,18 @@
namespace nullcanvas namespace nullcanvas
{ {
typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::rendering::XSpriteCanvas, typedef ::cppu::WeakComponentImplHelper8< ::com::sun::star::rendering::XSpriteCanvas,
::com::sun::star::rendering::XIntegerBitmap, ::com::sun::star::rendering::XIntegerBitmap,
::com::sun::star::rendering::XGraphicDevice, ::com::sun::star::rendering::XGraphicDevice,
::com::sun::star::rendering::XParametricPolyPolygon2DFactory, ::com::sun::star::rendering::XParametricPolyPolygon2DFactory,
::com::sun::star::rendering::XBufferController, ::com::sun::star::rendering::XBufferController,
::com::sun::star::rendering::XColorSpace,
::com::sun::star::awt::XWindowListener, ::com::sun::star::awt::XWindowListener,
::com::sun::star::beans::XPropertySet, ::com::sun::star::beans::XPropertySet,
::com::sun::star::lang::XServiceName > WindowGraphicDeviceBase_Base; ::com::sun::star::lang::XServiceName > WindowGraphicDeviceBase_Base;
typedef ::canvas::WindowGraphicDeviceBase< ::canvas::BaseMutexHelper< WindowGraphicDeviceBase_Base >, typedef ::canvas::BufferedGraphicDeviceBase< ::canvas::BaseMutexHelper< WindowGraphicDeviceBase_Base >,
DeviceHelper, DeviceHelper,
::osl::MutexGuard, ::osl::MutexGuard,
::cppu::OWeakObject > SpriteCanvasBase_Base; ::cppu::OWeakObject > SpriteCanvasBase_Base;
/** Mixin SpriteSurface /** Mixin SpriteSurface
Have to mixin the SpriteSurface before deriving from Have to mixin the SpriteSurface before deriving from
@@ -116,7 +114,7 @@ namespace nullcanvas
const ::com::sun::star::uno::Reference< const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext ); ::com::sun::star::uno::XComponentContext >& rxContext );
void initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ); void initialize();
#if defined __SUNPRO_CC #if defined __SUNPRO_CC
using SpriteCanvasBaseT::disposing; using SpriteCanvasBaseT::disposing;
@@ -143,6 +141,7 @@ namespace nullcanvas
virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (::com::sun::star::uno::RuntimeException);
private: private:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > maArguments;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxComponentContext; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxComponentContext;
}; };