diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-13 13:36:17 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-13 13:36:17 +0000 |
| commit | c8b87846f422cb841527c68336d59c450294f48b (patch) | |
| tree | 13f823a81e1ccba145f1d858b70cfac643b384ca | |
| parent | 8bdb63d6af9d98e8a0bd70d872446e678b343667 (diff) | |
INTEGRATION: CWS presfixes09 (1.3.26); FILE MERGED
2006/10/20 11:39:37 thb 1.3.26.3: #i10000# Removed post-merge compiler warnings
2006/09/15 15:38:23 thb 1.3.26.2: RESYNC: (1.3-1.4); FILE MERGED
2006/03/06 22:48:59 thb 1.3.26.1: #i49357# Reworked canvas/window association (canvas is now window-listener, and exposes the associated window via a property)
| -rw-r--r-- | canvas/inc/canvas/base/graphicdevicebase.hxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/canvas/inc/canvas/base/graphicdevicebase.hxx b/canvas/inc/canvas/base/graphicdevicebase.hxx index d162eb50ab85..99995557bd08 100644 --- a/canvas/inc/canvas/base/graphicdevicebase.hxx +++ b/canvas/inc/canvas/base/graphicdevicebase.hxx @@ -4,9 +4,9 @@ * * $RCSfile: graphicdevicebase.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2006-06-20 02:14:00 $ + * last change: $Author: kz $ $Date: 2006-12-13 14:36:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -171,6 +171,9 @@ namespace canvas _1))); } +#if defined __SUNPRO_CC + using Base::disposing; +#endif virtual void SAL_CALL disposing() { MutexType aGuard( BaseType::m_aMutex ); @@ -178,7 +181,7 @@ namespace canvas maDeviceHelper.disposing(); // pass on to base class - BaseType::disposing(); + cppu::WeakComponentImplHelperBase::disposing(); } // XGraphicDevice |