INTEGRATION: CWS warnings01 (1.3.68); FILE MERGED

2006/03/14 15:20:32 fs 1.3.68.1: #i57457# warning-free code

5 files changed, 24 insertions, 21 deletions

diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx
index 52e153afb..90736d00c 100644
--- a/forms/source/richtext/attributedispatcher.cxx
+++ b/forms/source/richtext/attributedispatcher.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: attributedispatcher.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 23:04:04 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 12:58:56 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -62,8 +62,8 @@ namespace frm
     OAttributeDispatcher::OAttributeDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL,
             IMultiAttributeDispatcher* _pMasterDispatcher )
         :ORichTextFeatureDispatcher( _rView, _rURL )
-        ,m_nAttributeId( _nAttributeId )
         ,m_pMasterDispatcher( _pMasterDispatcher )
+        ,m_nAttributeId( _nAttributeId )
     {
         OSL_ENSURE( m_pMasterDispatcher, "OAttributeDispatcher::OAttributeDispatcher: invalid master dispatcher!" );
     }
@@ -110,10 +110,13 @@ namespace frm
     void SAL_CALL OAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
-        OSL_ENSURE( _rURL.Complete == getFeatureURL().Complete, "OAttributeDispatcher::dispatch: invalid URL!" );
 
         checkDisposed();
 
+        (void)_rURL;
+        (void)_rArguments;
+
+        OSL_ENSURE( _rURL.Complete == getFeatureURL().Complete, "OAttributeDispatcher::dispatch: invalid URL!" );
 #if OSL_DEBUG_LEVEL > 0
         if ( _rArguments.getLength() )
         {
@@ -130,9 +133,10 @@ namespace frm
     }
     
     //--------------------------------------------------------------------
-    void OAttributeDispatcher::onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& _rState )
+    void OAttributeDispatcher::onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& /*_rState*/ )
     {
         OSL_ENSURE( _nAttributeId == m_nAttributeId, "OAttributeDispatcher::onAttributeStateChanged: wrong attribute!" );
+        (void)_nAttributeId;
 
         FeatureStateEvent aEvent( buildStatusEvent() );
         ::cppu::OInterfaceIteratorHelper aIter( getStatusListeners() );
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index 5c27535b7..2aef22335 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: clipboarddispatcher.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 23:04:36 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 12:59:07 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -140,7 +140,7 @@ namespace frm
     }
 
     //--------------------------------------------------------------------
-    void SAL_CALL OClipboardDispatcher::dispatch( const URL& URL, const Sequence< PropertyValue >& Arguments ) throw (RuntimeException)
+    void SAL_CALL OClipboardDispatcher::dispatch( const URL& /*_rURL*/, const Sequence< PropertyValue >& /*Arguments*/ ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         if ( !getEditView() )
diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx
index 3cff4c8f8..dcefab74e 100644
--- a/forms/source/richtext/featuredispatcher.cxx
+++ b/forms/source/richtext/featuredispatcher.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: featuredispatcher.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 23:05:14 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 12:59:19 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -55,8 +55,8 @@ namespace frm
     //====================================================================
     //--------------------------------------------------------------------
     ORichTextFeatureDispatcher::ORichTextFeatureDispatcher( EditView& _rView, const URL&  _rURL )
-        :m_aStatusListeners( m_aMutex )
-        ,m_aFeatureURL( _rURL )
+        :m_aFeatureURL( _rURL )
+        ,m_aStatusListeners( m_aMutex )
         ,m_pEditView( &_rView )
         ,m_bDisposed( false )
     {
@@ -84,7 +84,7 @@ namespace frm
     }
 
     //--------------------------------------------------------------------
-    void ORichTextFeatureDispatcher::disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify )
+    void ORichTextFeatureDispatcher::disposing( ::osl::ClearableMutexGuard& /*_rClearBeforeNotify*/ )
     {
         m_pEditView = NULL;
     }
@@ -106,7 +106,7 @@ namespace frm
     }
     
     //--------------------------------------------------------------------
-    void SAL_CALL ORichTextFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException)
+    void SAL_CALL ORichTextFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& /*_rURL*/ ) throw (RuntimeException)
     {
         m_aStatusListeners.removeInterface( _rxControl );
     }
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx
index 76537d643..be09c9c5a 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: parametrizedattributedispatcher.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 23:06:06 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 12:59:45 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -141,7 +141,6 @@ namespace frm
         if ( aParameterSet.Count() )
         {
             OSL_ENSURE( aParameterSet.Count() == 1, "OParametrizedAttributeDispatcher::convertDispatchArgsToItem: Arguments which form more than 1 item? How this?" );
-            const SfxItemPool& rPool = *aParameterSet.GetPool();
             WhichId nAttributeWhich = aParameterSet.GetPool()->GetWhich( nSlotId );
             pArgument = aParameterSet.GetItem( nAttributeWhich );
             OSL_ENSURE( pArgument, "OParametrizedAttributeDispatcher::convertDispatchArgsToItem: suspicious: there were arguments, but they're not for my slot!" );
@@ -155,6 +154,7 @@ namespace frm
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         OSL_ENSURE( _rURL.Complete == getFeatureURL().Complete, "OParametrizedAttributeDispatcher::dispatch: invalid URL!" );
+        (void)_rURL;
         if ( m_pMasterDispatcher )
         {
             const SfxPoolItem* pConvertedArgument = convertDispatchArgsToItem( _rArguments );
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index e1846f652..9647db713 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: richtextcontrol.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-08 23:06:54 $
+ *  last change: $Author: hr $ $Date: 2006-06-19 13:00:11 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -148,7 +148,6 @@ namespace frm
                 a new ORichTextPeer instance, which has been aquired once!
         */
         static ORichTextPeer* Create(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >&         _rxModel,
             Window* _pParentWindow,
             WinBits _nStyle
@@ -158,7 +157,7 @@ namespace frm
         DECLARE_XINTERFACE( )
 
     protected:
-        ORichTextPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB );
+        ORichTextPeer();
         ~ORichTextPeer();
 
         // XVclWindowPeer