INTEGRATION: CWS warnings01 (1.3.30); FILE MERGED

2005/11/16 12:59:06 fs 1.3.30.1: #i57457# warning free code

2 files changed, 10 insertions, 42 deletions

diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index 4b92c0f476b0..d5adf4a8b6f2 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: HTerminateListener.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 06:04:48 $
+ *  last change: $Author: hr $ $Date: 2006-06-20 01:30:54 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -50,39 +50,19 @@ namespace connectivity
     using namespace ::com::sun::star::lang;
     using namespace ::rtl;
 
-// XServiceInfo
-OUString SAL_CALL OConnectionController::getImplementationName()
-throw ( RuntimeException )
-{
-    return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.OConnectionController" ));
-}
-
-sal_Bool SAL_CALL OConnectionController::supportsService( const OUString& ServiceName )
-throw ( RuntimeException )
-{
-    return sal_False;
-}
-
-Sequence< OUString > SAL_CALL OConnectionController::getSupportedServiceNames()
-throw ( RuntimeException )
-{
-    Sequence< OUString > aSeq( 0 );
-    return aSeq;
-}
-
 // XEventListener
-void SAL_CALL OConnectionController::disposing( const EventObject& Source )
+void SAL_CALL OConnectionController::disposing( const EventObject& /*Source*/ )
 throw( RuntimeException )
 {
 }
 
 // XTerminateListener
-void SAL_CALL OConnectionController::queryTermination( const EventObject& aEvent )
+void SAL_CALL OConnectionController::queryTermination( const EventObject& /*aEvent*/ )
 throw( TerminationVetoException, RuntimeException )
 {
 }
 
-void SAL_CALL OConnectionController::notifyTermination( const EventObject& aEvent )
+void SAL_CALL OConnectionController::notifyTermination( const EventObject& /*aEvent*/ )
 throw( RuntimeException )
 {
     m_pDriver->shutdownConnections();
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
index e2d97ebde652..af8c913e491b 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: HTerminateListener.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 06:05:02 $
+ *  last change: $Author: hr $ $Date: 2006-06-20 01:31:06 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -35,13 +35,10 @@
 #ifndef CONNECTIVITY_HSQLDB_TERMINATELISTENER_HXX
 #define CONNECTIVITY_HSQLDB_TERMINATELISTENER_HXX
 
-#ifndef _CPPUHELPER_COMPBASE2_HXX_
-#include <cppuhelper/compbase2.hxx>
+#ifndef _CPPUHELPER_COMPBASE1_HXX_
+#include <cppuhelper/compbase1.hxx>
 #endif
 #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XTERMINATELISTENER_HPP_
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #endif
 
@@ -53,8 +50,7 @@ namespace connectivity
     namespace hsqldb
     {
         class ODriverDelegator;
-        class OConnectionController : public ::cppu::WeakImplHelper2<
-                                                    ::com::sun::star::lang::XServiceInfo,
+        class OConnectionController : public ::cppu::WeakImplHelper1<
                                                     ::com::sun::star::frame::XTerminateListener >
         {
             ODriverDelegator* m_pDriver;
@@ -63,14 +59,6 @@ namespace connectivity
             public:
                 OConnectionController(ODriverDelegator* _pDriver) : m_pDriver(_pDriver){}
 
-                // XServiceInfo
-                virtual ::rtl::OUString SAL_CALL getImplementationName()
-                    throw ( ::com::sun::star::uno::RuntimeException );
-                virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
-                    throw ( ::com::sun::star::uno::RuntimeException );
-                virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
-                    throw ( ::com::sun::star::uno::RuntimeException );
-
                 // XEventListener
                 virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
                     throw( ::com::sun::star::uno::RuntimeException );