drafts namespace of API removed

public API moved to offapi
Calc as DataEditor - first integration

18 files changed, 169 insertions, 169 deletions

diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 160a782cbb77..790a82a54401 100644
--- a/chart2/source/inc/CachedDataSequence.hxx
+++ b/chart2/source/inc/CachedDataSequence.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CachedDataSequence.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:29 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,11 +91,11 @@
 #endif
 
 //
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XNUMERICALDATASEQUENCE_HPP_
-#include <drafts/com/sun/star/chart2/XNumericalDataSequence.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XNUMERICALDATASEQUENCE_HPP_
+#include <com/sun/star/chart2/XNumericalDataSequence.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTEXTUALDATASEQUENCE_HPP_
-#include <drafts/com/sun/star/chart2/XTextualDataSequence.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XTEXTUALDATASEQUENCE_HPP_
+#include <com/sun/star/chart2/XTextualDataSequence.hpp>
 #endif
 
 #include <vector>
@@ -107,8 +107,8 @@ namespace chart
 namespace impl
 {
 typedef ::cppu::WeakComponentImplHelper3<
-    ::drafts::com::sun::star::chart2::XNumericalDataSequence,
-    ::drafts::com::sun::star::chart2::XTextualDataSequence,
+    ::com::sun::star::chart2::XNumericalDataSequence,
+    ::com::sun::star::chart2::XTextualDataSequence,
     ::com::sun::star::lang::XServiceInfo >
     CachedDataSequence_Base;
 }
@@ -173,21 +173,21 @@ protected:
     virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const;
 
     // ____ XNumericalDataSequence ____
-    /// @see ::drafts::com::sun::star::chart::XNumericalDataSequence
+    /// @see ::com::sun::star::chart::XNumericalDataSequence
     virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException);
-    /// @see ::drafts::com::sun::star::chart::XNumericalDataSequence
+    /// @see ::com::sun::star::chart::XNumericalDataSequence
 //     virtual void SAL_CALL setNumericalData( const ::com::sun::star::uno::Sequence< double >& aData ) throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XTextualDataSequence ____
-    /// @see ::drafts::com::sun::star::chart::XTextualDataSequence
+    /// @see ::com::sun::star::chart::XTextualDataSequence
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException);
-    /// @see ::drafts::com::sun::star::chart::XNumericalDataSequence
+    /// @see ::com::sun::star::chart::XNumericalDataSequence
 //     virtual void SAL_CALL setTextualData( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aData ) throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XDataSequence ____
-    /// @see ::drafts::com::sun::star::chart::XDataSequence
+    /// @see ::com::sun::star::chart::XDataSequence
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException);
-    /// @see ::drafts::com::sun::star::chart::XDataSequence
+    /// @see ::com::sun::star::chart::XDataSequence
     virtual ::rtl::OUString SAL_CALL getSourceIdentifier() throw (::com::sun::star::uno::RuntimeException);
 
     mutable ::osl::Mutex                  m_aMutex;
diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx
index 2f08b76108fc..1c85e7dc4160 100644
--- a/chart2/source/inc/ChartModelHelper.hxx
+++ b/chart2/source/inc/ChartModelHelper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ChartModelHelper.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: iha $ $Date: 2004-01-17 13:09:47 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,14 +61,14 @@
 #ifndef _CHART2_CONTROLLER_CHARTMODELHELPER_HXX
 #define _CHART2_CONTROLLER_CHARTMODELHELPER_HXX
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_
-#include <drafts/com/sun/star/chart2/XChartTypeGroup.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XCHARTTYPEGROUP_HPP_
+#include <com/sun/star/chart2/XChartTypeGroup.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
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_
-#include <drafts/com/sun/star/chart2/XDiagram.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_
+#include <com/sun/star/chart2/XDiagram.hpp>
 #endif
 
 #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_
@@ -90,33 +90,33 @@ class ChartModelHelper
 {
 public:
     static ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XDiagram >
+            ::com::sun::star::chart2::XDiagram >
         findDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
 
     static ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XChartType >
+            ::com::sun::star::chart2::XChartType >
         getFirstChartType( const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XDiagram >& xDiagram );
+            ::com::sun::star::chart2::XDiagram >& xDiagram );
 
     static ::std::vector< ::com::sun::star::uno::Reference<
-        ::drafts::com::sun::star::chart2::XDataSeries > > getDataSeries(
+        ::com::sun::star::chart2::XDataSeries > > getDataSeries(
             const ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XModel > & xModel );
 
     static ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XDataSeries >
+            ::com::sun::star::chart2::XDataSeries >
         getSeriesByIdentifier(
             const rtl::OUString& rIdentifier
             , const ::com::sun::star::uno::Reference<
               ::com::sun::star::frame::XModel > xModel );
 
     static ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XChartType >
+    ::com::sun::star::chart2::XChartType >
         getChartTypeOfSeries(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::frame::XModel >& xModel
             , const ::com::sun::star::uno::Reference<
-                ::drafts::com::sun::star::chart2::XDataSeries >& xGivenDataSeries );
+    ::com::sun::star::chart2::XDataSeries >& xGivenDataSeries );
 };
 
 //.............................................................................
diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx
index 429ca12e60c0..2fca4fdaa485 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ChartTypeHelper.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: iha $ $Date: 2004-01-17 13:09:47 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,12 +62,12 @@
 #ifndef _CHART2_CHARTTYPEHELPER_HXX
 #define _CHART2_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_AXISTYPE_HPP_
-#include <drafts/com/sun/star/chart2/AxisType.hpp>
+#ifndef _COM_SUN_STAR_CHART2_AXISTYPE_HPP_
+#include <com/sun/star/chart2/AxisType.hpp>
 #endif
 
 //.............................................................................
@@ -82,19 +82,19 @@ namespace chart
 class ChartTypeHelper
 {
 public:
-    static sal_Bool isSupportingGeometryProperties(  const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType );
-    static sal_Bool isSupportingStatisticProperties( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType );
-    static sal_Bool isSupportingRegressionProperties(const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType );
-    static sal_Bool isSupportingMainAxis(            const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex );
-    static sal_Bool isSupportingSecondaryAxis(       const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex );
-    static sal_Bool isSupportingAreaProperties(      const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType );
-    static sal_Bool isSupportingSymbolProperties(    const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType );
+    static sal_Bool isSupportingGeometryProperties(  const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
+    static sal_Bool isSupportingStatisticProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
+    static sal_Bool isSupportingRegressionProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
+    static sal_Bool isSupportingMainAxis(            const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex );
+    static sal_Bool isSupportingSecondaryAxis(       const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex );
+    static sal_Bool isSupportingAreaProperties(      const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
+    static sal_Bool isSupportingSymbolProperties(    const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
 
-    static ::drafts::com::sun::star::chart2::AxisType
-                    getAxisType( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType
+    static ::com::sun::star::chart2::AxisType
+                    getAxisType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType
                                 , sal_Int32 nDimensionIndex );
 
-    static sal_Int32 getDimensionCount( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XChartType >& xChartType );
+    static sal_Int32 getDimensionCount( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
 };
 
 //.............................................................................
diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx
index a68e7b024b61..6daeca140b87 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CommonConverters.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: iha $ $Date: 2004-01-17 13:09:48 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,8 +96,8 @@
 #include <com/sun/star/text/WritingMode.hpp>
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASEQUENCE_HPP_
-#include <drafts/com/sun/star/chart2/XDataSequence.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XDATASEQUENCE_HPP_
+#include <com/sun/star/chart2/XDataSequence.hpp>
 #endif
 
 //.............................................................................
@@ -289,7 +289,7 @@ com::sun::star::text::WritingMode WritingMode2ToWritingMode1( sal_Int16 nWriting
 
 ::com::sun::star::uno::Sequence< double > DataSequenceToDoubleSequence(
     const ::com::sun::star::uno::Reference<
-        ::drafts::com::sun::star::chart2::XDataSequence > & xDataSequence );
+        ::com::sun::star::chart2::XDataSequence > & xDataSequence );
 
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx
index 1bc6180c3345..fbaad1a49ac3 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DiagramHelper.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-11-04 15:35:06 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,8 @@
 #ifndef CHART2_DIAGRAMHELPER_HXX
 #define CHART2_DIAGRAMHELPER_HXX
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_
-#include <drafts/com/sun/star/chart2/XDiagram.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_
+#include <com/sun/star/chart2/XDiagram.hpp>
 #endif
 
 namespace chart
@@ -75,9 +75,9 @@ class DiagramHelper
 public:
     static void changeDiagram(
         const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XDiagram > & xSource,
+            ::com::sun::star::chart2::XDiagram > & xSource,
         ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XDiagram > & xDestination
+            ::com::sun::star::chart2::XDiagram > & xDestination
         );
 
 private:
diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index 52f2a1781199..ec5ab5a2c3c3 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ErrorBar.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-12-11 13:52:55 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,11 +72,11 @@
 #include <comphelper/uno3.hxx>
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVE_HPP_
-#include <drafts/com/sun/star/chart2/XRegressionCurve.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVE_HPP_
+#include <com/sun/star/chart2/XRegressionCurve.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_
-#include <drafts/com/sun/star/chart2/XIdentifiable.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XIDENTIFIABLE_HPP_
+#include <com/sun/star/chart2/XIdentifiable.hpp>
 #endif
 
 #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_
diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
index ff92011252a9..af840d802a49 100644
--- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ExponentialRegressionCurveCalculator.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-12-17 14:53:01 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,15 +65,15 @@
 #include <cppuhelper/implbase1.hxx>
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_
-#include <drafts/com/sun/star/chart2/XRegressionCurveCalculator.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_
+#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
 #endif
 
 namespace chart
 {
 
 class ExponentialRegressionCurveCalculator : public
-    ::cppu::WeakImplHelper1< ::drafts::com::sun::star::chart2::XRegressionCurveCalculator >
+    ::cppu::WeakImplHelper1< ::com::sun::star::chart2::XRegressionCurveCalculator >
 {
 public:
     ExponentialRegressionCurveCalculator();
diff --git a/chart2/source/inc/LegendHelper.hxx b/chart2/source/inc/LegendHelper.hxx
index eba03b0bac19..a7a33293174b 100644
--- a/chart2/source/inc/LegendHelper.hxx
+++ b/chart2/source/inc/LegendHelper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LegendHelper.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: bm $ $Date: 2003-11-04 17:18:21 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,11 +69,11 @@
 #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_
 #include <com/sun/star/frame/XModel.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XLEGEND_HPP_
-#include <drafts/com/sun/star/chart2/XLegend.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XLEGEND_HPP_
+#include <com/sun/star/chart2/XLegend.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDIAGRAM_HPP_
-#include <drafts/com/sun/star/chart2/XDiagram.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XDIAGRAM_HPP_
+#include <com/sun/star/chart2/XDiagram.hpp>
 #endif
 
 //.............................................................................
@@ -91,7 +91,7 @@ public:
     static rtl::OUString getIdentifierForLegend();
 
     static ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XLegend >
+            ::com::sun::star::chart2::XLegend >
         getLegend( const ::com::sun::star::uno::Reference<
                        ::com::sun::star::frame::XModel >& xModel );
 
@@ -104,15 +104,15 @@ public:
      */
     static void defaultFillEmptyLegend(
         const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XLegend > & xLegend,
+            ::com::sun::star::chart2::XLegend > & xLegend,
         const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XDiagram > & xDiagram );
+            ::com::sun::star::chart2::XDiagram > & xDiagram );
 
     /** removes all legend entries
      */
     static void flushLegend(
         const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XLegend > & xLegend );
+            ::com::sun::star::chart2::XLegend > & xLegend );
 };
 
 //.............................................................................
diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
index 7f4f57b268cc..ed9f53168dda 100644
--- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LinearRegressionCurveCalculator.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: bm $ $Date: 2003-12-17 14:33:19 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,15 +65,15 @@
 #include <cppuhelper/implbase1.hxx>
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_
-#include <drafts/com/sun/star/chart2/XRegressionCurveCalculator.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_
+#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
 #endif
 
 namespace chart
 {
 
 class LinearRegressionCurveCalculator : public
-    ::cppu::WeakImplHelper1< ::drafts::com::sun::star::chart2::XRegressionCurveCalculator >
+    ::cppu::WeakImplHelper1< ::com::sun::star::chart2::XRegressionCurveCalculator >
 {
 public:
     LinearRegressionCurveCalculator();
diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
index affe2feb6e1a..ca486e7f664f 100644
--- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LogarithmicRegressionCurveCalculator.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-12-17 14:36:36 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,15 +65,15 @@
 #include <cppuhelper/implbase1.hxx>
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_
-#include <drafts/com/sun/star/chart2/XRegressionCurveCalculator.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_
+#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
 #endif
 
 namespace chart
 {
 
 class LogarithmicRegressionCurveCalculator : public
-    ::cppu::WeakImplHelper1< ::drafts::com::sun::star::chart2::XRegressionCurveCalculator >
+    ::cppu::WeakImplHelper1< ::com::sun::star::chart2::XRegressionCurveCalculator >
 {
 public:
     LogarithmicRegressionCurveCalculator();
diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
index 3cf160407dac..f0acda9c3ecd 100644
--- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MeanValueRegressionCurveCalculator.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-12-17 14:19:34 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,15 +65,15 @@
 #include <cppuhelper/implbase1.hxx>
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_
-#include <drafts/com/sun/star/chart2/XRegressionCurveCalculator.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_
+#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
 #endif
 
 namespace chart
 {
 
 class MeanValueRegressionCurveCalculator : public
-    ::cppu::WeakImplHelper1< ::drafts::com::sun::star::chart2::XRegressionCurveCalculator >
+    ::cppu::WeakImplHelper1< ::com::sun::star::chart2::XRegressionCurveCalculator >
 {
 public:
     MeanValueRegressionCurveCalculator();
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index ce271c2edb9b..459326e0b513 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: OPropertySet.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:29 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,11 +89,11 @@
 #include <com/sun/star/beans/Property.hpp>
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_STYLE_XSTYLESUPPLIER_HPP_
-#include <drafts/com/sun/star/style/XStyleSupplier.hpp>
+#ifndef _COM_SUN_STAR_STYLE_XSTYLESUPPLIER_HPP_
+#include <com/sun/star/style/XStyleSupplier.hpp>
 #endif
-// #ifndef _DRAFTS_COM_SUN_STAR_BEANS_XFASTPROPERTYSTATE_HPP_
-// #include <drafts/com/sun/star/beans/XFastPropertyState.hpp>
+// #ifndef _COM_SUN_STAR_BEANS_XFASTPROPERTYSTATE_HPP_
+// #include <com/sun/star/beans/XFastPropertyState.hpp>
 // #endif
 
 #ifndef _OSL_MUTEX_HXX_
@@ -120,8 +120,8 @@ class OPropertySet :
     public ::com::sun::star::lang::XTypeProvider,
     public ::com::sun::star::beans::XPropertyState,
     public ::com::sun::star::beans::XMultiPropertyStates,
-    public ::drafts::com::sun::star::style::XStyleSupplier
-//     public ::drafts::com::sun::star::beans::XFastPropertyState
+    public ::com::sun::star::style::XStyleSupplier
+//     public ::com::sun::star::beans::XFastPropertyState
 {
 public:
     OPropertySet( ::osl::Mutex & rMutex );
diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
index 888cf3e90dd4..6c792a87a79c 100644
--- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PotentialRegressionCurveCalculator.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-12-17 14:29:31 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,8 @@
 #include <cppuhelper/implbase1.hxx>
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_
-#include <drafts/com/sun/star/chart2/XRegressionCurveCalculator.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_
+#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
 #endif
 
 namespace chart
@@ -74,7 +74,7 @@ namespace chart
 
 
 class PotentialRegressionCurveCalculator : public
-    ::cppu::WeakImplHelper1< ::drafts::com::sun::star::chart2::XRegressionCurveCalculator >
+    ::cppu::WeakImplHelper1< ::com::sun::star::chart2::XRegressionCurveCalculator >
 {
 public:
     PotentialRegressionCurveCalculator();
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx
index fc9e90c3f9cc..6ec9629058fa 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RegressionCurveHelper.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: bm $ $Date: 2003-12-19 15:05:24 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,20 +61,20 @@
 #ifndef CHART2_REGRESSIONCURVEHELPER_HXX
 #define CHART2_REGRESSIONCURVEHELPER_HXX
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVE_HPP_
-#include <drafts/com/sun/star/chart2/XRegressionCurve.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVE_HPP_
+#include <com/sun/star/chart2/XRegressionCurve.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_
-#include <drafts/com/sun/star/chart2/XRegressionCurveCalculator.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECALCULATOR_HPP_
+#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XREGRESSIONCURVECONTAINER_HPP_
-#include <drafts/com/sun/star/chart2/XRegressionCurveContainer.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XREGRESSIONCURVECONTAINER_HPP_
+#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASOURCE_HPP_
-#include <drafts/com/sun/star/chart2/XDataSource.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XDATASOURCE_HPP_
+#include <com/sun/star/chart2/XDataSource.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
 #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -91,14 +91,14 @@ class RegressionCurveHelper
 public:
     /// returns a model mean-value line
     static ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XRegressionCurve >
+            ::com::sun::star::chart2::XRegressionCurve >
         createMeanValueLine(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::uno::XComponentContext > & xContext );
 
     /// returns a model regression curve
     static ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XRegressionCurve >
+            ::com::sun::star::chart2::XRegressionCurve >
         createRegressionCurveByServiceName(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::uno::XComponentContext > & xContext,
@@ -108,7 +108,7 @@ public:
 
     static bool hasMeanValueLine(
         const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt );
+            ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt );
 
     /** creates a mean-value line and adds it to the container.
 
@@ -117,7 +117,7 @@ public:
      */
     static void RegressionCurveHelper::addMeanValueLine(
         ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt,
+            ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > & xContext,
         const ::com::sun::star::uno::Reference<
@@ -125,7 +125,7 @@ public:
 
     static void removeMeanValueLine(
         ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt );
+            ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt );
 
     enum tRegressionType
     {
@@ -141,18 +141,18 @@ public:
      */
     static tRegressionType getRegressType(
         const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt );
+            ::com::sun::star::chart2::XRegressionCurveContainer > & xRegCnt );
 
     // ------------------------------------------------------------
 
     /// returns a calculator object for mean-value lines (used by the view)
     static ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XRegressionCurveCalculator >
+            ::com::sun::star::chart2::XRegressionCurveCalculator >
         createMeanValueLineCalculator();
 
     /// returns a calculator object for regression curves (used by the view)
     static ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XRegressionCurveCalculator >
+            ::com::sun::star::chart2::XRegressionCurveCalculator >
         createRegressionCurveCalculatorByServiceName(
             ::rtl::OUString aServiceName );
 
@@ -164,8 +164,8 @@ public:
         indexes will be used for the recalculateRegression() method of the
         regression curve.
 
-        The first sequence having the role "values" will be used as y-values for
-        the recalculateRegression() method of the regression curve.
+        The first sequence having the role "y-values" will be used as y-values
+        for the recalculateRegression() method of the regression curve.
 
         @param bUseXValuesIfAvailable
             If false, the sequence (1, 2, 3, ...) will always be used, even if
@@ -173,9 +173,9 @@ public:
      */
     static void initializeCurveCalculator(
         const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > & xOutCurveCalculator,
+            ::com::sun::star::chart2::XRegressionCurveCalculator > & xOutCurveCalculator,
         const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XDataSource > & xSource,
+            ::com::sun::star::chart2::XDataSource > & xSource,
         bool bUseXValuesIfAvailable = true );
 
     /** Same method as above, but uses the given XModel to determine the
@@ -185,9 +185,9 @@ public:
      */
     static void initializeCurveCalculator(
         const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > & xOutCurveCalculator,
+            ::com::sun::star::chart2::XRegressionCurveCalculator > & xOutCurveCalculator,
         const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XDataSeries > & xSeries,
+            ::com::sun::star::chart2::XDataSeries > & xSeries,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XModel > & xModel );
 
diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx
index 4993bdfe3bd6..ef3ae03ef1aa 100644
--- a/chart2/source/inc/Scaling.hxx
+++ b/chart2/source/inc/Scaling.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Scaling.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:29 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,8 @@
 #ifndef _CHART2_SCALING_HXX
 #define _CHART2_SCALING_HXX
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XSCALING_HPP_
-#include <drafts/com/sun/star/chart2/XScaling.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XSCALING_HPP_
+#include <com/sun/star/chart2/XScaling.hpp>
 #endif
 #ifndef _COM_SUN_STAR_LANG_XSERVICENAME_HPP_
 #include <com/sun/star/lang/XServiceName.hpp>
@@ -82,7 +82,7 @@ namespace chart
 */
 
 class LogarithmicScaling : public ::cppu::WeakImplHelper2 <
-        ::drafts::com::sun::star::chart2::XScaling,
+        ::com::sun::star::chart2::XScaling,
         ::com::sun::star::lang::XServiceName
         >
 {
@@ -97,7 +97,7 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
         virtual ::com::sun::star::uno::Reference<
-        ::drafts::com::sun::star::chart2::XScaling > SAL_CALL
+        ::com::sun::star::chart2::XScaling > SAL_CALL
     getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XServiceName ____
@@ -112,7 +112,7 @@ private:
 // ----------------------------------------
 
 class ExponentialScaling : public ::cppu::WeakImplHelper2 <
-        ::drafts::com::sun::star::chart2::XScaling,
+        ::com::sun::star::chart2::XScaling,
         ::com::sun::star::lang::XServiceName
         >
 {
@@ -127,7 +127,7 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
         virtual ::com::sun::star::uno::Reference<
-        ::drafts::com::sun::star::chart2::XScaling > SAL_CALL
+        ::com::sun::star::chart2::XScaling > SAL_CALL
     getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XServiceName ____
@@ -141,7 +141,7 @@ private:
 // ----------------------------------------
 
 class LinearScaling : public ::cppu::WeakImplHelper2 <
-        ::drafts::com::sun::star::chart2::XScaling,
+        ::com::sun::star::chart2::XScaling,
         ::com::sun::star::lang::XServiceName
         >
 {
@@ -156,7 +156,7 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
         virtual ::com::sun::star::uno::Reference<
-        ::drafts::com::sun::star::chart2::XScaling > SAL_CALL
+        ::com::sun::star::chart2::XScaling > SAL_CALL
     getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XServiceName ____
@@ -171,7 +171,7 @@ private:
 // ----------------------------------------
 
 class PowerScaling : public ::cppu::WeakImplHelper2 <
-        ::drafts::com::sun::star::chart2::XScaling,
+        ::com::sun::star::chart2::XScaling,
         ::com::sun::star::lang::XServiceName
         >
 {
@@ -185,7 +185,7 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
         virtual ::com::sun::star::uno::Reference<
-        ::drafts::com::sun::star::chart2::XScaling > SAL_CALL
+        ::com::sun::star::chart2::XScaling > SAL_CALL
     getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XServiceName ____
diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx
index 506c95f5c829..5351d02a8851 100644
--- a/chart2/source/inc/TitleHelper.hxx
+++ b/chart2/source/inc/TitleHelper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TitleHelper.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 12:54:11 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,8 @@
 #ifndef _CHART2_TOOLS_TITLEHELPER_HXX
 #define _CHART2_TOOLS_TITLEHELPER_HXX
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLED_HPP_
-#include <drafts/com/sun/star/chart2/XTitled.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XTITLED_HPP_
+#include <com/sun/star/chart2/XTitled.hpp>
 #endif
 
 #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_
@@ -96,13 +96,13 @@ public:
     static rtl::OUString getIdentifierForTitle( eTitleType nTitleIndex );
 
     static ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XTitle >
+            ::com::sun::star::chart2::XTitle >
         getTitle( eTitleType nTitleIndex
                     , const ::com::sun::star::uno::Reference<
                     ::com::sun::star::frame::XModel >& xModel );
 
     static ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XTitle >
+            ::com::sun::star::chart2::XTitle >
         createTitle(  eTitleType nTitleIndex
                     , const rtl::OUString& rTitleText
                     , const ::com::sun::star::uno::Reference<
@@ -115,10 +115,10 @@ public:
                             ::com::sun::star::frame::XModel >& xModel );
 
     static rtl::OUString getCompleteString( const ::com::sun::star::uno::Reference<
-        ::drafts::com::sun::star::chart2::XTitle >& xTitle );
+        ::com::sun::star::chart2::XTitle >& xTitle );
     static void setCompleteString( const rtl::OUString& rNewText
         , const ::com::sun::star::uno::Reference<
-            ::drafts::com::sun::star::chart2::XTitle >& xTitle
+            ::com::sun::star::chart2::XTitle >& xTitle
         , const ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > & xContext );
 };
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 35339c6eb114..df45144aa02c 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ExplicitValueProvider.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:29 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,14 +61,14 @@
 #ifndef _CHART2_EXPLICITVALUEPROVIDER_HXX
 #define _CHART2_EXPLICITVALUEPROVIDER_HXX
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITINCREMENTDATA_HPP_
-#include <drafts/com/sun/star/chart2/ExplicitIncrementData.hpp>
+#ifndef _COM_SUN_STAR_CHART2_EXPLICITINCREMENTDATA_HPP_
+#include <com/sun/star/chart2/ExplicitIncrementData.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_
-#include <drafts/com/sun/star/chart2/ExplicitScaleData.hpp>
+#ifndef _COM_SUN_STAR_CHART2_EXPLICITSCALEDATA_HPP_
+#include <com/sun/star/chart2/ExplicitScaleData.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XMETER_HPP_
-#include <drafts/com/sun/star/chart2/XMeter.hpp>
+#ifndef _COM_SUN_STAR_CHART2_XMETER_HPP_
+#include <com/sun/star/chart2/XMeter.hpp>
 #endif
 
 //.............................................................................
@@ -84,9 +84,9 @@ class ExplicitValueProvider
 {
 public:
     virtual void getExplicitValuesForMeter(
-        ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XMeter > xMeter
-        , ::drafts::com::sun::star::chart2::ExplicitScaleData&  rExplicitScale
-        , ::drafts::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement
+        ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XMeter > xMeter
+        , ::com::sun::star::chart2::ExplicitScaleData&  rExplicitScale
+        , ::com::sun::star::chart2::ExplicitIncrementData& rExplicitIncrement
         , double& rfExplicitOrigin )=0;
 };
 
diff --git a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx
index 9bff634e1d67..b483999c154b 100644
--- a/chart2/source/inc/chartview/NumberFormatterWrapper.hxx
+++ b/chart2/source/inc/chartview/NumberFormatterWrapper.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: NumberFormatterWrapper.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: bm $ $Date: 2003-10-06 09:58:29 $
+ *  last change: $Author: bm $ $Date: 2004-01-26 09:12:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,8 @@
 #ifndef _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX
 #define _CHART2_VIEW_NUMBERFORMATTERWRAPPER_HXX
 
-#ifndef _DRAFTS_COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_
-#include <drafts/com/sun/star/chart2/NumberFormat.hpp>
+#ifndef _COM_SUN_STAR_CHART2_NUMBERFORMAT_HPP_
+#include <com/sun/star/chart2/NumberFormat.hpp>
 #endif
 
 //only needed for temp numberformatter
@@ -86,8 +86,8 @@ public:
     NumberFormatterWrapper();
     virtual ~NumberFormatterWrapper();
 
-    ::drafts::com::sun::star::chart2::NumberFormat    getNumberFormatForKey( sal_Int32 nIndex ) const;
-    sal_Int32  getKeyForNumberFormat( const ::drafts::com::sun::star::chart2::NumberFormat& rNumberFormat ) const;
+    ::com::sun::star::chart2::NumberFormat    getNumberFormatForKey( sal_Int32 nIndex ) const;
+    sal_Int32  getKeyForNumberFormat( const ::com::sun::star::chart2::NumberFormat& rNumberFormat ) const;
 
     //this method should only be used by the ViewElementListProvider
     SvNumberFormatter* getSvNumberFormatter() const;
@@ -103,7 +103,7 @@ class FixedNumberFormatter
 {
 public:
     FixedNumberFormatter( NumberFormatterWrapper* pNumberFormatterWrapper
-        , const ::drafts::com::sun::star::chart2::NumberFormat& rNumberFormat );
+        , const ::com::sun::star::chart2::NumberFormat& rNumberFormat );
     virtual ~FixedNumberFormatter();
 
     rtl::OUString getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const;