Skip to content

C
core
Kaydet (Commit) d07bf4aa authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

loplugin:constantfunction: canvas 

Change-Id: I2fb2c4ec0e9467d7ced05b0e815e0d5bd2ba74c3
üst 900e49cd
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 298 deletions
canvas/source/cairo/cairo_canvashelper.cxx
Dosyayı görüntüle @ d07bf4aa
......@@ -243,13 +243,6 @@ namespace cairocanvas
}
}
void CanvasHelper::drawPoint( const rendering::XCanvas* ,
const geometry::RealPoint2D& ,
const rendering::ViewState& ,
const rendering::RenderState& )
{
}
void CanvasHelper::drawLine( const rendering::XCanvas* /*pCanvas*/,
const geometry::RealPoint2D& aStartPoint,
const geometry::RealPoint2D& aEndPoint,
......@@ -1520,18 +1513,6 @@ namespace cairocanvas
}
void CanvasHelper::copyRect( const rendering::XCanvas* ,
const uno::Reference< rendering::XBitmapCanvas >& /*sourceCanvas*/,
const geometry::RealRectangle2D& /*sourceRect*/,
const rendering::ViewState& /*sourceViewState*/,
const rendering::RenderState& /*sourceRenderState*/,
const geometry::RealRectangle2D& /*destRect*/,
const rendering::ViewState& /*destViewState*/,
const rendering::RenderState& /*destRenderState*/ )
{
// TODO(F2): copyRect NYI
}
geometry::IntegerSize2D CanvasHelper::getSize()
{
if( !mpSurfaceProvider )
......@@ -1591,18 +1572,6 @@ namespace cairocanvas
return uno::Sequence< sal_Int8 >();
}
void CanvasHelper::setData( const uno::Sequence< sal_Int8 >& /*data*/,
const rendering::IntegerBitmapLayout& /*bitmapLayout*/,
const geometry::IntegerRectangle2D& /*rect*/ )
{
}
void CanvasHelper::setPixel( const uno::Sequence< sal_Int8 >& /*color*/,
const rendering::IntegerBitmapLayout& /*bitmapLayout*/,
const geometry::IntegerPoint2D& /*pos*/ )
{
}
uno::Sequence< sal_Int8 > CanvasHelper::getPixel( rendering::IntegerBitmapLayout& /*bitmapLayout*/,
const geometry::IntegerPoint2D& /*pos*/ )
{
......
canvas/source/cairo/cairo_canvashelper.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -87,10 +87,6 @@ namespace cairocanvas
// XCanvas (only providing, not implementing the
// interface. Also note subtle method parameter differences)
void clear();
void drawPoint( const ::com::sun::star::rendering::XCanvas* pCanvas,
const ::com::sun::star::geometry::RealPoint2D& aPoint,
const ::com::sun::star::rendering::ViewState& viewState,
const ::com::sun::star::rendering::RenderState& renderState );
void drawLine( const ::com::sun::star::rendering::XCanvas* pCanvas,
const ::com::sun::star::geometry::RealPoint2D& aStartPoint,
const ::com::sun::star::geometry::RealPoint2D& aEndPoint,
......@@ -213,16 +209,6 @@ namespace cairocanvas
// BitmapCanvasHelper functionality
// ================================
void copyRect( const ::com::sun::star::rendering::XCanvas* pCanvas,
const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XBitmapCanvas >& sourceCanvas,
const ::com::sun::star::geometry::RealRectangle2D& sourceRect,
const ::com::sun::star::rendering::ViewState& sourceViewState,
const ::com::sun::star::rendering::RenderState& sourceRenderState,
const ::com::sun::star::geometry::RealRectangle2D& destRect,
const ::com::sun::star::rendering::ViewState& destViewState,
const ::com::sun::star::rendering::RenderState& destRenderState );
::com::sun::star::geometry::IntegerSize2D getSize();
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap >
......@@ -233,25 +219,12 @@ namespace cairocanvas
getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerRectangle2D& rect );
void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& data,
const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerRectangle2D& rect );
void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& color,
const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos );
::com::sun::star::uno::Sequence< sal_Int8 >
getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos );
::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
/** Called from XCanvas base classes, to notify that content
is _about_ to change
*/
void modifying() {}
bool hasAlpha() const { return mbHaveAlpha; }
enum ColorType
......
canvas/source/cairo/cairo_devicehelper.cxx
Dosyayı görüntüle @ d07bf4aa
......@@ -205,18 +205,6 @@ namespace cairocanvas
return uno::Reference< rendering::XVolatileBitmap >();
}
bool DeviceHelper::hasFullScreenMode()
{
// TODO(F3): offer fullscreen mode the XCanvas way
return false;
}
bool DeviceHelper::enterFullScreenMode( bool /*bEnter*/ )
{
// TODO(F3): offer fullscreen mode the XCanvas way
return false;
}
uno::Any DeviceHelper::isAccelerated() const
{
return ::com::sun::star::uno::makeAny(false);
......
canvas/source/cairo/cairo_devicehelper.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -77,8 +77,6 @@ namespace cairocanvas
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap(
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice,
const ::com::sun::star::geometry::IntegerSize2D& size );
bool hasFullScreenMode( );
bool enterFullScreenMode( bool bEnter );
::com::sun::star::uno::Any isAccelerated() const;
::com::sun::star::uno::Any getDeviceHandle() const;
......
canvas/source/cairo/cairo_spritedevicehelper.cxx
Dosyayı görüntüle @ d07bf4aa
......@@ -72,19 +72,6 @@ namespace cairocanvas
mpSpriteCanvas = NULL;
}
::sal_Int32 SpriteDeviceHelper::createBuffers( ::sal_Int32 /*nBuffers*/ )
{
// TODO(F3): implement XBufferStrategy interface. For now, we
// _always_ will have exactly one backbuffer
return 1;
}
void SpriteDeviceHelper::destroyBuffers()
{
// TODO(F3): implement XBufferStrategy interface. For now, we
// _always_ will have exactly one backbuffer
}
bool SpriteDeviceHelper::showBuffer( bool, bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
......
canvas/source/cairo/cairo_spritedevicehelper.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -52,8 +52,6 @@ namespace cairocanvas
void disposing();
// XWindowGraphicDevice
::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
void destroyBuffers( );
bool showBuffer( bool, bool );
bool switchBuffer( bool, bool bUpdateAll );
......
canvas/source/opengl/ogl_bitmapcanvashelper.cxx
Dosyayı görüntüle @ d07bf4aa
......@@ -34,19 +34,6 @@ namespace oglcanvas
CanvasHelper::init(rDevice,rDeviceHelper);
}
void BitmapCanvasHelper::copyRect( const rendering::XCanvas* /*pCanvas*/,
const uno::Reference< rendering::XBitmapCanvas >& /*sourceCanvas*/,
const geometry::RealRectangle2D& /*sourceRect*/,
const rendering::ViewState& /*sourceViewState*/,
const rendering::RenderState& /*sourceRenderState*/,
const geometry::RealRectangle2D& /*destRect*/,
const rendering::ViewState& /*destViewState*/,
const rendering::RenderState& /*destRenderState*/ )
{
// TODO(F2): copyRect NYI
}
uno::Reference< rendering::XBitmap > BitmapCanvasHelper::getScaledBitmap( const geometry::RealSize2D& /*newSize*/,
bool /*beFast*/ )
{
......@@ -61,20 +48,6 @@ namespace oglcanvas
return uno::Sequence< sal_Int8 >();
}
void BitmapCanvasHelper::setData( const uno::Sequence< sal_Int8 >& /*data*/,
const rendering::IntegerBitmapLayout& /*bitmapLayout*/,
const geometry::IntegerRectangle2D& /*rect*/ )
{
// TODO(F2): NYI - and improbable to ever be
}
void BitmapCanvasHelper::setPixel( const uno::Sequence< sal_Int8 >& /*color*/,
const rendering::IntegerBitmapLayout& /*bitmapLayout*/,
const geometry::IntegerPoint2D& /*pos*/ )
{
// TODO(F2): NYI - and improbable to ever be
}
uno::Sequence< sal_Int8 > BitmapCanvasHelper::getPixel( rendering::IntegerBitmapLayout& /*bitmapLayout*/,
const geometry::IntegerPoint2D& /*pos*/ )
{
......@@ -87,11 +60,6 @@ namespace oglcanvas
return ::canvas::tools::getStdMemoryLayout(getSize());
}
bool BitmapCanvasHelper::hasAlpha() const
{
return true;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
canvas/source/opengl/ogl_bitmapcanvashelper.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -55,16 +55,6 @@ namespace oglcanvas
// BitmapCanvasHelper functionality
// ================================
void copyRect( const ::com::sun::star::rendering::XCanvas* rCanvas,
const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XBitmapCanvas >& sourceCanvas,
const ::com::sun::star::geometry::RealRectangle2D& sourceRect,
const ::com::sun::star::rendering::ViewState& sourceViewState,
const ::com::sun::star::rendering::RenderState& sourceRenderState,
const ::com::sun::star::geometry::RealRectangle2D& destRect,
const ::com::sun::star::rendering::ViewState& destViewState,
const ::com::sun::star::rendering::RenderState& destRenderState );
::com::sun::star::geometry::IntegerSize2D getSize() { return maSize; }
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > queryBitmapCanvas();
......@@ -77,22 +67,12 @@ namespace oglcanvas
getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerRectangle2D& rect );
void setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& data,
const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerRectangle2D& rect );
void setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& color,
const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos );
::com::sun::star::uno::Sequence< sal_Int8 >
getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos );
::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
bool hasAlpha() const;
private:
::com::sun::star::geometry::IntegerSize2D maSize;
};
......
canvas/source/opengl/ogl_canvashelper.cxx
Dosyayı görüntüle @ d07bf4aa
......@@ -972,10 +972,6 @@ namespace oglcanvas
mpDevice->getDeviceColorSpace()->convertToARGB(renderState.DeviceColor)[0];
}
void CanvasHelper::flush() const
{
}
bool CanvasHelper::renderRecordedActions() const
{
std::vector<Action>::const_iterator aCurr(mpRecordedActions->begin());
......
canvas/source/opengl/ogl_canvashelper.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -181,14 +181,6 @@ namespace oglcanvas
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >
getDevice() { return css::uno::Reference< css::rendering::XGraphicDevice >(mpDevice); }
// Flush drawing queue to screen
void flush() const;
/** Called from XCanvas base classes, to notify that content
is _about_ to change
*/
void modifying() {}
/** Write out recorded actions
*/
bool renderRecordedActions() const;
......
canvas/source/opengl/ogl_spritedevicehelper.cxx
Dosyayı görüntüle @ d07bf4aa
......@@ -251,31 +251,6 @@ namespace oglcanvas
return uno::Reference< rendering::XVolatileBitmap >();
}
bool SpriteDeviceHelper::hasFullScreenMode()
{
// TODO(F3): offer fullscreen mode the XCanvas way
return false;
}
bool SpriteDeviceHelper::enterFullScreenMode( bool /*bEnter*/ )
{
// TODO(F3): offer fullscreen mode the XCanvas way
return false;
}
::sal_Int32 SpriteDeviceHelper::createBuffers( ::sal_Int32 /*nBuffers*/ )
{
// TODO(F3): implement XBufferStrategy interface. For now, we
// _always_ will have exactly one backbuffer
return 1;
}
void SpriteDeviceHelper::destroyBuffers()
{
// TODO(F3): implement XBufferStrategy interface. For now, we
// _always_ will have exactly one backbuffer
}
namespace
{
/** Functor providing a StrictWeakOrdering for XSprites (over
......
canvas/source/opengl/ogl_spritedevicehelper.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -72,11 +72,6 @@ namespace oglcanvas
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice,
const ::com::sun::star::geometry::IntegerSize2D& size );
bool hasFullScreenMode( );
bool enterFullScreenMode( bool bEnter );
::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
void destroyBuffers( );
bool showBuffer( bool bIsVisible, bool bUpdateAll );
bool switchBuffer( bool bIsVisible, bool bUpdateAll );
......
canvas/source/tools/propertysethelper.cxx
Dosyayı görüntüle @ d07bf4aa
......@@ -143,12 +143,6 @@ namespace canvas
throwUnknown( aPropertyName );
}
void PropertySetHelper::removePropertyChangeListener( const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
{
// ignore request, no listener added in the first place
}
void PropertySetHelper::addVetoableChangeListener( const OUString& aPropertyName,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
{
......@@ -158,11 +152,6 @@ namespace canvas
throwUnknown( aPropertyName );
}
void PropertySetHelper::removeVetoableChangeListener( const OUString& /*aPropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
{
// ignore request, no listener added in the first place
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
canvas/source/vcl/canvashelper.cxx
Dosyayı görüntüle @ d07bf4aa
......@@ -899,18 +899,6 @@ namespace vclcanvas
true );
}
void CanvasHelper::copyRect( const rendering::XCanvas* ,
const uno::Reference< rendering::XBitmapCanvas >& ,
const geometry::RealRectangle2D& ,
const rendering::ViewState& ,
const rendering::RenderState& ,
const geometry::RealRectangle2D& ,
const rendering::ViewState& ,
const rendering::RenderState& )
{
// TODO(F1)
}
geometry::IntegerSize2D CanvasHelper::getSize()
{
if( !mpOutDev.get() )
......
canvas/source/vcl/canvashelper.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -231,16 +231,6 @@ namespace vclcanvas
// BitmapCanvasHelper functionality
// ================================
void copyRect( const ::com::sun::star::rendering::XCanvas* rCanvas,
const ::com::sun::star::uno::Reference<
::com::sun::star::rendering::XBitmapCanvas >& sourceCanvas,
const ::com::sun::star::geometry::RealRectangle2D& sourceRect,
const ::com::sun::star::rendering::ViewState& sourceViewState,
const ::com::sun::star::rendering::RenderState& sourceRenderState,
const ::com::sun::star::geometry::RealRectangle2D& destRect,
const ::com::sun::star::rendering::ViewState& destViewState,
const ::com::sun::star::rendering::RenderState& destRenderState );
::com::sun::star::geometry::IntegerSize2D getSize();
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > queryBitmapCanvas();
......@@ -293,11 +283,6 @@ namespace vclcanvas
const ::com::sun::star::rendering::RenderState& renderState,
ColorType eColorType ) const;
/** Called from XCanvas base classes, to notify that content
is _about_ to change
*/
void modifying() {}
bool hasAlpha() const { return mbHaveAlpha; }
protected:
......
canvas/source/vcl/devicehelper.cxx
Dosyayı görüntüle @ d07bf4aa
......@@ -149,11 +149,6 @@ namespace vclcanvas
return uno::Reference< rendering::XVolatileBitmap >();
}
bool DeviceHelper::hasFullScreenMode()
{
return false;
}
bool DeviceHelper::enterFullScreenMode( bool bEnter )
{
(void)bEnter;
......
canvas/source/vcl/devicehelper.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -68,7 +68,6 @@ namespace vclcanvas
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XVolatileBitmap > createVolatileAlphaBitmap(
const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XGraphicDevice >& rDevice,
const ::com::sun::star::geometry::IntegerSize2D& size );
bool hasFullScreenMode( );
bool enterFullScreenMode( bool bEnter );
::com::sun::star::uno::Any isAccelerated() const;
......
canvas/source/vcl/spritedevicehelper.cxx
Dosyayı görüntüle @ d07bf4aa
......@@ -68,12 +68,6 @@ namespace vclcanvas
return 1;
}
void SpriteDeviceHelper::destroyBuffers()
{
// TODO(F3): implement XBufferStrategy interface. For now, we
// _always_ will have exactly one backbuffer
}
bool SpriteDeviceHelper::showBuffer( bool, bool )
{
OSL_FAIL("Not supposed to be called, handled by SpriteCanvas");
......
canvas/source/vcl/spritedevicehelper.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -49,7 +49,6 @@ namespace vclcanvas
void disposing();
::sal_Int32 createBuffers( ::sal_Int32 nBuffers );
void destroyBuffers( );
bool showBuffer( bool bWindowVisible, bool bUpdateAll );
bool switchBuffer( bool bWindowVisible, bool bUpdateAll );
......
include/canvas/base/bitmapcanvasbase.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -77,9 +77,7 @@ namespace canvas
virtual sal_Bool SAL_CALL hasAlpha( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );
return BaseType::maCanvasHelper.hasAlpha();
return sal_True;
}
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize,
......@@ -120,16 +118,6 @@ namespace canvas
typename BaseType::BaseType::MutexType aGuard( BaseType::m_aMutex );
BaseType::BaseType::mbSurfaceDirty = true;
BaseType::BaseType::maCanvasHelper.modifying();
BaseType::BaseType::maCanvasHelper.copyRect( this,
sourceCanvas,
sourceRect,
sourceViewState,
sourceRenderState,
destRect,
destViewState,
destRenderState );
}
};
}
......
include/canvas/base/bufferedgraphicdevicebase.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -105,16 +105,11 @@ namespace canvas
{
tools::verifyRange( nBuffers, (sal_Int32)1 );
MutexType aGuard( BaseType::m_aMutex );
return BaseType::maDeviceHelper.createBuffers( nBuffers );
return 1;
}
virtual void SAL_CALL destroyBuffers( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE
{
MutexType aGuard( BaseType::m_aMutex );
BaseType::maDeviceHelper.destroyBuffers();
}
virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll )
......
include/canvas/base/canvasbase.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -127,7 +127,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
maCanvasHelper.clear();
}
......@@ -146,9 +145,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
maCanvasHelper.drawPoint( this, aPoint, viewState, renderState );
}
virtual void SAL_CALL drawLine(const css::geometry::RealPoint2D& aStartPoint,
......@@ -166,7 +162,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
maCanvasHelper.drawLine( this, aStartPoint, aEndPoint, viewState, renderState );
}
......@@ -186,7 +181,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
maCanvasHelper.drawBezier( this, aBezierSegment, aEndPoint, viewState, renderState );
}
......@@ -206,7 +200,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
return maCanvasHelper.drawPolyPolygon( this, xPolyPolygon, viewState, renderState );
}
......@@ -227,7 +220,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
return maCanvasHelper.strokePolyPolygon( this, xPolyPolygon, viewState, renderState, strokeAttributes );
}
......@@ -247,7 +239,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
return maCanvasHelper.strokeTexturedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures, strokeAttributes );
}
......@@ -268,7 +259,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
return maCanvasHelper.strokeTextureMappedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes );
}
......@@ -287,7 +277,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
return maCanvasHelper.queryStrokeShapes( this, xPolyPolygon, viewState, renderState, strokeAttributes );
}
......@@ -307,7 +296,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
return maCanvasHelper.fillPolyPolygon( this, xPolyPolygon, viewState, renderState );
}
......@@ -328,7 +316,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
return maCanvasHelper.fillTexturedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures );
}
......@@ -347,7 +334,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
return maCanvasHelper.fillTextureMappedPolyPolygon( this, xPolyPolygon, viewState, renderState, textures, xMapping );
}
......@@ -407,7 +393,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
return maCanvasHelper.drawText( this, text, xFont, viewState, renderState, textDirection );
}
......@@ -428,7 +413,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
return maCanvasHelper.drawTextLayout( this, laidOutText, viewState, renderState );
}
......@@ -446,7 +430,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
return maCanvasHelper.drawBitmap( this, xBitmap, viewState, renderState );
}
......@@ -463,7 +446,6 @@ namespace canvas
MutexType aGuard( BaseType::m_aMutex );
mbSurfaceDirty = true;
maCanvasHelper.modifying();
return maCanvasHelper.drawBitmapModulated( this, xBitmap, viewState, renderState );
}
......
include/canvas/base/graphicdevicebase.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -246,16 +246,12 @@ namespace canvas
virtual sal_Bool SAL_CALL hasFullScreenMode( ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{
MutexType aGuard( BaseType::m_aMutex );
return maDeviceHelper.hasFullScreenMode();
return sal_False;
}
virtual sal_Bool SAL_CALL enterFullScreenMode( sal_Bool bEnter ) throw (css::uno::RuntimeException) SAL_OVERRIDE
virtual sal_Bool SAL_CALL enterFullScreenMode( sal_Bool ) throw (css::uno::RuntimeException) SAL_OVERRIDE
{
MutexType aGuard( BaseType::m_aMutex );
return maDeviceHelper.enterFullScreenMode( bEnter );
return false;
}
// XMultiServiceFactory
......@@ -329,14 +325,11 @@ namespace canvas
xListener );
}
virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName,
const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException,
virtual void SAL_CALL removePropertyChangeListener( const OUString& ,
const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw (css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
css::uno::RuntimeException) SAL_OVERRIDE
{
MutexType aGuard( BaseType::m_aMutex );
maPropHelper.removePropertyChangeListener( aPropertyName,
xListener );
}
virtual void SAL_CALL addVetoableChangeListener( const OUString& aPropertyName,
......@@ -349,14 +342,11 @@ namespace canvas
xListener );
}
virtual void SAL_CALL removeVetoableChangeListener( const OUString& aPropertyName,
const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener ) throw (css::beans::UnknownPropertyException,
virtual void SAL_CALL removeVetoableChangeListener( const OUString& ,
const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw (css::beans::UnknownPropertyException,
css::lang::WrappedTargetException,
css::uno::RuntimeException) SAL_OVERRIDE
{
MutexType aGuard( BaseType::m_aMutex );
maPropHelper.removeVetoableChangeListener( aPropertyName,
xListener );
}
protected:
......
include/canvas/base/integerbitmapbase.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -55,7 +55,7 @@ namespace canvas
rect );
}
virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< sal_Int8 >& data,
virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< sal_Int8 >&,
const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
......@@ -67,12 +67,9 @@ namespace canvas
typename Base::MutexType aGuard( Base::m_aMutex );
Base::mbSurfaceDirty = true;
Base::maCanvasHelper.modifying();
Base::maCanvasHelper.setData( data, bitmapLayout, rect );
}
virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >& color,
virtual void SAL_CALL setPixel( const ::com::sun::star::uno::Sequence< sal_Int8 >&,
const ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
......@@ -84,9 +81,6 @@ namespace canvas
typename Base::MutexType aGuard( Base::m_aMutex );
Base::mbSurfaceDirty = true;
Base::maCanvasHelper.modifying();
Base::maCanvasHelper.setPixel( color, bitmapLayout, pos );
}
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
......
include/canvas/propertysethelper.hxx
Dosyayı görüntüle @ d07bf4aa
......@@ -134,12 +134,8 @@ namespace canvas
::com::sun::star::uno::Any getPropertyValue( const OUString& PropertyName ) const;
void addPropertyChangeListener( const OUString& aPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener );
void removePropertyChangeListener( const OUString& aPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener );
void addVetoableChangeListener( const OUString& aPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener );
void removeVetoableChangeListener( const OUString& aPropertyName,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& xListener );
private:
std::unique_ptr<MapType> mpMap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment