INTEGRATION: CWS warnings01 (1.4.32); FILE MERGED

2005/11/16 15:20:41 pl 1.4.32.1: #i55991# removed warnings

2 files changed, 14 insertions, 15 deletions

diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 9c2e86a60fc9..bd565cf23867 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: headermenucontroller.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 01:53:49 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 11:37:59 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -236,7 +236,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra
 }
 
 // XEventListener
-void SAL_CALL HeaderMenuController::disposing( const EventObject& Source ) throw ( RuntimeException )
+void SAL_CALL HeaderMenuController::disposing( const EventObject& ) throw ( RuntimeException )
 {
     Reference< css::awt::XMenuListener > xHolder(( OWeakObject *)this, UNO_QUERY );
 
@@ -264,7 +264,7 @@ void SAL_CALL HeaderMenuController::statusChanged( const FeatureStateEvent& Even
 }
 
 // XMenuListener
-void SAL_CALL HeaderMenuController::highlight( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
+void SAL_CALL HeaderMenuController::highlight( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
 }
 
@@ -320,11 +320,11 @@ void SAL_CALL HeaderMenuController::select( const css::awt::MenuEvent& rEvent )
     }
 }
 
-void SAL_CALL HeaderMenuController::activate( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
+void SAL_CALL HeaderMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
 }
 
-void SAL_CALL HeaderMenuController::deactivate( const css::awt::MenuEvent& rEvent ) throw (RuntimeException)
+void SAL_CALL HeaderMenuController::deactivate( const css::awt::MenuEvent& ) throw (RuntimeException)
 {
 }
 
@@ -397,7 +397,6 @@ void SAL_CALL HeaderMenuController::initialize( const Sequence< Any >& aArgument
 
         if ( xFrame.is() && aCommandURL.getLength() )
         {
-            ResetableGuard aLock( m_aLock );
             m_xFrame        = xFrame;
             m_aCommandURL   = aCommandURL;
             m_bInitialized = sal_True;
diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx
index 73b202e9e8be..539f36c226b0 100644
--- a/framework/source/uielement/logoimagestatusbarcontroller.cxx
+++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: logoimagestatusbarcontroller.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 01:54:20 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 11:38:27 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -139,28 +139,28 @@ throw ( RuntimeException )
 }
 
 // XStatusListener
-void SAL_CALL LogoImageStatusbarController::statusChanged( const FeatureStateEvent& Event )
+void SAL_CALL LogoImageStatusbarController::statusChanged( const FeatureStateEvent& )
 throw ( RuntimeException )
 {
 }
 
 // XStatusbarController
 ::sal_Bool SAL_CALL LogoImageStatusbarController::mouseButtonDown(
-    const awt::MouseEvent& aMouseEvent )
+    const awt::MouseEvent& )
 throw (::com::sun::star::uno::RuntimeException)
 {
     return sal_False;
 }
 
 ::sal_Bool SAL_CALL LogoImageStatusbarController::mouseMove(
-    const awt::MouseEvent& aMouseEvent )
+    const awt::MouseEvent& )
 throw (::com::sun::star::uno::RuntimeException)
 {
     return sal_False;
 }
 
 ::sal_Bool SAL_CALL LogoImageStatusbarController::mouseButtonUp(
-    const awt::MouseEvent& aMouseEvent )
+    const awt::MouseEvent& )
 throw (::com::sun::star::uno::RuntimeException)
 {
     return sal_False;
@@ -179,8 +179,8 @@ throw (::com::sun::star::uno::RuntimeException)
 void SAL_CALL LogoImageStatusbarController::paint(
     const ::com::sun::star::uno::Reference< awt::XGraphics >& xGraphics,
     const awt::Rectangle& rOutputRectangle,
-    ::sal_Int32 nItemId,
-    ::sal_Int32 nStyle )
+    ::sal_Int32 /*nItemId*/,
+    ::sal_Int32 /*nStyle*/ )
 throw (::com::sun::star::uno::RuntimeException)
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );