diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:08:09 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:08:09 +0000 |
commit | 27bc1d216ab4a5096bcde75f099b16cb27afd300 (patch) | |
tree | 9acf685c1a1b4174953fb5037f719292a900e334 /UnoControls | |
parent | 8bd58eb2cd771464697bbc824cacd80aa33803fb (diff) |
INTEGRATION: CWS warnings01 (1.5.4); FILE MERGED
2005/10/25 09:12:18 pl 1.5.4.1: #i55991# removed warnings for solaris platform
Diffstat (limited to 'UnoControls')
-rw-r--r-- | UnoControls/inc/basecontrol.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index eec7a7d8b..53f3adc44 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -4,9 +4,9 @@ * * $RCSfile: basecontrol.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-09 09:14:59 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:08:09 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -379,7 +379,6 @@ class BaseControl : public UNO3_XSERVICEINFO , public IMPL_MutexContainer , public UNO3_OCOMPONENTHELPER { - //____________________________________________________________________________________________________________ // public methods //____________________________________________________________________________________________________________ @@ -1235,6 +1234,7 @@ public: //____________________________________________________________________________________________________________ protected: + using OComponentHelper::disposing; /**_______________________________________________________________________________________________________ @short - |