diff options
Diffstat (limited to 'chart2/source/tools')
20 files changed, 94 insertions, 104 deletions
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx index 4ffc806c2f22..2e5eb574ef4c 100644 --- a/chart2/source/tools/ChartModelHelper.cxx +++ b/chart2/source/tools/ChartModelHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartModelHelper.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:53 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:12:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,11 +61,11 @@ #include "ChartModelHelper.hxx" #include "macros.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif -#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 // header for define DBG_ASSERT @@ -78,7 +78,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //static uno::Reference< XDiagram > ChartModelHelper::findDiagram( const uno::Reference< frame::XModel >& xModel ) diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index 0e1bc1c778d0..a87316a82ee8 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartTypeHelper.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: iha $ $Date: 2004-01-23 10:29:25 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; sal_Bool ChartTypeHelper::isSupportingGeometryProperties( const uno::Reference< XChartType >& xChartType ) { diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx index f887a282b0c6..351b0d38fb69 100644 --- a/chart2/source/tools/CommonConverters.cxx +++ b/chart2/source/tools/CommonConverters.cxx @@ -2,9 +2,9 @@ * * $RCSfile: CommonConverters.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:53 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,8 +69,8 @@ #include <com/sun/star/text/WritingMode2.hpp> #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 INCLUDED_RTL_MATH_HXX @@ -688,7 +688,7 @@ text::WritingMode WritingMode2ToWritingMode1( sal_Int16 nWritingMode2 ) } } -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; uno::Sequence< double > DataSequenceToDoubleSequence( const uno::Reference< XDataSequence > & xDataSequence ) diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 5f934aea8008..aa75f6779867 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DiagramHelper.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2004-01-19 14:41:36 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,12 +62,11 @@ #include "LegendHelper.hxx" #include "PropertyHelper.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 using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace chart { diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index 46c146425df2..dc9f8a584612 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ErrorBar.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-12-15 15:52:18 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -69,8 +69,8 @@ #ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_ERRORBARSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/ErrorBarStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_ERRORBARSTYLE_HPP_ +#include <com/sun/star/chart2/ErrorBarStyle.hpp> #endif #ifndef INCLUDED_RTL_MATH_HXX @@ -81,7 +81,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -278,7 +277,7 @@ uno::Sequence< ::rtl::OUString > ErrorBar::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 2 ); aServices[ 0 ] = lcl_aServiceName; - aServices[ 1 ] = C2U( "drafts.com.sun.star.chart2.ErrorBar" ); + aServices[ 1 ] = C2U( "com.sun.star.chart2.ErrorBar" ); return aServices; } diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index 104458bd839e..d7bff099002b 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ExponentialRegressionCurveCalculator.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 14:52:08 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx index 6fd6a04b0f2d..2b58072c66aa 100644 --- a/chart2/source/tools/FillProperties.cxx +++ b/chart2/source/tools/FillProperties.cxx @@ -2,9 +2,9 @@ * * $RCSfile: FillProperties.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-11 09:15:20 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,22 +73,21 @@ #ifndef _COM_SUN_STAR_DRAWING_HATCH_HPP_ #include <com/sun/star/drawing/Hatch.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/TransparencyStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ +#include <com/sun/star/chart2/TransparencyStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_FILLBITMAP_HPP_ -#include <drafts/com/sun/star/chart2/FillBitmap.hpp> +#ifndef _COM_SUN_STAR_CHART2_FILLBITMAP_HPP_ +#include <com/sun/star/chart2/FillBitmap.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/TransparencyStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ +#include <com/sun/star/chart2/TransparencyStyle.hpp> #endif -#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 using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; diff --git a/chart2/source/tools/LegendHelper.cxx b/chart2/source/tools/LegendHelper.cxx index f1b57d41b524..59e7710502ad 100644 --- a/chart2/source/tools/LegendHelper.cxx +++ b/chart2/source/tools/LegendHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LegendHelper.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-11-04 17:18:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,11 +61,11 @@ #include "LegendHelper.hxx" #include "macros.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.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 _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ @@ -73,7 +73,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; //............................................................................. namespace chart @@ -129,7 +128,7 @@ void LegendHelper::defaultFillEmptyLegend( { uno::Reference< lang::XServiceInfo > xInfo( aChildren[ i ], uno::UNO_QUERY ); if( xInfo.is() && - xInfo->supportsService( C2U( "drafts.com.sun.star.chart2.ChartTypeGroup" ))) + xInfo->supportsService( C2U( "com.sun.star.chart2.ChartTypeGroup" ))) { uno::Reference< chart2::XLegendEntry > xEntry( xInfo, uno::UNO_QUERY ); if( xEntry.is()) diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx index 6fceec531dd7..8ab4dee76895 100644 --- a/chart2/source/tools/LineProperties.cxx +++ b/chart2/source/tools/LineProperties.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LineProperties.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-11 09:15:37 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -77,18 +77,17 @@ #include <com/sun/star/style/XStyle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_FILLBITMAP_HPP_ -#include <drafts/com/sun/star/chart2/FillBitmap.hpp> +#ifndef _COM_SUN_STAR_CHART2_FILLBITMAP_HPP_ +#include <com/sun/star/chart2/FillBitmap.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ -#include <drafts/com/sun/star/chart2/TransparencyStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_TRANSPARENCYSTYLE_HPP_ +#include <com/sun/star/chart2/TransparencyStyle.hpp> #endif -#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 using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::com::sun::star::beans::Property; diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index 96affb11e4f0..6cf0178a934d 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LinearRegressionCurveCalculator.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-12-17 16:43:14 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index bd729b963573..5c68781fab3d 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LogarithmicRegressionCurveCalculator.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: bm $ $Date: 2003-12-19 15:06:05 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index fef9b7e45054..22ddafb60962 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: MeanValueRegressionCurveCalculator.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 14:21:01 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index 6501d9637dfc..349bc29f325d 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -2,9 +2,9 @@ * * $RCSfile: OPropertySet.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:32 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,8 +74,8 @@ using namespace ::com::sun::star; -using ::drafts::com::sun::star::style::XStyleSupplier; -// using ::drafts::com::sun::star::beans::XFastPropertyState; +using ::com::sun::star::style::XStyleSupplier; +// using ::com::sun::star::beans::XFastPropertyState; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index 63235540bcd5..6c21fbc5a9b8 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PotentialRegressionCurveCalculator.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 14:28:35 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx index d47717478ee8..529ab5277592 100644 --- a/chart2/source/tools/RegressionCurveHelper.cxx +++ b/chart2/source/tools/RegressionCurveHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: RegressionCurveHelper.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: bm $ $Date: 2003-12-19 15:05:06 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,8 +71,8 @@ #include "ChartModelHelper.hxx" #include "macros.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif //............................................................................. @@ -81,7 +81,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; @@ -241,7 +241,7 @@ void RegressionCurveHelper::initializeCurveCalculator( bXValuesFound = true; } else if( ! bYValuesFound && - aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "values" ))) + aRole.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "y-values" ))) { aYValues = DataSequenceToDoubleSequence( aDataSeqs[i] ); bYValuesFound = true; diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index bed2692e029e..b555e27b7dde 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: RegressionCurveModel.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 16:38:18 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,7 +80,6 @@ #endif using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; @@ -240,7 +239,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL uno::Sequence< ::rtl::OUString > RegressionCurveModel::getSupportedServiceNames_Static() { uno::Sequence< ::rtl::OUString > aServices( 1 ); - aServices[ 0 ] = C2U( "drafts.com.sun.star.chart2.RegressionCurve" ); + aServices[ 0 ] = C2U( "com.sun.star.chart2.RegressionCurve" ); return aServices; } diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 805f28d146c2..264069581fc0 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -2,9 +2,9 @@ * * $RCSfile: RegressionCurveModel.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-12-17 16:37:58 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:05 $ * * 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_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 _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 _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ @@ -97,8 +97,8 @@ namespace impl typedef ::cppu::WeakImplHelper4< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XServiceName, - ::drafts::com::sun::star::chart2::XRegressionCurve, - ::drafts::com::sun::star::chart2::XIdentifiable > + ::com::sun::star::chart2::XRegressionCurve, + ::com::sun::star::chart2::XIdentifiable > RegressionCurveModel_Base; } @@ -145,7 +145,7 @@ protected: // ____ XRegressionCurve ____ virtual ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() + ::com::sun::star::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() throw (::com::sun::star::uno::RuntimeException); // ____ XServiceName ____ diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 517f57369051..ccb37aecb2af 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -2,9 +2,9 @@ * * $RCSfile: Scaling.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2003-12-15 19:39:46 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -84,7 +84,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; LogarithmicScaling::LogarithmicScaling() : m_fBase( 10.0 ), diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx index 282a25caa3c4..97669501a887 100644 --- a/chart2/source/tools/TitleHelper.cxx +++ b/chart2/source/tools/TitleHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TitleHelper.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: bm $ $Date: 2003-12-09 09:52:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,8 +64,8 @@ #include "ContextHelper.hxx" #include "MeterHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ -#include <drafts/com/sun/star/chart2/XChartDocument.hpp> +#ifndef _COM_SUN_STAR_CHART2_XCHARTDOCUMENT_HPP_ +#include <com/sun/star/chart2/XChartDocument.hpp> #endif //............................................................................. @@ -74,7 +74,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; rtl::OUString TitleHelper::getIdentifierForTitle( TitleHelper::eTitleType nTitleIndex ) { @@ -179,7 +179,7 @@ uno::Reference< XTitle > TitleHelper::createTitle( if(xNewContext.is() && xTitled.is()) { xTitle.set( xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.Title" ), + C2U( "com.sun.star.chart2.Title" ), xNewContext ), uno::UNO_QUERY ); if(xTitle.is()) @@ -222,7 +222,7 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText { uno::Reference< uno::XInterface > xI( xContext->getServiceManager()->createInstanceWithContext( - C2U( "drafts.com.sun.star.chart2.FormattedString" ), xContext ) ); + C2U( "com.sun.star.chart2.FormattedString" ), xContext ) ); uno::Reference< XFormattedString > xFormattedString( xI, uno::UNO_QUERY ); if(xFormattedString.is()) diff --git a/chart2/source/tools/makefile.mk b/chart2/source/tools/makefile.mk index b52ec316f49e..ce4cf39e7942 100644 --- a/chart2/source/tools/makefile.mk +++ b/chart2/source/tools/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.17 $ # -# last change: $Author: iha $ $Date: 2004-01-23 10:29:25 $ +# last change: $Author: bm $ $Date: 2004-01-26 09:13:07 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -86,6 +86,7 @@ SLOFILES= \ $(SLO)$/MediaDescriptorHelper.obj \ $(SLO)$/CommonConverters.obj \ $(SLO)$/ContextHelper.obj \ + $(SLO)$/DataSeriesHelper.obj \ $(SLO)$/DataSeriesTreeHelper.obj \ $(SLO)$/DiagramHelper.obj \ $(SLO)$/ExponentialRegressionCurveCalculator.obj \ |