INTEGRATION: CWS chart2mst3 (1.2.4); FILE MERGED

2007/05/14 20:03:54 bm 1.2.4.8: RESYNC: (1.4-1.5); FILE MERGED
2006/10/18 17:05:15 bm 1.2.4.7: RESYNC: (1.3-1.4); FILE MERGED
2006/02/20 14:45:46 iha 1.2.4.6: move SchItemPool from controller to view lib -> ChartItemPool
2005/11/23 16:51:29 iha 1.2.4.5: cleanup SchSfxItemIds.hxx + removed unused defines
2005/11/23 15:17:27 iha 1.2.4.4: support BarOverlap and GapWidth
2005/10/07 11:22:15 bm 1.2.4.3: RESYNC: (1.2-1.3); FILE MERGED
2004/06/01 18:53:38 iha 1.2.4.2: no warnings+cleanup
2004/04/27 15:00:39 iha 1.2.4.1: warnings removed

1 files changed, 11 insertions, 23 deletions

diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 8dfea448339f..723d6fae6a9e 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: tp_SeriesToAxis.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2007-04-26 09:37:40 $
+ *  last change: $Author: vg $ $Date: 2007-05-22 17:49:18 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -39,7 +39,8 @@
 
 #include "ResId.hxx"
 #include "TabPages.hrc"
-#include "SchSfxItemIds.hxx"
+#include "chartview/ChartSfxItemIds.hxx"
+#include "NoWarningThisInCTOR.hxx"
 
 // header for class SfxBoolItem
 #ifndef _SFXENUMITEM_HXX
@@ -50,19 +51,6 @@
 #include <svtools/intitem.hxx>
 #endif
 
-
-/*
-#include "schattr.hxx"
-#include "schresid.hxx"
-#include "chtmodel.hxx"
-#include "attrib.hxx"
-#include "attrib.hrc"
-
-#ifndef _SVX_SVXIDS_HRC //autogen
-#include <svx/svxids.hrc>
-#endif
-*/
-
 //.............................................................................
 namespace chart
 {
@@ -118,13 +106,13 @@ BOOL SchOptionTabPage::FillItemSet(SfxItemSet& rOutAttrs)
         rOutAttrs.Put(SfxInt32Item(SCHATTR_AXIS,CHART_AXIS_PRIMARY_Y));
 
     if(aMTGap.IsVisible())
-        rOutAttrs.Put(SfxInt32Item(CHATTR_DIAGRAM_GAPWIDTH,aMTGap.GetValue()));
+        rOutAttrs.Put(SfxInt32Item(SCHATTR_BAR_GAPWIDTH,aMTGap.GetValue()));
 
     if(aMTOverlap.IsVisible())
-        rOutAttrs.Put(SfxInt32Item(CHATTR_DIAGRAM_OVERLAP,aMTOverlap.GetValue()));
+        rOutAttrs.Put(SfxInt32Item(SCHATTR_BAR_OVERLAP,aMTOverlap.GetValue()));
 
     if(aCBConnect.IsVisible())
-        rOutAttrs.Put(SfxBoolItem(CHATTR_BARCONNECT,aCBConnect.IsChecked()));
+        rOutAttrs.Put(SfxBoolItem(SCHATTR_BAR_CONNECT,aCBConnect.IsChecked()));
 
     return TRUE;
 }
@@ -151,7 +139,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
     }
 
     long nTmp;
-    if (rInAttrs.GetItemState(CHATTR_DIAGRAM_GAPWIDTH, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_BAR_GAPWIDTH, TRUE, &pPoolItem) == SFX_ITEM_SET)
     {
         nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
         aMTGap.SetValue(nTmp);
@@ -162,7 +150,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
         aFTGap.Show(FALSE);
     }
 
-    if (rInAttrs.GetItemState(CHATTR_DIAGRAM_OVERLAP, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_BAR_OVERLAP, TRUE, &pPoolItem) == SFX_ITEM_SET)
     {
         nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
         aMTOverlap.SetValue(nTmp);
@@ -172,10 +160,10 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
         aMTOverlap.Show(FALSE);
         aFTOverlap.Show(FALSE);
     }
-    if (rInAttrs.GetItemState(CHATTR_BARCONNECT, TRUE, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, TRUE, &pPoolItem) == SFX_ITEM_SET)
     {
         nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
-        aCBConnect.Check(nTmp);
+        aCBConnect.Check(BOOL(nTmp));
     }
     else
     {