strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#i10000# To please SunCC, had to implement isAccelerated/getDeviceHandle on most derived device helper classes

Browse source
This commit is contained in:
Thorsten Behrens 2008-06-27 15:48:36 +00:00
parent e42918e446
commit a73452e618
5 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
canvas/inc/canvas/base/graphicdevicebase.hxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: graphicdevicebase.hxx,v $
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* This file is part of OpenOffice.org.
*
@ -130,14 +130,12 @@ namespace canvas
mbDumpScreenContent(false)
{
maPropHelper.initProperties( PropertySetHelper::MakeMap
#ifndef __SUNPRO_CC
("HardwareAcceleration",
boost::bind(&DeviceHelper::isAccelerated,
boost::ref(maDeviceHelper)))
("DeviceHandle",
boost::bind(&DeviceHelper::getDeviceHandle,
boost::ref(maDeviceHelper)))
#endif
("SurfaceHandle",
boost::bind(&DeviceHelper::getSurfaceHandle,
boost::ref(maDeviceHelper)))
@ -146,8 +144,7 @@ namespace canvas
this),
boost::bind(&ThisType::setDumpScreenContent,
this,
_1))
);
_1)));
}
#if defined __SUNPRO_CC

12
canvas/source/cairo/cairo_spritedevicehelper.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: cairo_spritedevicehelper.cxx,v $
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* This file is part of OpenOffice.org.
*
@ -116,6 +116,16 @@ namespace cairocanvas
return ::com::sun::star::uno::makeAny(true);
}
uno::Any SpriteDeviceHelper::getDeviceHandle() const
{
return DeviceHelper::getDeviceHandle();
}
uno::Any SpriteDeviceHelper::getSurfaceHandle() const
{
return DeviceHelper::getSurfaceHandle();
}
void SpriteDeviceHelper::setSize( const ::basegfx::B2ISize& rSize )
{
OSL_TRACE("SpriteDeviceHelper::setSize(): device size %d x %d", rSize.getX(), rSize.getY() );

4
canvas/source/cairo/cairo_spritedevicehelper.hxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: cairo_spritedevicehelper.hxx,v $
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* This file is part of OpenOffice.org.
*
@ -70,6 +70,8 @@ namespace cairocanvas
::sal_Bool switchBuffer( bool, ::sal_Bool bUpdateAll );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;
::com::sun::star::uno::Any getSurfaceHandle() const;
void notifySizeUpdate( const ::com::sun::star::awt::Rectangle& rBounds );
void setSize( const ::basegfx::B2ISize& rSize );

12
canvas/source/vcl/spritedevicehelper.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: spritedevicehelper.cxx,v $
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* This file is part of OpenOffice.org.
*
@ -101,6 +101,16 @@ namespace vclcanvas
DeviceHelper::disposing();
}
uno::Any SpriteDeviceHelper::isAccelerated() const
{
return DeviceHelper::isAccelerated();
}
uno::Any SpriteDeviceHelper::getDeviceHandle() const
{
return DeviceHelper::getDeviceHandle();
}
uno::Any SpriteDeviceHelper::getSurfaceHandle() const
{
if( !mpBackBuffer )

4
canvas/source/vcl/spritedevicehelper.hxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: spritedevicehelper.hxx,v $
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* This file is part of OpenOffice.org.
*
@ -67,6 +67,8 @@ namespace vclcanvas
::sal_Bool showBuffer( bool bWindowVisible, ::sal_Bool bUpdateAll );
::sal_Bool switchBuffer( bool bWindowVisible, ::sal_Bool bUpdateAll );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;
::com::sun::star::uno::Any getSurfaceHandle() const;
void dumpScreenContent() const;