summaryrefslogtreecommitdiff
path: root/canvas/source/null/null_spritecanvas.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'canvas/source/null/null_spritecanvas.hxx')
-rw-r--r--canvas/source/null/null_spritecanvas.hxx13
1 files changed, 6 insertions, 7 deletions
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: */