INTEGRATION: CWS warnings01 (1.2.14); FILE MERGED

2006/05/29 07:55:07 sb 1.2.14.1: #i53898# Made code warning-free and/or compile at all after resync to SRC680m170.

framework/source/uielement/buttontoolbarcontroller.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: buttontoolbarcontroller.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2006-05-08 15:18:40 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 11:35:58 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -102,9 +102,7 @@ namespace framework
 
 ButtonToolbarController::ButtonToolbarController(
     const uno::Reference< lang::XMultiServiceFactory >& rServiceManager,
-    const uno::Reference< frame::XFrame >&              rFrame,
     ToolBar*                                            pToolBar,
-    USHORT                                              nID,
     const rtl::OUString&                                aCommand ) :
     cppu::OWeakObject(),
     m_bInitialized( sal_False ),
@@ -207,14 +205,14 @@ void SAL_CALL ButtonToolbarController::dispose() throw (::com::sun::star::uno::R
 }
 
 void SAL_CALL ButtonToolbarController::addEventListener(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener )
+    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& )
 throw (::com::sun::star::uno::RuntimeException)
 {
     // do nothing
 }
 
 void SAL_CALL ButtonToolbarController::removeEventListener(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener )
+    const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& )
 throw (::com::sun::star::uno::RuntimeException)
 {
     // do nothing
@@ -246,7 +244,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
         m_xFrame.clear();
 }
 
-void SAL_CALL ButtonToolbarController::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event )
+void SAL_CALL ButtonToolbarController::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& )
 throw ( ::com::sun::star::uno::RuntimeException )
 {
     // do nothing
@@ -344,7 +342,7 @@ throw (::com::sun::star::uno::RuntimeException)
 }
 
 uno::Reference< awt::XWindow > SAL_CALL ButtonToolbarController::createItemWindow(
-    const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent )
+    const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& )
 throw (::com::sun::star::uno::RuntimeException)
 {
     if ( m_bDisposed )

framework/source/uielement/complextoolbarcontroller.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: complextoolbarcontroller.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2006-05-08 15:18:59 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 11:36:24 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -260,7 +260,7 @@ throw ( RuntimeException )
 
 // ------------------------------------------------------------------
 
-IMPL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
+IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
 {
    const sal_uInt32 nRef = Application::ReleaseSolarMutex();
    try
@@ -281,7 +281,7 @@ IMPL_STATIC_LINK( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExec
 
 // ------------------------------------------------------------------
 
-IMPL_STATIC_LINK( ComplexToolbarController, Notify_Impl, NotifyInfo*, pNotifyInfo )
+IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, Notify_Impl, NotifyInfo*, pNotifyInfo )
 {
    const sal_uInt32 nRef = Application::ReleaseSolarMutex();
    try
@@ -345,7 +345,7 @@ uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromComm
 
 // --------------------------------------------------------
 
-void ComplexToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand )
+void ComplexToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& )
 {
     // must be implemented by sub class!
 }