diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 13:36:03 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 13:36:03 +0000 |
| commit | 8bdb63d6af9d98e8a0bd70d872446e678b343667 (patch) | |
| tree | db0b3c5f4d4c5416d2c2174d9a9139c53255548a | |
| parent | 38b7e280cf73a0d7b160dde8dca365b179347842 (diff) | |
INTEGRATION: CWS presfixes09 (1.2.32); FILE MERGED
2006/10/20 11:39:37 thb 1.2.32.1: #i10000# Removed post-merge compiler warnings
| -rw-r--r-- | canvas/inc/canvas/base/canvasbase.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/canvas/inc/canvas/base/canvasbase.hxx b/canvas/inc/canvas/base/canvasbase.hxx index 8fa13dea068a..2c8cd3c58fb3 100644 --- a/canvas/inc/canvas/base/canvasbase.hxx +++ b/canvas/inc/canvas/base/canvasbase.hxx @@ -4,9 +4,9 @@ * * $RCSfile: canvasbase.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2005-11-02 12:42:12 $ + * last change: $Author: kz $ $Date: 2006-12-13 14:36:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -139,6 +139,9 @@ namespace canvas { } +#if defined __SUNPRO_CC + using Base::disposing; +#endif virtual void SAL_CALL disposing() { MutexType aGuard( BaseType::m_aMutex ); |