drafts namespace of API removed

public API moved to offapi
Calc as DataEditor - first integration

18 files changed, 76 insertions, 165 deletions

diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 5a78bcf825fd..80b4a9f5ee3a 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlg_ChartType.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: bm $ $Date: 2003-11-20 18:12:22 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,7 +84,6 @@
 
 #include "chmod3d.hxx"
 #include "schattr.hxx"
-// TVM: CHTYPE wurde ins Model verschoben
 */
 
 #include "dlg_ChartType.hxx"
@@ -141,7 +140,6 @@
 //#define CHTYPE_ADDIN         11
 
 using namespace ::com::sun::star;
-using namespace ::drafts::com::sun::star;
 
 //.............................................................................
 namespace
diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
index 8bf57eaea466..f121d8078e8a 100644
--- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlg_InsertDataLabel.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:25 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,7 +96,7 @@ SchDataDescrDlg::SchDataDescrDlg(Window* pWindow, const SfxItemSet& rInAttrs) :
     aBtnOK(this, ResId(BTN_OK)),
     aBtnCancel(this, ResId(BTN_CANCEL)),
     aBtnHelp(this, ResId(BTN_HELP)),
-    rOutAttrs(rInAttrs)
+    m_rInAttrs(rInAttrs)
 {
     FreeResource();
 
@@ -149,7 +149,7 @@ void SchDataDescrDlg::Reset()
     aRbPercent.Enable( FALSE );
     aCbSymbol.Enable( FALSE );
 
-    SfxItemState aState = rOutAttrs.GetItemState(SCHATTR_DATADESCR_SHOW_SYM, TRUE, &pPoolItem);
+    SfxItemState aState = m_rInAttrs.GetItemState(SCHATTR_DATADESCR_SHOW_SYM, TRUE, &pPoolItem);
     if( aState == SFX_ITEM_SET )
         aCbSymbol.Check( ((const SfxBoolItem*)pPoolItem)->GetValue() );
     else
@@ -158,7 +158,7 @@ void SchDataDescrDlg::Reset()
         aCbSymbol.SetState( STATE_DONTKNOW );
     }
 
-    aState = rOutAttrs.GetItemState(SCHATTR_DATADESCR_DESCR, TRUE, &pPoolItem);
+    aState = m_rInAttrs.GetItemState(SCHATTR_DATADESCR_DESCR, TRUE, &pPoolItem);
     if( aState == SFX_ITEM_SET )
     {
         switch( ((const SvxChartDataDescrItem*)pPoolItem)->GetValue() )
@@ -235,7 +235,7 @@ void SchDataDescrDlg::GetAttr(SfxItemSet& rOutAttrs)
 
     rOutAttrs.Put(SvxChartDataDescrItem(eDescr));
     rOutAttrs.Put(SfxBoolItem( SCHATTR_DATADESCR_SHOW_SYM,
-                               aCbSymbol.IsChecked()) );
+                                aCbSymbol.IsChecked()) );
 }
 
 //.............................................................................
diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index aa6d38f721ba..118765a13ba7 100644
--- a/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlg_InsertLegend.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:25 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,12 +79,6 @@ namespace chart
 {
 //.............................................................................
 
-/*************************************************************************
-|*
-|* Dialog zur Ausrichtung der Legende
-|*
-\************************************************************************/
-
 SchLegendDlg::SchLegendDlg(Window* pWindow, const SfxItemSet& rInAttrs) :
     ModalDialog(pWindow, SchResId(DLG_LEGEND)),
     aCbxShow(this, ResId(CBX_SHOW)),
@@ -96,7 +90,7 @@ SchLegendDlg::SchLegendDlg(Window* pWindow, const SfxItemSet& rInAttrs) :
     aBtnOK(this, ResId(BTN_OK)),
     aBtnCancel(this, ResId(BTN_CANCEL)),
     aBtnHelp(this, ResId(BTN_HELP)),
-    rOutAttrs(rInAttrs)
+    m_rInAttrs(rInAttrs)
 {
     FreeResource();
 
@@ -105,30 +99,18 @@ SchLegendDlg::SchLegendDlg(Window* pWindow, const SfxItemSet& rInAttrs) :
     Reset();
 }
 
-/*************************************************************************
-|*
-|* Dtor
-|*
-/************************************************************************/
-
 SchLegendDlg::~SchLegendDlg()
 {
 }
 
-/*************************************************************************
-|*
-|*  Initialisierung
-|*
-\*************************************************************************/
-
 void SchLegendDlg::Reset()
 {
     SvxChartLegendPos ePos = CHLEGEND_NONE;
 
     const SfxPoolItem* pPoolItem = NULL;
-    if( rOutAttrs.GetItemState( SCHATTR_LEGEND_POS,
+    if( m_rInAttrs.GetItemState( SCHATTR_LEGEND_POS,
                                TRUE, &pPoolItem ) != SFX_ITEM_SET )
-        pPoolItem = &(rOutAttrs.GetPool()->GetDefaultItem( SCHATTR_LEGEND_POS ));
+        pPoolItem = &(m_rInAttrs.GetPool()->GetDefaultItem( SCHATTR_LEGEND_POS ));
 
     if( pPoolItem )
         ePos = ((const SvxChartLegendPosItem*)pPoolItem)->GetValue();
@@ -148,6 +130,8 @@ void SchLegendDlg::Reset()
         case CHLEGEND_BOTTOM:
             aRbtBottom.Check(TRUE);
             break;
+        default:
+            break;
     }
 
     aCbxShow.Check (ePos != CHLEGEND_NONE);
@@ -157,13 +141,7 @@ void SchLegendDlg::Reset()
     aRbtBottom.Enable (ePos != CHLEGEND_NONE);
 }
 
-/*************************************************************************
-|*
-|*    Fuellt uebergebenen Item-Set mit Dialogbox-Attributen
-|*
-\*************************************************************************/
-
-void SchLegendDlg::GetAttr(SfxItemSet& rOutAttrs)
+void SchLegendDlg::GetAttr(SfxItemSet& _rOutAttrs)
 {
     SvxChartLegendPos ePos;
 
@@ -180,7 +158,7 @@ void SchLegendDlg::GetAttr(SfxItemSet& rOutAttrs)
     else
         ePos = CHLEGEND_NONE;
 
-    rOutAttrs.Put(SvxChartLegendPosItem(ePos));
+    _rOutAttrs.Put(SvxChartLegendPosItem(ePos));
 }
 
 
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index b5412dbb492f..1c3695f0b4c2 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlg_ObjectProperties.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: iha $ $Date: 2004-01-17 13:09:45 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,11 +83,11 @@
 #include "ChartModelHelper.hxx"
 #include "ChartTypeHelper.hxx"
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPE_HPP_
-#include <drafts/com/sun/star/chart2/XChartType.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPE_HPP_
+#include <com/sun/star/chart2/XChartType.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIES_HPP_
-#include <drafts/com/sun/star/chart2/XDataSeries.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XDATASERIES_HPP_
+#include <com/sun/star/chart2/XDataSeries.hpp>
 #endif
 
 
@@ -120,7 +120,7 @@ namespace chart
 //.............................................................................
 
 using namespace ::com::sun::star;
-using namespace ::drafts::com::sun::star::chart2;
+using namespace ::com::sun::star::chart2;
 
 namespace
 {
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 3c5ee1d52841..57250213fb6f 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_AxisLabel.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -133,7 +133,7 @@ SchAxisLabelTabPage::SchAxisLabelTabPage( Window* pParent, const SfxItemSet& rIn
 
            aFlSeparator( this, SchResId( FL_SEPARATOR ) ),
 
-        bShowStaggeringControls( true ),
+        m_bShowStaggeringControls( true ),
 ////        bAllowTextOverlap( TRUE ),
 
         m_nInitialDegrees( 0 ),
@@ -197,7 +197,7 @@ BOOL SchAxisLabelTabPage::FillItemSet( SfxItemSet& rOutAttrs )
 //  rOutAttrs.Put( SvxChartTextOrientItem( eOrient ) );
     rOutAttrs.Put( SfxBoolItem( SCHATTR_TEXT_STACKED, bIsStacked ) );
 
-    if( bShowStaggeringControls )
+    if( m_bShowStaggeringControls )
     {
         SvxChartTextOrder eOrder;
         bool bRadioButtonChecked = true;
@@ -345,7 +345,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     }
 
     // text order ----------
-    if( bShowStaggeringControls )
+    if( m_bShowStaggeringControls )
     {
         aState = rInAttrs.GetItemState( SCHATTR_TEXT_ORDER, FALSE, &pPoolItem );
         if( aState == SFX_ITEM_SET )
@@ -373,11 +373,11 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     ToggleShowLabel( (void*)0 );
 }
 
-void SchAxisLabelTabPage::ShowStaggeringControls( BOOL ShowStaggeringControls )
+void SchAxisLabelTabPage::ShowStaggeringControls( BOOL bShowStaggeringControls )
 {
-    bShowStaggeringControls = ShowStaggeringControls;
+    m_bShowStaggeringControls = bShowStaggeringControls;
 
-    if( !bShowStaggeringControls )
+    if( !m_bShowStaggeringControls )
     {
         aRbSideBySide.Hide();
         aRbUpDown.Hide();
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 49a6743b48bc..fbd64d4b84b2 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_AxisLabel.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,7 +103,7 @@ private:
 
     FixedLine           aFlSeparator;
 
-    BOOL                bShowStaggeringControls;
+    BOOL                m_bShowStaggeringControls;
 ////    BOOL                bAllowTextOverlap;
 
     short               m_nInitialDegrees;
@@ -121,7 +121,7 @@ public:
     virtual BOOL FillItemSet( SfxItemSet& rOutAttrs );
     virtual void Reset( const SfxItemSet& rInAttrs );
 
-    void ShowStaggeringControls( BOOL ShowStaggeringControls );
+    void ShowStaggeringControls( BOOL bShowStaggeringControls );
 ////    void AllowTextOverlap( BOOL bOverLap )      { bAllowTextOverlap = bOverLap; }
 };
 //.............................................................................
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index 3d06c3d9688b..41939b0accac 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_DataLabel.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,8 +83,7 @@ SchDataDescrTabPage::SchDataDescrTabPage(Window* pWindow,
         aRbNumber(this, ResId(RB_NUMBER)),
         aRbPercent(this, ResId(RB_PERCENT)),
         aCbText(this, ResId(CB_TEXT)),
-        aCbSymbol(this, ResId(CB_SYMBOL)),
-        rOutAttrs(rInAttrs)
+        aCbSymbol(this, ResId(CB_SYMBOL))
 {
     FreeResource();
 
@@ -176,12 +175,12 @@ void SchDataDescrTabPage::Reset(const SfxItemSet& rInAttrs)
     aRbPercent.Enable( FALSE );
     aCbSymbol.Enable( FALSE );
 
-    if( rOutAttrs.GetItemState(SCHATTR_DATADESCR_SHOW_SYM,
-                               TRUE, &pPoolItem) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState(SCHATTR_DATADESCR_SHOW_SYM,
+                              TRUE, &pPoolItem) == SFX_ITEM_SET )
         aCbSymbol.Check( ((const SfxBoolItem*)pPoolItem)->GetValue() );
 
-    if( rOutAttrs.GetItemState(SCHATTR_DATADESCR_DESCR,
-                               TRUE, &pPoolItem) == SFX_ITEM_SET )
+    if( rInAttrs.GetItemState(SCHATTR_DATADESCR_DESCR,
+                              TRUE, &pPoolItem) == SFX_ITEM_SET )
     {
         switch( ((const SvxChartDataDescrItem*)pPoolItem)->GetValue() )
         {
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx
index ad8f2d2d6187..ee619cdaf601 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_DataLabel.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,8 +83,6 @@ private:
     CheckBox            aCbText;
     CheckBox            aCbSymbol;
 
-    const SfxItemSet&   rOutAttrs;
-
     DECL_LINK(EnableHdl, CheckBox * );
 
 public:
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index f46217889540..07995bbe67fc 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_LegendPosition.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,53 +80,28 @@ namespace chart
 {
 //.............................................................................
 
-/*************************************************************************
-|*
-|* Dialog zur Ausrichtung der Legende
-|*
-\************************************************************************/
-
 SchLegendPosTabPage::SchLegendPosTabPage(Window* pWindow,
                                          const SfxItemSet& rInAttrs) :
     SfxTabPage(pWindow, SchResId(TP_LEGEND_POS), rInAttrs),
+    aGrpLegend(this, ResId(GRP_LEGEND)),
     aRbtLeft(this, ResId(RBT_LEFT)),
     aRbtTop(this, ResId(RBT_TOP)),
-    aRbtRight(this, ResId(RBT_RIGHT)),
     aRbtBottom(this, ResId(RBT_BOTTOM)),
-    aGrpLegend(this, ResId(GRP_LEGEND)),
-    rOutAttrs(rInAttrs)
+    aRbtRight(this, ResId(RBT_RIGHT))
 {
     FreeResource();
 }
 
-/*************************************************************************
-|*
-|* Dtor
-|*
-/************************************************************************/
-
 SchLegendPosTabPage::~SchLegendPosTabPage()
 {
 }
 
-/*************************************************************************
-|*
-|* Erzeugung
-|*
-\*************************************************************************/
-
 SfxTabPage* SchLegendPosTabPage::Create(Window* pWindow,
                                         const SfxItemSet& rOutAttrs)
 {
     return new SchLegendPosTabPage(pWindow, rOutAttrs);
 }
 
-/*************************************************************************
-|*
-|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen
-|*
-\*************************************************************************/
-
 BOOL SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
     SvxChartLegendPos ePos;
@@ -147,12 +122,6 @@ BOOL SchLegendPosTabPage::FillItemSet(SfxItemSet& rOutAttrs)
     return TRUE;
 }
 
-/*************************************************************************
-|*
-|* Initialisierung
-|*
-\*************************************************************************/
-
 void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs)
 {
     SvxChartLegendPos ePos = CHLEGEND_NONE;
@@ -179,6 +148,8 @@ void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs)
         case CHLEGEND_BOTTOM:
             aRbtBottom.Check(TRUE);
             break;
+        default:
+            break;
     }
 }
 
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index a75c8c7790bf..43027223502a 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_LegendPosition.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,8 +89,6 @@ private:
     RadioButton aRbtBottom;
     RadioButton aRbtRight;
 
-    const SfxItemSet&   rOutAttrs;
-
 public:
     SchLegendPosTabPage(Window* pParent, const SfxItemSet& rInAttrs);
     virtual ~SchLegendPosTabPage();
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 3666d9e22e7a..d50f6c1f5ea4 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_PointGeometry.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,39 +98,22 @@ SchLayoutTabPage::SchLayoutTabPage(Window* pWindow,const SfxItemSet& rInAttrs) :
     aPyramid(this, ResId(RBT_LY_PYRAMID)),
     aHanoi(this,ResId(RBT_LY_HANOI)),
     */
-    aListShapes(this,ResId(LB_LY_SHAPE)),
     aFtLayout(this, ResId(FT_LY_SHAPE)),
-    rOutAttrs(rInAttrs)
+    aListShapes(this,ResId(LB_LY_SHAPE))
 {
     FreeResource();
 }
-/*************************************************************************
-|*
-|* Dtor
-|*
-\************************************************************************/
 
 SchLayoutTabPage::~SchLayoutTabPage()
 {
 }
 
-/*************************************************************************
-|*
-|* Erzeugung
-|*
-\*************************************************************************/
-
 SfxTabPage* SchLayoutTabPage::Create(Window* pWindow,
                                         const SfxItemSet& rOutAttrs)
 {
     return new SchLayoutTabPage(pWindow, rOutAttrs);
 }
 
-/*************************************************************************
-|*
-|* Fuellt uebergebenen Item-Set mit Dialogbox-Attributen
-|*
-\*************************************************************************/
 BOOL SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs)
 {
 
@@ -144,16 +127,10 @@ BOOL SchLayoutTabPage::FillItemSet(SfxItemSet& rOutAttrs)
             nSegs=4;
 
         rOutAttrs.Put(SfxInt32Item(SCHATTR_STYLE_SHAPE,nShape));
-//-/        rOutAttrs.Put(SfxUInt32Item(SID_ATTR_3D_HORZ_SEGS,nSegs));
         rOutAttrs.Put(Svx3DHorizontalSegmentsItem(nSegs));
     }
     return TRUE;
 }
-/*************************************************************************
-|*
-|* Initialisierung
-|*
-\*************************************************************************/
 
 void SchLayoutTabPage::Reset(const SfxItemSet& rInAttrs)
 {
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index ae824369db64..1f88cb7e20da 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_PointGeometry.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:26 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -85,8 +85,6 @@ private:
     FixedText   aFtLayout;
     ListBox     aListShapes;
 
-    const SfxItemSet&   rOutAttrs;
-
 public:
     SchLayoutTabPage(Window* pParent, const SfxItemSet& rInAttrs);
     virtual ~SchLayoutTabPage();
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index d75ddf8058a5..f28943819317 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_Scale.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -168,7 +168,6 @@ SchScaleYAxisTabPage::SchScaleYAxisTabPage(Window* pWindow,const SfxItemSet& rIn
     nStepHelp(0),
     fOrigin(0.0),
     nAxisType(0),
-    rOutAttrs(rInAttrs),
     pNumFormatter(NULL) //,
 //  bLastStepMain(FALSE)
 {
@@ -823,7 +822,7 @@ void SchScaleYAxisTabPage::SetNumFormat()
 {
     const SfxPoolItem *pPoolItem = NULL;
 
-    if( rOutAttrs.GetItemState( SCHATTR_AXIS_NUMFMT, TRUE, &pPoolItem ) == SFX_ITEM_SET )
+    if( GetItemSet().GetItemState( SCHATTR_AXIS_NUMFMT, TRUE, &pPoolItem ) == SFX_ITEM_SET )
     {
         ULONG nFmt = (ULONG)((const SfxInt32Item*)pPoolItem)->GetValue();
         short eType = pNumFormatter->GetType( nFmt );
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index d0004a9695e7..9172f8eda88d 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_Scale.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -130,7 +130,6 @@ private:
     sal_Int32           nStepHelp;
     double              fOrigin;
     int                 nAxisType;
-    const SfxItemSet&   rOutAttrs;
     SvNumberFormatter*  pNumFormatter;
 
 //  BOOL                bLastStepMain;
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index ab74231b2afa..5ac66ec23382 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_SeriesToAxis.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,15 +94,15 @@ namespace chart
 SchOptionTabPage::SchOptionTabPage(Window* pWindow,const SfxItemSet& rInAttrs) :
     SfxTabPage(pWindow, SchResId(TP_OPTIONS), rInAttrs),
     aGrpAxis(this, ResId(GRP_OPT_AXIS)),
-    aGrpBar(this, ResId(GB_BAR)),
     aRbtAxis1(this,ResId(RBT_OPT_AXIS_1)),
     aRbtAxis2(this,ResId(RBT_OPT_AXIS_2)),
-    aMTOverlap(this,ResId(MT_OVERLAP)),
+
+    aGrpBar(this, ResId(GB_BAR)),
+    aFTGap(this,ResId(FT_GAP)),
     aMTGap(this,ResId(MT_GAP)),
     aFTOverlap(this,ResId(FT_OVERLAP)),
-    aFTGap(this,ResId(FT_GAP)),
-    aCBConnect(this,ResId(CB_CONNECTOR)),
-    rOutAttrs(rInAttrs)
+    aMTOverlap(this,ResId(MT_OVERLAP)),
+    aCBConnect(this,ResId(CB_CONNECTOR))
 {
     FreeResource();
 
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index c8224299166f..016908321c21 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_SeriesToAxis.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,7 +97,6 @@ private:
     MetricField aMTOverlap;
     CheckBox    aCBConnect;
 
-    const SfxItemSet&   rOutAttrs;
 public:
     SchOptionTabPage(Window* pParent, const SfxItemSet& rInAttrs);
     virtual ~SchOptionTabPage();
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 455b528f3912..0b73ee8a9f70 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_TitleRotation.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:27 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,7 +111,6 @@ SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow,
 //  aRbtAutoOrder(this, ResId(RBT_AUTOORDER)),
 //  aFlOrder(this, ResId(FL_ORDER)),
 //  eOrderMode(CHORDMODE_X_AXIS),
-    rOutAttrs(rInAttrs),
 
     //Seit 4/1998 koennen Texte frei gedreht werden: SCHATTR_TEXT_DEGREES
     aWinOrient      ( this,ResId(CTR_DIAL),ResId(BTN_TXTSTACKED),
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 7cab021cd116..5ddab5691976 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tp_TitleRotation.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: iha $ $Date: 2003-11-08 23:04:12 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:11:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,8 +121,6 @@ private:
 //  FixedLine   aFlOrder;
 //  OrderMode   eOrderMode;
 
-    const SfxItemSet&   rOutAttrs;
-
 //  DECL_LINK(CheckButtonHdl, Button*);
 //  BOOL bTextCanOverlap;
 public: