summaryrefslogtreecommitdiff
path: root/canvas/inc/canvas/base/spritecanvasbase.hxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-12-13 13:36:31 +0000
committerKurt Zenker <kz@openoffice.org>2006-12-13 13:36:31 +0000
commit6743f6549e9c5eb51bbb8a17a6fde09319775ff4 (patch)
tree9bc9b2a64b6a8c6f4d7958c865c7026ce77b5314 /canvas/inc/canvas/base/spritecanvasbase.hxx
parentc8b87846f422cb841527c68336d59c450294f48b (diff)
INTEGRATION: CWS presfixes09 (1.2.32); FILE MERGED
2006/10/20 11:39:38 thb 1.2.32.1: #i10000# Removed post-merge compiler warnings
Diffstat (limited to 'canvas/inc/canvas/base/spritecanvasbase.hxx')
-rw-r--r--canvas/inc/canvas/base/spritecanvasbase.hxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/canvas/inc/canvas/base/spritecanvasbase.hxx b/canvas/inc/canvas/base/spritecanvasbase.hxx
index cec2bd1faadc..896485ff9e43 100644
--- a/canvas/inc/canvas/base/spritecanvasbase.hxx
+++ b/canvas/inc/canvas/base/spritecanvasbase.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: spritecanvasbase.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: kz $ $Date: 2005-11-02 12:44:07 $
+ * last change: $Author: kz $ $Date: 2006-12-13 14:36:31 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -105,6 +105,9 @@ namespace canvas
{
}
+#if defined __SUNPRO_CC
+ using Base::disposing;
+#endif
virtual void SAL_CALL disposing()
{
typename BaseType::MutexType aGuard( BaseType::m_aMutex );