ChartType concept: the template creates the diagram. To determine with which

template an existing Diagram was probably created, the data series tree is
searched and according to the result the template is guessed.
OldApi chart type support
SubGrid added

8 files changed, 77 insertions, 41 deletions

diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx
index 8f4115ed0cc1..5581e6a83e1c 100644
--- a/chart2/source/controller/inc/AxisItemConverter.hxx
+++ b/chart2/source/controller/inc/AxisItemConverter.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AxisItemConverter.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-17 14:30:08 $
+ *  last change: $Author: bm $ $Date: 2003-11-04 12:37:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,7 +106,7 @@ protected:
 
     virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) const
+    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
index 8810ef51de66..178940f58314 100644
--- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CharacterPropertyItemConverter.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-17 14:30:09 $
+ *  last change: $Author: bm $ $Date: 2003-11-04 12:37:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,7 +91,7 @@ protected:
 
     virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) const
+    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 };
 
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx
index bb5df88cf1a4..7f3781338b13 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DataPointItemConverter.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-17 14:30:09 $
+ *  last change: $Author: bm $ $Date: 2003-11-04 12:37:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,7 +97,7 @@ protected:
 
     virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) const
+    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
index 538b7f3f4f16..6156165f7dbf 100644
--- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GraphicPropertyItemConverter.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-17 14:30:09 $
+ *  last change: $Author: bm $ $Date: 2003-11-04 12:37:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,12 +104,12 @@ protected:
 
     virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) const
+    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
     void FillBitmapItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::beans::UnknownPropertyException );
-    void ApplyBitmapItem( USHORT nWhichId, const SfxItemSet & rItemSet ) const
+    void ApplyBitmapItem( USHORT nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::beans::UnknownPropertyException );
 
 private:
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index cc438bd69c13..025eac3bb2af 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ItemConverter.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-17 14:30:10 $
+ *  last change: $Author: bm $ $Date: 2003-11-04 12:37:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -166,6 +166,12 @@ public:
      */
     bool IsValid() const;
 
+    /** Returns the XPropertySet that was given in the CTOR and is used to apply
+        items in ApplyItemSet().
+     */
+    ::com::sun::star::uno::Reference<
+        ::com::sun::star::beans::XPropertySet >  GetPropertySet() const;
+
     /** Invalidates all items in rDestSet, that are set (state SFX_ITEM_SET) in
         both item sets (rDestSet and rSourceSet) and have differing content.
      */
@@ -215,20 +221,21 @@ protected:
 
         @return true if the item changed a property, false otherwise.
      */
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) const
+    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
+    /** If the XPropertySet has to change during the converting (necessary for ChartType)
+     */
+    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+        SetNewPropertySet(
+            const ::com::sun::star::uno::Reference<
+            ::com::sun::star::beans::XPropertySet > & xNewProp );
+
     // ________
 
     /// Returns the pool
     SfxItemPool & GetItemPool() const;
 
-    /** Returns the XPropertySet that was given in the CTOR and is used to apply
-        items in ApplyItemSet().
-     */
-    ::com::sun::star::uno::Reference<
-        ::com::sun::star::beans::XPropertySet >  GetPropertySet() const;
-
     // ____ ::utl::OEventListenerAdapter ____
     virtual void _disposing( const ::com::sun::star::lang::EventObject& _rSource );
 
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx
index c583e04915fe..2fd3323386d1 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LegendItemConverter.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-17 14:30:10 $
+ *  last change: $Author: bm $ $Date: 2003-11-04 12:37:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,7 +92,7 @@ protected:
 
     virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) const
+    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx
index eac217d814fb..8551991c7034 100644
--- a/chart2/source/controller/inc/TitleItemConverter.hxx
+++ b/chart2/source/controller/inc/TitleItemConverter.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TitleItemConverter.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-17 14:30:10 $
+ *  last change: $Author: bm $ $Date: 2003-11-04 12:37:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,7 +92,7 @@ protected:
 
     virtual void FillSpecialItem( USHORT nWhichId, SfxItemSet & rOutItemSet ) const
         throw( ::com::sun::star::uno::Exception );
-    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet ) const
+    virtual bool ApplySpecialItem( USHORT nWhichId, const SfxItemSet & rItemSet )
         throw( ::com::sun::star::uno::Exception );
 
 private:
diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx
index b5b047cb02ec..fee2df40b594 100644
--- a/chart2/source/controller/inc/dlg_ChartType.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlg_ChartType.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: 2003-11-04 12:37:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,6 +109,20 @@
 #ifndef _SFXITEMSET_HXX
 #include <svtools/itemset.hxx>
 #endif
+// header for SvxChartStyle
+#ifndef _SVX_CHRTITEM_HXX
+#include <svx/chrtitem.hxx>
+#endif
+
+#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_
+#include <drafts/com/sun/star/chart2/XDiagram.hpp>
+#endif
+#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPETEMPLATE_HPP_
+#include <drafts/com/sun/star/chart2/XChartTypeTemplate.hpp>
+#endif
+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
 
 //.............................................................................
 namespace chart
@@ -151,7 +165,12 @@ private:
     HelpButton      aBtnHelp;
     ChartDimension  eDimension;
 
-    const SfxItemSet&       rOutAttrs;
+//  const SfxItemSet&       rOutAttrs;
+
+    ::com::sun::star::uno::Reference<
+            ::drafts::com::sun::star::chart2::XDiagram > m_xDiagram;
+    ::com::sun::star::uno::Reference<
+            ::com::sun::star::lang::XMultiServiceFactory > m_xTemplateManager;
 
     void Reset();
 
@@ -163,31 +182,37 @@ private:
     DECL_LINK(DoubleClickHdl, void*);
     DECL_LINK(ClickHdl, void*);
 
-    void SwitchDepth (USHORT nID);
+    void SwitchDepth( SvxChartStyle eID );
 
     /** Hides/Shows the controls for line/bar combination chart according to the
         chart type id given as nID.
      */
-    void SwitchNumLines( USHORT nID );
+    void SwitchNumLines( SvxChartStyle eID );
 
     void FillValueSets();
 
 public:
-    SchDiagramTypeDlg(Window* pWindow, const SfxItemSet& rInAttrs);
+    SchDiagramTypeDlg(
+        Window* pWindow,
+        const ::com::sun::star::uno::Reference<
+            ::drafts::com::sun::star::chart2::XDiagram > & xDiagram,
+        const ::com::sun::star::uno::Reference<
+            ::com::sun::star::lang::XMultiServiceFactory > & xTemplateManager );
     virtual ~SchDiagramTypeDlg();
 
-    void    GetAttr(SfxItemSet& rOutAttrs);
-//  int     GetDepth();
-//  void    SetDepth( int nDeep );
+//BM    void    GetAttr(SfxItemSet& rOutAttrs);
 
-//  int     GetGranularity();
-//  void    SetGranularity( int nGranularity );
+     sal_Int32 GetDepth();
+    void      SetDepth( sal_Int32 nDeep );
+
+     sal_Int32 GetGranularity();
+     void      SetGranularity( sal_Int32 nGranularity );
 
     /** The value set here determines the maximum number of lines in a line/bar
         combination chart.  This should usually be one less than the number of
         series, such that at least one series remains a bar.
      */
-    void    SetMaximumNumberOfLines( long nMaxLines );
+    void    SetMaximumNumberOfLines( sal_Int32 nMaxLines );
     /** set the current number of lines that are used in a line/bar combination
         chart.
      */
@@ -195,9 +220,13 @@ public:
     /** get the number of lines that should be used for a line/bar combination
         chart.  This has to be set before to be meaningful
      */
-//     long    GetNumberOfLines() const;
+    sal_Int32  GetNumberOfLines() const;
 
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
+
+    ::com::sun::star::uno::Reference<
+            ::drafts::com::sun::star::chart2::XChartTypeTemplate >
+        getTemplate() const;
 };
 
 //.............................................................................