diff options
Diffstat (limited to 'canvas/source/null')
20 files changed, 75 insertions, 19 deletions
diff --git a/canvas/source/null/null_canvasbitmap.cxx b/canvas/source/null/null_canvasbitmap.cxx index 9bd2058a6d74..92ee7b8094f5 100644 --- a/canvas/source/null/null_canvasbitmap.cxx +++ b/canvas/source/null/null_canvasbitmap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,12 +53,12 @@ namespace nullcanvas bHasAlpha ); } - void SAL_CALL CanvasBitmap::disposing() + void CanvasBitmap::disposeThis() { mpDevice.clear(); // forward to parent - CanvasBitmap_Base::disposing(); + CanvasBitmap_Base::disposeThis(); } #define IMPLEMENTATION_NAME "NullCanvas.CanvasBitmap" @@ -82,3 +83,5 @@ namespace nullcanvas } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_canvasbitmap.hxx b/canvas/source/null/null_canvasbitmap.hxx index 3fa0c15cd314..fa0577c8c02a 100644 --- a/canvas/source/null/null_canvasbitmap.hxx +++ b/canvas/source/null/null_canvasbitmap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,6 +40,7 @@ #include <boost/shared_ptr.hpp> #include <canvas/base/integerbitmapbase.hxx> +#include <canvas/base/disambiguationhelper.hxx> #include "null_canvashelper.hxx" #include "null_spritecanvas.hxx" @@ -52,7 +54,7 @@ namespace nullcanvas typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::rendering::XBitmapCanvas, ::com::sun::star::rendering::XIntegerBitmap, ::com::sun::star::lang::XServiceInfo > CanvasBitmapBase_Base; - typedef ::canvas::IntegerBitmapBase< ::canvas::BaseMutexHelper< CanvasBitmapBase_Base >, + typedef ::canvas::IntegerBitmapBase< ::canvas::DisambiguationHelper< CanvasBitmapBase_Base >, CanvasHelper, ::osl::MutexGuard, ::cppu::OWeakObject > CanvasBitmap_Base; @@ -74,7 +76,7 @@ namespace nullcanvas bool bHasAlpha ); /// Dispose all internal references - virtual void SAL_CALL disposing(); + virtual void disposeThis(); // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); @@ -90,3 +92,5 @@ namespace nullcanvas } #endif /* _NULLCANVAS_CANVASBITMAP_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_canvascustomsprite.cxx b/canvas/source/null/null_canvascustomsprite.cxx index 9c45c50954f9..36dbc9a69871 100644 --- a/canvas/source/null/null_canvascustomsprite.cxx +++ b/canvas/source/null/null_canvascustomsprite.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,14 +66,14 @@ namespace nullcanvas rRefDevice ); } - void SAL_CALL CanvasCustomSprite::disposing() + void CanvasCustomSprite::disposeThis() { ::osl::MutexGuard aGuard( m_aMutex ); mpSpriteCanvas.clear(); // forward to parent - CanvasCustomSpriteBaseT::disposing(); + CanvasCustomSpriteBaseT::disposeThis(); } void CanvasCustomSprite::redraw() const @@ -103,3 +104,5 @@ namespace nullcanvas return aRet; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_canvascustomsprite.hxx b/canvas/source/null/null_canvascustomsprite.hxx index 554fb3033b05..17aa1f92d9a7 100644 --- a/canvas/source/null/null_canvascustomsprite.hxx +++ b/canvas/source/null/null_canvascustomsprite.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,7 +42,7 @@ #include <basegfx/vector/b2isize.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <canvas/base/basemutexhelper.hxx> +#include <canvas/base/disambiguationhelper.hxx> #include <canvas/base/canvascustomspritebase.hxx> #include "sprite.hxx" @@ -74,8 +75,8 @@ namespace nullcanvas remain a base class that provides implementation, not to enforce any specific interface on its derivees. */ - class CanvasCustomSpriteSpriteBase_Base : public ::canvas::BaseMutexHelper< CanvasCustomSpriteBase_Base >, - public Sprite + class CanvasCustomSpriteSpriteBase_Base : public ::canvas::DisambiguationHelper< CanvasCustomSpriteBase_Base >, + public Sprite { }; @@ -108,7 +109,7 @@ namespace nullcanvas CanvasCustomSprite( const ::com::sun::star::geometry::RealSize2D& rSpriteSize, const SpriteCanvasRef& rRefDevice ); - virtual void SAL_CALL disposing(); + virtual void disposeThis(); // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base @@ -134,3 +135,5 @@ namespace nullcanvas } #endif /* _NULLCANVAS_CANVASCUSTOMSPRITE_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_canvasfont.cxx b/canvas/source/null/null_canvasfont.cxx index a8c6f027e40d..78691beed295 100644 --- a/canvas/source/null/null_canvasfont.cxx +++ b/canvas/source/null/null_canvasfont.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,5 @@ namespace nullcanvas return maFontMatrix; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_canvasfont.hxx b/canvas/source/null/null_canvasfont.hxx index 01dc5cac5720..8e3a0f3b44c1 100644 --- a/canvas/source/null/null_canvasfont.hxx +++ b/canvas/source/null/null_canvasfont.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ namespace nullcanvas } #endif /* _NULLCANVAS_CANVASFONT_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_canvashelper.cxx b/canvas/source/null/null_canvashelper.cxx index 21e2c74f6b95..f7f1958af4f0 100644 --- a/canvas/source/null/null_canvashelper.cxx +++ b/canvas/source/null/null_canvashelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -334,3 +335,5 @@ namespace nullcanvas } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_canvashelper.hxx b/canvas/source/null/null_canvashelper.hxx index 976eb529b56f..383e47c5ffcd 100644 --- a/canvas/source/null/null_canvashelper.hxx +++ b/canvas/source/null/null_canvashelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -271,3 +272,5 @@ namespace nullcanvas } #endif /* _NULLCANVAS_CANVASHELPER_HXX_ */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_devicehelper.cxx b/canvas/source/null/null_devicehelper.cxx index b04820b15716..7d5748d2a3cf 100644 --- a/canvas/source/null/null_devicehelper.cxx +++ b/canvas/source/null/null_devicehelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -237,3 +238,5 @@ namespace nullcanvas BOOST_CURRENT_FUNCTION ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_devicehelper.hxx b/canvas/source/null/null_devicehelper.hxx index 2e6298c2e2b6..bd6be098b340 100644 --- a/canvas/source/null/null_devicehelper.hxx +++ b/canvas/source/null/null_devicehelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ namespace nullcanvas } #endif /* _NULLCANVAS_WINDOWGRAPHICDEVICE_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_spritecanvas.cxx b/canvas/source/null/null_spritecanvas.cxx index ac41b3fe149a..509e3656f8fa 100644 --- a/canvas/source/null/null_spritecanvas.cxx +++ b/canvas/source/null/null_spritecanvas.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,14 +100,14 @@ namespace nullcanvas maArguments.realloc(0); } - void SAL_CALL SpriteCanvas::disposing() + void SpriteCanvas::disposeThis() { ::osl::MutexGuard aGuard( m_aMutex ); mxComponentContext.clear(); // forward to parent - SpriteCanvasBaseT::disposing(); + SpriteCanvasBaseT::disposeThis(); } ::sal_Bool SAL_CALL SpriteCanvas::showBuffer( ::sal_Bool bUpdateAll ) throw (uno::RuntimeException) @@ -164,3 +165,5 @@ namespace nullcanvas // The C shared lib entry points COMPHELPER_SERVICEDECL_EXPORTS1(nullcanvas::nullCanvasDecl) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_spritecanvas.hxx b/canvas/source/null/null_spritecanvas.hxx index 136e09a291db..165d73aa4db4 100644 --- a/canvas/source/null/null_spritecanvas.hxx +++ b/canvas/source/null/null_spritecanvas.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,7 +45,7 @@ #include <comphelper/uno3.hxx> #include <canvas/base/spritecanvasbase.hxx> -#include <canvas/base/basemutexhelper.hxx> +#include <canvas/base/disambiguationhelper.hxx> #include <canvas/base/bufferedgraphicdevicebase.hxx> #include "null_spritecanvashelper.hxx" @@ -62,7 +63,7 @@ namespace nullcanvas ::com::sun::star::awt::XWindowListener, ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceName > WindowGraphicDeviceBase_Base; - typedef ::canvas::BufferedGraphicDeviceBase< ::canvas::BaseMutexHelper< WindowGraphicDeviceBase_Base >, + typedef ::canvas::BufferedGraphicDeviceBase< ::canvas::DisambiguationHelper< WindowGraphicDeviceBase_Base >, DeviceHelper, ::osl::MutexGuard, ::cppu::OWeakObject > SpriteCanvasBase_Base; @@ -113,12 +114,8 @@ namespace nullcanvas void initialize(); -#if defined __SUNPRO_CC - using SpriteCanvasBaseT::disposing; -#endif - /// Dispose all internal references - virtual void SAL_CALL disposing(); + virtual void disposeThis(); // Forwarding the XComponent implementation to the // cppu::ImplHelper templated base @@ -147,3 +144,5 @@ namespace nullcanvas } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_spritecanvashelper.cxx b/canvas/source/null/null_spritecanvashelper.cxx index 60a81726b196..6f9f35d854eb 100644 --- a/canvas/source/null/null_spritecanvashelper.cxx +++ b/canvas/source/null/null_spritecanvashelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,3 +130,5 @@ namespace nullcanvas } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_spritecanvashelper.hxx b/canvas/source/null/null_spritecanvashelper.hxx index 4fd7f6764779..596bb17c3569 100644 --- a/canvas/source/null/null_spritecanvashelper.hxx +++ b/canvas/source/null/null_spritecanvashelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -134,3 +135,4 @@ namespace nullcanvas #endif /* _NULLCANVAS_SPRITECANVASHELPER_HXX_ */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_spritehelper.cxx b/canvas/source/null/null_spritehelper.cxx index 94a4fa6b6578..8e2c614d65ac 100644 --- a/canvas/source/null/null_spritehelper.cxx +++ b/canvas/source/null/null_spritehelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,5 @@ namespace nullcanvas return ::basegfx::unotools::b2DPolyPolygonFromXPolyPolygon2D( xPoly ); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_spritehelper.hxx b/canvas/source/null/null_spritehelper.hxx index 18585374ad9a..10762aea0204 100644 --- a/canvas/source/null/null_spritehelper.hxx +++ b/canvas/source/null/null_spritehelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ namespace nullcanvas } #endif /* _NULLCANVAS_SPRITEHELPER_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_textlayout.cxx b/canvas/source/null/null_textlayout.cxx index 991de3421958..6b51c01d90ed 100644 --- a/canvas/source/null/null_textlayout.cxx +++ b/canvas/source/null/null_textlayout.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -259,3 +260,5 @@ namespace nullcanvas return aRet; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_textlayout.hxx b/canvas/source/null/null_textlayout.hxx index 4e348b2f5fa8..7c3c47570223 100644 --- a/canvas/source/null/null_textlayout.hxx +++ b/canvas/source/null/null_textlayout.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ namespace nullcanvas } #endif /* _NULLCANVAS_TEXTLAYOUT_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/null_usagecounter.hxx b/canvas/source/null/null_usagecounter.hxx index 28e3c6b2c176..9225dd80237a 100644 --- a/canvas/source/null/null_usagecounter.hxx +++ b/canvas/source/null/null_usagecounter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ namespace nullcanvas } #endif /* _NULLCANVAS_USAGECOUNTER_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/null/sprite.hxx b/canvas/source/null/sprite.hxx index d34070848765..56a38be96914 100644 --- a/canvas/source/null/sprite.hxx +++ b/canvas/source/null/sprite.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,3 +46,5 @@ namespace nullcanvas } #endif /* INCLUDED_NULLCANVAS_SPRITE_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |