From 8af1e21265481c05370c36033ddd389f67df3cee Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Mon, 19 Jun 2006 22:08:09 +0000
Subject: [PATCH] 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
---
UnoControls/inc/basecontrol.hxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index f23078655633..b1388f1ca58c 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 -