CWS-TOOLING: integrate CWS chart30

8 files changed, 11 insertions, 49 deletions

diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx
index 0023e0434655..8b14869aa773 100644
--- a/chart2/source/view/inc/LabelPositionHelper.hxx
+++ b/chart2/source/view/inc/LabelPositionHelper.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: LabelPositionHelper.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -60,8 +60,6 @@ public:
 
     ::com::sun::star::awt::Point transformSceneToScreenPosition(
             const ::com::sun::star::drawing::Position3D& rScenePosition3D ) const;
-    ::com::sun::star::awt::Point transformScaledLogicToScreenPosition(
-            const ::com::sun::star::drawing::Position3D& rScenePosition3D ) const;
 
     static void changeTextAdjustment( tAnySequence& rPropValues, const tNameSequence& rPropNames, LabelAlignment eAlignment);
     static void doDynamicFontResize(  tAnySequence& rPropValues, const tNameSequence& rPropNames
diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx
index a286f31d3bcd..bd16fbab4eb4 100644
--- a/chart2/source/view/inc/ScaleAutomatism.hxx
+++ b/chart2/source/view/inc/ScaleAutomatism.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ScaleAutomatism.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -83,6 +83,8 @@ public:
                             ::com::sun::star::chart2::ExplicitScaleData& rExplicitScale,
                             ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement ) const;
 
+    ::com::sun::star::chart2::ScaleData getScale() const;
+
 private:
     /** Fills the passed scale data and increment data for category scaling. */
     void                calculateExplicitIncrementAndScaleForCategory(
diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx
index 1297d2e4385a..63a7c7558a5b 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ShapeFactory.hxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -150,14 +150,6 @@ public:
                     , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
-        createSymbol3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget
-                    , const ::com::sun::star::drawing::Position3D& rPos
-                    , const ::com::sun::star::drawing::Direction3D& rSize
-                    , sal_Int32 nStandardSymbol
-                    , sal_Int32 nBorderColor=0
-                    , sal_Int32 nFillColor=0 );
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
         createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget
                     , const ::com::sun::star::drawing::PointSequenceSequence& rPoints
                     , const VLineProperties* pLineProperties = NULL );
diff --git a/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx
index c90968294a98..fe3a728daa02 100644
--- a/chart2/source/view/inc/Stripe.hxx
+++ b/chart2/source/view/inc/Stripe.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: Stripe.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -72,8 +72,6 @@ public:
     ::com::sun::star::drawing::Position3D GetPosition3() const { return m_aPoint3; }
     ::com::sun::star::drawing::Position3D GetPosition4() const { return m_aPoint4; }
 
-    ::com::sun::star::drawing::Direction3D GetDirectionTo4() const;
-
 private:
     ::com::sun::star::drawing::Position3D m_aPoint1;
     ::com::sun::star::drawing::Position3D m_aPoint2;
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index b183e02cfb4e..f9a575be0123 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VCoordinateSystem.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.36.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -146,8 +146,6 @@ protected: //methods
 
     void prepareScaleAutomatism( ScaleAutomatism& rScaleAutomatism, double fMin, double fMax, sal_Int32 nDimIndex, sal_Int32 nAxisIndex );
 
-    sal_Int32 getMaximumIncrementIndexByDimension( sal_Int32 nDimensionIndex ) const;
-
     rtl::OUString createCIDForAxis( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::chart2::XAxis >& xAxis
                     , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index a7437db88d2e..d3f14a9a1bdd 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VDataSeries.hxx,v $
- * $Revision: 1.22 $
+ * $Revision: 1.21.8.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -86,7 +86,7 @@ public:
     void setCategoryXAxis();
     void setParticle( const rtl::OUString& rSeriesParticle );
     void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex );
-    void setDiagramReferenceSize( const ::com::sun::star::awt::Size & rDiagramRefSize );
+    void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize );
 
     sal_Int32   getTotalPointCount() const;
     double      getX( sal_Int32 index ) const;
diff --git a/chart2/source/view/inc/VLegendSymbolFactory.hxx b/chart2/source/view/inc/VLegendSymbolFactory.hxx
index f1e8b7189d94..321c171223ea 100644
--- a/chart2/source/view/inc/VLegendSymbolFactory.hxx
+++ b/chart2/source/view/inc/VLegendSymbolFactory.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VLegendSymbolFactory.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.44.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -63,18 +63,6 @@ public:
             tPropertyType ePropertyType,
             const ::com::sun::star::uno::Any& rExplicitSymbol /*should contain a ::com::sun::star::chart2::Symbol without automatic symbol if the charttype does support symbols else empty*/);
 
-    /// @param bWhiteDay: if <FALSE/> this symbol is for BlackDays
-    static ::com::sun::star::uno::Reference<
-                ::com::sun::star::drawing::XShape >
-        createJapaneseCandleStickSymbol(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::drawing::XShapes > xSymbolContainer,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::lang::XMultiServiceFactory > & xShapeFactory,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > & xLegendEntryProperties,
-            bool bWhiteDay );
-
     enum tStockLineType
     {
         STOCK_LINE_TYPE_VERT,
@@ -82,17 +70,6 @@ public:
         STOCK_LINE_TYPE_CLOSE
     };
 
-    static ::com::sun::star::uno::Reference<
-                ::com::sun::star::drawing::XShape >
-        createStockLineSymbol(
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::drawing::XShapes > xSymbolContainer,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::lang::XMultiServiceFactory > & xShapeFactory,
-            const ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > & xLegendEntryProperties,
-            tStockLineType eType );
-
 private:
      VLegendSymbolFactory();
 };
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 27671de5f7f2..b5ea7f7c2bfd 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: VSeriesPlotter.hxx,v $
- * $Revision: 1.25 $
+ * $Revision: 1.25.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -285,8 +285,6 @@ public:
     //get series names for the z axis labels
     ::com::sun::star::uno::Sequence< rtl::OUString > getSeriesNames() const;
 
-    void setDiagramReferenceSize( const ::com::sun::star::awt::Size & rDiagramRefSize );
-
     void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize );
     //better performance for big data
     void setCoordinateSystemResolution( const ::com::sun::star::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution );
@@ -448,7 +446,6 @@ private: //member
 
     typedef std::map< sal_Int32 , PlottingPositionHelper* > tSecondaryPosHelperMap;
     mutable tSecondaryPosHelperMap   m_aSecondaryPosHelperMap;
-    ::com::sun::star::awt::Size      m_aDiagramReferenceSize;
     ::com::sun::star::awt::Size      m_aPageReferenceSize;
 };