INTEGRATION: CWS chart07 (1.2.12); FILE MERGED

2007/07/10 11:57:29 bm 1.2.12.1: #i69281# warnings removed

2 files changed, 9 insertions, 9 deletions

diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 9161f8eed480..d2897059d6f2 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: tp_Wizard_TitlesAndObjects.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-05-22 17:50:14 $
+ *  last change: $Author: rt $ $Date: 2007-07-25 08:38:49 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -133,7 +133,7 @@ void TitlesAndObjectsTabPage::initializePage()
     m_bCommitToModel = true;
 }
 
-sal_Bool TitlesAndObjectsTabPage::commitPage( COMMIT_REASON eReason )
+sal_Bool TitlesAndObjectsTabPage::commitPage( COMMIT_REASON /*eReason*/ )
 {
     if( m_apTitleResources->IsModified() ) //titles may have changed in the meanwhile
         commitToModel();
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index d670d6f033e7..19a3560b769b 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: SeriesOptionsItemConverter.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: vg $ $Date: 2007-05-22 18:02:05 $
+ *  last change: $Author: rt $ $Date: 2007-07-25 08:41:51 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -148,7 +148,7 @@ const USHORT * SeriesOptionsItemConverter::GetWhichPairs() const
     return nSeriesOptionsWhichPairs;
 }
 
-bool SeriesOptionsItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const
+bool SeriesOptionsItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPropertyNameWithMemberId & /*rOutProperty*/ ) const
 {
     return false;
 }
@@ -161,7 +161,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxIte
     {
         case SCHATTR_AXIS:
         {
-            sal_Int32 nItemValue = reinterpret_cast< const SfxInt32Item & >(
+            sal_Int32 nItemValue = static_cast< const SfxInt32Item & >(
                     rItemSet.Get( nWhichId )).GetValue();
             bool bAttachToMainAxis = nItemValue == CHART_AXIS_PRIMARY_Y;
             if( bAttachToMainAxis != m_bAttachToMainAxis )
@@ -182,7 +182,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxIte
             if( m_bSupportingOverlapAndGapWidthProperties )
             {
                 sal_Int32& rBarPosition = ( SCHATTR_BAR_OVERLAP == nWhichId ) ? m_nBarOverlap : m_nGapWidth;
-                rBarPosition = reinterpret_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();
+                rBarPosition = static_cast< const SfxInt32Item & >( rItemSet.Get( nWhichId )).GetValue();
 
                 rtl::OUString aPropName( C2U( "GapwidthSequence" ) );
                 if( SCHATTR_BAR_OVERLAP == nWhichId )
@@ -214,7 +214,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( USHORT nWhichId, const SfxIte
         case SCHATTR_BAR_CONNECT:
         {
             sal_Bool bOldConnectBars = sal_False;
-            m_bConnectBars = reinterpret_cast< const SfxBoolItem & >(
+            m_bConnectBars = static_cast< const SfxBoolItem & >(
                 rItemSet.Get( nWhichId )).GetValue();
             if( m_bSupportingBarConnectors )
             {