diff options
Diffstat (limited to 'chart2/source/view')
47 files changed, 343 insertions, 347 deletions
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index d47fa6d8a568..02b50039cafa 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ScaleAutomatism.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2003-11-26 12:42:32 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,7 +79,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; ScaleAutomatism::ScaleAutomatism( const ScaleData& rSourceScale ) : m_fValueMinimum( 0.0 ) diff --git a/chart2/source/view/axes/TickmarkHelper.cxx b/chart2/source/view/axes/TickmarkHelper.cxx index ff01d39e53c2..536f0d61f06c 100644 --- a/chart2/source/view/axes/TickmarkHelper.cxx +++ b/chart2/source/view/axes/TickmarkHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: TickmarkHelper.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:32 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:08 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; using namespace ::rtl::math; TickInfo::TickInfo() diff --git a/chart2/source/view/axes/TickmarkHelper.hxx b/chart2/source/view/axes/TickmarkHelper.hxx index 6cecd1610e36..5ca94b6387d1 100644 --- a/chart2/source/view/axes/TickmarkHelper.hxx +++ b/chart2/source/view/axes/TickmarkHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: TickmarkHelper.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:33 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,11 +64,11 @@ #include "TickmarkProperties.hxx" #include "VAxisProperties.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 @@ -112,7 +112,7 @@ struct TickInfo //methods: TickInfo(); void updateUnscaledValue( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XScaling >& xInverseScaling ); + ::com::sun::star::chart2::XScaling >& xInverseScaling ); }; class TickIter @@ -120,10 +120,10 @@ class TickIter public: TickIter( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& rTicks - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); TickIter( ::std::vector< ::std::vector< TickInfo > >& rTickInfos - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); virtual ~TickIter(); @@ -172,7 +172,7 @@ private: //member const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >* m_pSimpleTicks; ::std::vector< ::std::vector< TickInfo > >* m_pInfoTicks; - const ::drafts::com::sun::star::chart2::ExplicitIncrementData& m_rIncrement; + const ::com::sun::star::chart2::ExplicitIncrementData& m_rIncrement; //iteration from m_nMinDepth to m_nMaxDepth sal_Int32 m_nMinDepth; sal_Int32 m_nMaxDepth; @@ -190,16 +190,16 @@ class TickmarkHelper { public: TickmarkHelper( - const ::drafts::com::sun::star::chart2::ExplicitScaleData& rScale - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); + const ::com::sun::star::chart2::ExplicitScaleData& rScale + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); virtual ~TickmarkHelper(); void getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; bool isPostEquidistant( sal_Int32 nDepth ) const; // - static double getMinimumAtIncrement( double fMin, const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); - static double getMaximumAtIncrement( double fMax, const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); + static double getMinimumAtIncrement( double fMin, const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); + static double getMaximumAtIncrement( double fMax, const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); double getScaledWidth() const; @@ -219,10 +219,10 @@ protected: //methods virtual void hideIdenticalScreenValues( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const {} protected: //member - const ::drafts::com::sun::star::chart2::ExplicitScaleData& m_rScale; - const ::drafts::com::sun::star::chart2::ExplicitIncrementData& m_rIncrement; + const ::com::sun::star::chart2::ExplicitScaleData& m_rScale; + const ::com::sun::star::chart2::ExplicitIncrementData& m_rIncrement; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XScaling > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > m_xInverseScaling; double* m_pfCurrentValues; //major-tick positions that may lay outside the visible range but complete partly visible intervals at the borders @@ -240,8 +240,8 @@ class TickmarkHelper_2D : public TickmarkHelper { public: TickmarkHelper_2D( - const ::drafts::com::sun::star::chart2::ExplicitScaleData& rScale - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement + const ::com::sun::star::chart2::ExplicitScaleData& rScale + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement , const Vector2D& rStartScreenPos, const Vector2D& rEndScreenPos ); //, double fStrech_SceneToScreen, double fOffset_SceneToScreen ); virtual ~TickmarkHelper_2D(); @@ -273,8 +273,8 @@ class TickmarkHelper_3D : public TickmarkHelper { public: TickmarkHelper_3D( - const ::drafts::com::sun::star::chart2::ExplicitScaleData& rScale - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); + const ::com::sun::star::chart2::ExplicitScaleData& rScale + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement ); virtual ~TickmarkHelper_3D(); }; diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index f1a354d71bc6..3f6a9159fedf 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VAxisProperties.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: iha $ $Date: 2004-01-23 10:06:56 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,7 +85,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; sal_Int32 lcl_calcTickLengthForDepth(sal_Int32 nDepth,sal_Int32 nTickmarkStyle) { diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index f9242a1491c3..ce14379ca212 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VAxisProperties.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: iha $ $Date: 2004-01-23 10:06:57 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,11 +65,11 @@ #include "PlottingPositionHelper.hxx" #include "LabelAlignment.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 -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXIS_HPP_ -#include <drafts/com/sun/star/chart2/XAxis.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXIS_HPP_ +#include <com/sun/star/chart2/XAxis.hpp> #endif #ifndef _COM_SUN_STAR_AWT_SIZE_HPP_ @@ -112,7 +112,7 @@ struct AxisLabelProperties { AxisLabelProperties(); - drafts::com::sun::star::chart2::NumberFormat aNumberFormat; + ::com::sun::star::chart2::NumberFormat aNumberFormat; AxisLabelStaggering eStaggering; @@ -127,14 +127,14 @@ struct AxisLabelProperties //methods: void init( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XAxis >& xAxisModel ); + ::com::sun::star::chart2::XAxis >& xAxisModel ); sal_Bool getIsStaggered() const; }; struct AxisProperties { - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis > m_xAxisModel; + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > m_xAxisModel; ::com::sun::star::awt::Size m_aReferenceSize; bool m_bIsMainAxis;//not secondary axis @@ -164,7 +164,7 @@ struct AxisProperties //methods: - AxisProperties( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis >& xAxisModel + AxisProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxisModel , const ::com::sun::star::awt::Size& rReferenceSize ); AxisProperties( const AxisProperties& rAxisProperties ); virtual ~AxisProperties(); diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 5bc0060777e1..239c38373e04 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VCartesianAxis.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: iha $ $Date: 2004-01-23 10:06:57 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,8 +70,8 @@ #include "LabelPositionHelper.hxx" #include "DoubleRectangle.hxx" -#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 INCLUDED_RTL_MATH_HXX @@ -102,7 +102,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; using namespace ::rtl::math; void lcl_correctRotation_Left( double& rfXCorrection, double& rfYCorrection @@ -403,7 +403,7 @@ class LabelIterator : private TickIter public: LabelIterator( ::std::vector< ::std::vector< TickInfo > >& rTickInfos - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement , const AxisLabelStaggering eAxisLabelStaggering , bool bInnerLine , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); @@ -420,7 +420,7 @@ private: //member }; LabelIterator::LabelIterator( ::std::vector< ::std::vector< TickInfo > >& rTickInfos - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement , const AxisLabelStaggering eAxisLabelStaggering , bool bInnerLine , sal_Int32 nMinDepth, sal_Int32 nMaxDepth ) @@ -795,7 +795,6 @@ void SAL_CALL VCartesianAxis::createShapes() double fExtraLineCrossesOtherAxis; if( getLogicValueWhereExtraLineCrossesOtherAxis(fExtraLineCrossesOtherAxis) ) { - Vector2D aStart, aEnd; this->get2DAxisMainLine( aStart, aEnd, fExtraLineCrossesOtherAxis ); drawing::PointSequenceSequence aPoints( lcl_makePointSequence(aStart,aEnd) ); uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index 0f9b4c79ec3c..984ab8e835e6 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VCartesianAxis.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:34 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,7 +101,7 @@ public: /* virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); */ virtual void SAL_CALL createShapes(); diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 135d1a8be602..11c6f5939923 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VCartesianCoordinateSystem.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:34 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,7 +70,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; VCartesianCoordinateSystem::VCartesianCoordinateSystem( const uno::Reference< XBoundedCoordinateSystem >& xCooSys ) : VCoordinateSystem(xCooSys) diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx index 7f073a94971b..e180777f0aaa 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VCartesianCoordinateSystem.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:56 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ class VCartesianCoordinateSystem : public VCoordinateSystem { public: VCartesianCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSys ); + ::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSys ); virtual ~VCartesianCoordinateSystem(); virtual void createGridShapes(); diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 4b238c13f4d3..2da94f7da7e9 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VCartesianGrid.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:35 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,8 @@ #include "macros.hxx" #include "CommonConverters.hxx" -#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_DRAWING_POINTSEQUENCESEQUENCE_HPP_ #include <com/sun/star/drawing/PointSequenceSequence.hpp> @@ -84,7 +84,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; struct GridLinePoints { diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx index 010a30a4f2c0..66c2db5065c5 100644 --- a/chart2/source/view/axes/VCartesianGrid.hxx +++ b/chart2/source/view/axes/VCartesianGrid.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VCartesianGrid.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:57 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,8 +64,8 @@ #include "VMeterBase.hxx" #include "VLineProperties.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XGRID_HPP_ -#include <drafts/com/sun/star/chart2/XGrid.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRID_HPP_ +#include <com/sun/star/chart2/XGrid.hpp> #endif //............................................................................. @@ -84,7 +84,7 @@ class VCartesianGrid : public VMeterBase //------------------------------------------------------------------------- public: VCartesianGrid( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid >& xGrid + ::com::sun::star::chart2::XGrid >& xGrid , sal_Int32 nDimensionCount ); virtual ~VCartesianGrid(); diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 6b48d8397c28..0a06f51a6a76 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VCoordinateSystem.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:57 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:11 $ * * 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; //static VCoordinateSystem* VCoordinateSystem::createCoordinateSystem( const uno::Reference< diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx index be9e6d9edab0..e1abeb8eddcc 100644 --- a/chart2/source/view/axes/VPolarAxis.cxx +++ b/chart2/source/view/axes/VPolarAxis.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VPolarAxis.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: iha $ $Date: 2004-01-23 10:06:59 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -87,8 +87,8 @@ #ifndef _COM_SUN_STAR_TEXT_XTEXT_HPP_ #include <com/sun/star/text/XText.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 _SVX_UNOPRNMS_HXX @@ -103,7 +103,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; using namespace ::rtl::math; VPolarAxis::VPolarAxis( const AxisProperties& rAxisProperties diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx index b4620415094f..e058a4a6d252 100644 --- a/chart2/source/view/axes/VPolarAxis.hxx +++ b/chart2/source/view/axes/VPolarAxis.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VPolarAxis.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:35 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,7 +88,7 @@ public: virtual void SAL_CALL createShapes(); void setIncrements( const ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitIncrementData >& rIncrements ); + ::com::sun::star::chart2::ExplicitIncrementData >& rIncrements ); private: //methods void create2DAngleAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget, ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ); @@ -99,7 +99,7 @@ private: //member NumberFormatterWrapper* m_pNumberFormatterWrapper; PolarPlottingPositionHelper* m_pPosHelper; ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitIncrementData > m_aIncrements; + ::com::sun::star::chart2::ExplicitIncrementData > m_aIncrements; }; //............................................................................. diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx index 30f478e740a7..3f0d57348fd0 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VPolarCoordinateSystem.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: iha $ $Date: 2004-01-22 19:20:35 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,7 +67,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; VPolarCoordinateSystem::VPolarCoordinateSystem( const uno::Reference< XBoundedCoordinateSystem >& xCooSys ) : VCoordinateSystem(xCooSys) diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.hxx b/chart2/source/view/axes/VPolarCoordinateSystem.hxx index 61ba559fad76..92ae04e70c17 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.hxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VPolarCoordinateSystem.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:09:59 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ class VPolarCoordinateSystem : public VCoordinateSystem { public: VPolarCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSys ); + ::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSys ); virtual ~VPolarCoordinateSystem(); virtual void createGridShapes(); diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index e434629294c8..8482bc9b4b6e 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VPolarGrid.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: iha $ $Date: 2004-01-23 16:35:28 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,8 +67,8 @@ #include "macros.hxx" #include "CommonConverters.hxx" -#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_DRAWING_LINESTYLE_HPP_ #include <com/sun/star/drawing/LineStyle.hpp> @@ -82,7 +82,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; VPolarGrid::VPolarGrid( const uno::Reference< XGrid >& xGrid, sal_Int32 nDimensionCount ) : VMeterBase( uno::Reference<XMeter>::query(xGrid), nDimensionCount ) diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index 92f463f78dbf..707bba14fc24 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VPolarGrid.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:00 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:13 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,8 +65,8 @@ #include "TickmarkHelper.hxx" #include "VLineProperties.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XGRID_HPP_ -#include <drafts/com/sun/star/chart2/XGrid.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRID_HPP_ +#include <com/sun/star/chart2/XGrid.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_POINTSEQUENCESEQUENCE_HPP_ @@ -90,27 +90,27 @@ class VPolarGrid : public VMeterBase //------------------------------------------------------------------------- public: VPolarGrid( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid >& xGrid + ::com::sun::star::chart2::XGrid >& xGrid , sal_Int32 nDimensionCount ); virtual ~VPolarGrid(); virtual void SAL_CALL createShapes(); void setIncrements( const ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitIncrementData >& rIncrements ); + ::com::sun::star::chart2::ExplicitIncrementData >& rIncrements ); static void createLinePointSequence_ForAngleAxis( ::com::sun::star::drawing::PointSequenceSequence& rPoints , ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos - , const ::drafts::com::sun::star::chart2::ExplicitIncrementData& rIncrement - , const ::drafts::com::sun::star::chart2::ExplicitScaleData& rScale + , const ::com::sun::star::chart2::ExplicitIncrementData& rIncrement + , const ::com::sun::star::chart2::ExplicitScaleData& rScale , PolarPlottingPositionHelper* pPosHelper , double fLogicRadius, double fLogicZ ); private: //member PolarPlottingPositionHelper* m_pPosHelper; ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitIncrementData > m_aIncrements; + ::com::sun::star::chart2::ExplicitIncrementData > m_aIncrements; void getAllTickInfos( sal_Int32 nDimensionIndex, ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 4790069a0115..aa3677d632d7 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -12,8 +12,8 @@ #include "LabelPositionHelper.hxx" #include "Clipping.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOL_HPP_ -#include <drafts/com/sun/star/chart2/Symbol.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOL_HPP_ +#include <com/sun/star/chart2/Symbol.hpp> #endif #ifndef _TOOLS_DEBUG_HXX @@ -46,7 +46,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; using namespace ::rtl::math; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 111923895d9d..58ee79e5be4c 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -3,8 +3,8 @@ #include "VSeriesPlotter.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ -#include <drafts/com/sun/star/chart2/CurveStyle.hpp> +#ifndef _COM_SUN_STAR_CHART2_CURVESTYLE_HPP_ +#include <com/sun/star/chart2/CurveStyle.hpp> #endif //............................................................................. @@ -20,7 +20,7 @@ class AreaChart : public VSeriesPlotter //------------------------------------------------------------------------- public: AreaChart( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType >& xChartTypeModel + ::com::sun::star::chart2::XChartType >& xChartTypeModel , bool bCategoryXAxis, bool bNoArea=false , PlottingPositionHelper* pPlottingPositionHelper=NULL //takes owner ship ); @@ -33,8 +33,8 @@ public: virtual void SAL_CALL createShapes(); /* virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); */ virtual void addSeries( VDataSeries* pSeries, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); @@ -67,7 +67,7 @@ private: //member bool m_bSymbol; //Properties for splines: - ::drafts::com::sun::star::chart2::CurveStyle m_eCurveStyle; + ::com::sun::star::chart2::CurveStyle m_eCurveStyle; sal_Int32 m_nCurveResolution; sal_Int32 m_nSplineOrder; diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 9a665c6e51be..74c880bcd8a0 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -21,8 +21,8 @@ // #define TRANSP_GRADIENT_HACK 1 #ifdef TRANSP_GRADIENT_HACK -# 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 _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ # include <com/sun/star/container/XNameContainer.hpp> @@ -35,7 +35,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; using namespace ::rtl::math; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; class BarPositionHelper : public CategoryPositionHelper, public PlottingPositionHelper { @@ -43,7 +43,7 @@ public: BarPositionHelper( double fSeriesCount=0 ); //@todo virtual ~BarPositionHelper(); - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > getTransformationLogicToScene() const; void updateSeriesCount( double fSeriesCount ); /*only enter the size of x stacked series*/ @@ -232,9 +232,9 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint2D_Bar( // FillTransparenceGradientName to an empty string // Note: TransparencyStyle should become a new property in FillProperties // (FillTransparenceStyle) - ::drafts::com::sun::star::chart2::TransparencyStyle aTransStyle; + ::com::sun::star::chart2::TransparencyStyle aTransStyle; xObjectProperties->getPropertyValue( C2U( "TransparencyStyle" )) >>= aTransStyle; - if( aTransStyle != ::drafts::com::sun::star::chart2::TransparencyStyle_GRADIENT ) + if( aTransStyle != ::com::sun::star::chart2::TransparencyStyle_GRADIENT ) { xProp->setPropertyValue( C2U( "FillTransparenceGradientName" ), uno::makeAny( ::rtl::OUString())); diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index f0ab7008a7e3..6d337919b278 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -23,7 +23,7 @@ class BarChart : public VSeriesPlotter //------------------------------------------------------------------------- public: BarChart( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType >& xChartTypeModel ); + ::com::sun::star::chart2::XChartType >& xChartTypeModel ); virtual ~BarChart(); //------------------------------------------------------------------------- @@ -33,8 +33,8 @@ public: virtual void SAL_CALL createShapes(); /* virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); */ //------------------------------------------------------------------------- diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/chart2/source/view/charttypes/CategoryPositionHelper.cxx index bb6001be36f8..42ce0df69276 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx @@ -7,7 +7,7 @@ namespace chart { //............................................................................. //using namespace ::com::sun::star; -//using namespace ::drafts::com::sun::star::chart2; +//using namespace ::com::sun::star::chart2; CategoryPositionHelper::CategoryPositionHelper( double fSeriesCount, double fCategoryWidth ) : m_fSeriesCount(fSeriesCount) diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 41dd3b097598..486f8f26b706 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -21,7 +21,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; class PiePositionHelper : public PolarPlottingPositionHelper { diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index d6aa084d957e..e0d002e01cc1 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -16,7 +16,7 @@ class PieChart : public VSeriesPlotter //------------------------------------------------------------------------- public: PieChart( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType >& xChartTypeModel + ::com::sun::star::chart2::XChartType >& xChartTypeModel , double fRadiusOffset=0.0, double fRingDistance=0.0 ); virtual ~PieChart(); @@ -27,8 +27,8 @@ public: virtual void SAL_CALL createShapes(); /* virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); */ virtual void addSeries( VDataSeries* pSeries, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index df68f1357455..70a76eceaa08 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -16,11 +16,11 @@ #include "AreaChart.hxx" // -#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 _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 _SVX_UNOPRNMS_HXX @@ -48,7 +48,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index b4c29ce9ef61..3831db937938 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VDiagram.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: iha $ $Date: 2003-12-04 16:00:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -85,8 +85,8 @@ #ifndef _COM_SUN_STAR_DRAWING_SHADEMODE_HPP_ #include <com/sun/star/drawing/ShadeMode.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SCENEDESCRIPTOR_HPP_ -#include <drafts/com/sun/star/chart2/SceneDescriptor.hpp> +#ifndef _COM_SUN_STAR_CHART2_SCENEDESCRIPTOR_HPP_ +#include <com/sun/star/chart2/SceneDescriptor.hpp> #endif @@ -113,7 +113,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; VDiagram::VDiagram( const uno::Reference< XDiagram > & xDiagram, @@ -466,7 +466,7 @@ void VDiagram::createShapes_3d( const awt::Point& rPos, const awt::Size& rReserv //------------------------------------------------------------------------- //create additional group to manipulate the aspect ratio of the whole diagram: { - uno::Reference< beans::XPropertySet > xProp( xOuterGroup_Shapes, uno::UNO_QUERY ); + xProp.set( xOuterGroup_Shapes, uno::UNO_QUERY ); DBG_ASSERT(xProp.is(), "created shape offers no XPropertySet"); if( xProp.is()) { diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx index 7fe7bb652cf9..6d2cab88fd86 100644 --- a/chart2/source/view/inc/Linear3DTransformation.hxx +++ b/chart2/source/view/inc/Linear3DTransformation.hxx @@ -2,9 +2,9 @@ * * $RCSfile: Linear3DTransformation.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:33 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:20 $ * * 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_XTRANSFORMATION_HPP_ -#include <drafts/com/sun/star/chart2/XTransformation.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTRANSFORMATION_HPP_ +#include <com/sun/star/chart2/XTransformation.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_HOMOGENMATRIX_HPP_ @@ -77,7 +77,7 @@ namespace chart { class Linear3DTransformation : public ::cppu::WeakImplHelper1< - ::drafts::com::sun::star::chart2::XTransformation + ::com::sun::star::chart2::XTransformation > { public: @@ -85,15 +85,15 @@ public: virtual ~Linear3DTransformation(); // ____ XTransformation ____ - /// @see ::drafts::com::sun::star::chart2::XTransformation + /// @see ::com::sun::star::chart2::XTransformation virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( const ::com::sun::star::uno::Sequence< double >& rSourceValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart2::XTransformation + /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() throw (::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart2::XTransformation + /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() throw (::com::sun::star::uno::RuntimeException); diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index c81e70c6406a..bc95fd1a04cb 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -2,9 +2,9 @@ * * $RCSfile: PlotterBase.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: iha $ $Date: 2004-01-23 14:48:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,15 +89,15 @@ #include <vector> //---- chart2 -#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_XTRANSFORMATION_HPP_ -#include <drafts/com/sun/star/chart2/XTransformation.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTRANSFORMATION_HPP_ +#include <com/sun/star/chart2/XTransformation.hpp> #endif /* #ifndef _COM_SUN_STAR_CHART2_XPLOTTER_HPP_ -#include <drafts/com/sun/star/chart2/XPlotter.hpp> +#include <com/sun/star/chart2/XPlotter.hpp> #endif */ @@ -136,7 +136,7 @@ public: virtual void SAL_CALL setScales( const ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitScaleData >& rScales ) + ::com::sun::star::chart2::ExplicitScaleData >& rScales ) throw (::com::sun::star::uno::RuntimeException); void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); @@ -145,7 +145,7 @@ public: /* virtual ::rtl::OUString SAL_CALL getCoordinateSystemTypeID( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTransformation( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToLogicTarget, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation >& xTransformationToFinalPage ) throw (::com::sun::star::uno::RuntimeException); */ //------------------------------------------------------------------------- diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 1092d54798b6..37ac7a791041 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: PlottingPositionHelper.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: iha $ $Date: 2004-01-23 14:48:23 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,11 +63,11 @@ #include "DoubleRectangle.hxx" -#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_XTRANSFORMATION_HPP_ -#include <drafts/com/sun/star/chart2/XTransformation.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTRANSFORMATION_HPP_ +#include <com/sun/star/chart2/XTransformation.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_HOMOGENMATRIX_HPP_ @@ -107,15 +107,15 @@ public: void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix); void setScales( const ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitScaleData >& rScales ); + ::com::sun::star::chart2::ExplicitScaleData >& rScales ); const ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitScaleData >& getScales() const; + ::com::sun::star::chart2::ExplicitScaleData >& getScales() const; inline bool isLogicVisible( double fX, double fY, double fZ ) const; inline void doLogicScaling( double* pX, double* pY, double* pZ ) const; inline void clipLogicValues( double* pX, double* pY, double* pZ ) const; - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > getTransformationLogicToScene() const; virtual ::com::sun::star::drawing::Position3D @@ -138,25 +138,25 @@ public: protected: //member ::com::sun::star::uno::Sequence< - ::drafts::com::sun::star::chart2::ExplicitScaleData > m_aScales; + ::com::sun::star::chart2::ExplicitScaleData > m_aScales; Matrix4D m_aMatrixScreenToScene; //this is calculated based on m_aScales and m_aMatrixScreenToScene mutable ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTransformation > m_xTransformationLogicToScene; + ::com::sun::star::chart2::XTransformation > m_xTransformationLogicToScene; }; class PolarPlottingPositionHelper : public PlottingPositionHelper /* , public ::cppu::WeakImplHelper1< - ::drafts::com::sun::star::chart2::XTransformation > + ::com::sun::star::chart2::XTransformation > */ { public: PolarPlottingPositionHelper( bool bRadiusAxisMapsToFirstDimension ); virtual ~PolarPlottingPositionHelper(); - virtual ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XTransformation > + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > getTransformationLogicToScene() const; //the resulting values should be used for input to the transformation @@ -176,15 +176,15 @@ public: /* // ____ XTransformation ____ - /// @see ::drafts::com::sun::star::chart2::XTransformation + /// @see ::com::sun::star::chart2::XTransformation virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( const ::com::sun::star::uno::Sequence< double >& rSourceValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart2::XTransformation + /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() throw (::com::sun::star::uno::RuntimeException); - /// @see ::drafts::com::sun::star::chart2::XTransformation + /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() throw (::com::sun::star::uno::RuntimeException); */ @@ -269,15 +269,15 @@ inline double PlottingPositionHelper::getLogicMaxZ() const } inline bool PlottingPositionHelper::isMathematicalOrientationX() const { - return ::drafts::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[0].Orientation; + return ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[0].Orientation; } inline bool PlottingPositionHelper::isMathematicalOrientationY() const { - return ::drafts::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[1].Orientation; + return ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[1].Orientation; } inline bool PlottingPositionHelper::isMathematicalOrientationZ() const { - return ::drafts::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[2].Orientation; + return ::com::sun::star::chart2::AxisOrientation_MATHEMATICAL == m_aScales[2].Orientation; } //............................................................................. diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 2d395124726a..bddd4e09a0a1 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VCoordinateSystem.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:04 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,17 +61,17 @@ #ifndef _CHART2_VCOORDINATESYSTEM_HXX #define _CHART2_VCOORDINATESYSTEM_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_XAXIS_HPP_ -#include <drafts/com/sun/star/chart2/XAxis.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXIS_HPP_ +#include <com/sun/star/chart2/XAxis.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XGRID_HPP_ -#include <drafts/com/sun/star/chart2/XGrid.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRID_HPP_ +#include <com/sun/star/chart2/XGrid.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_HOMOGENMATRIX_HPP_ @@ -83,8 +83,8 @@ #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #endif -// #ifndef _DRAFTS_COM_SUN_STAR_CHART2_XBOUNDEDCOORDINATESYSTEMCONTAINER_HPP_ -// #include <drafts/com/sun/star/chart2/XBoundedCoordinateSystemContainer.hpp> +// #ifndef _COM_SUN_STAR_CHART2_XBOUNDEDCOORDINATESYSTEMCONTAINER_HPP_ +// #include <com/sun/star/chart2/XBoundedCoordinateSystemContainer.hpp> // #endif //............................................................................. @@ -104,7 +104,7 @@ public: virtual ~VCoordinateSystem(); static VCoordinateSystem* createCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSysModel ); + ::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSysModel ); virtual void SAL_CALL initPlottingTargets( const ::com::sun::star::uno::Reference< @@ -115,18 +115,18 @@ public: ::com::sun::star::lang::XMultiServiceFactory >& xFactory ) throw (::com::sun::star::uno::RuntimeException); void setOrigin( double* fCoordinateOrigin ); - void addAxis( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis >& xAxis ); - void addGrid( const ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XGrid >& xGrid ); + void addAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); + void addGrid( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XGrid >& xGrid ); void doAutoScale( MinimumAndMaximumSupplier* pMinMaxSupplier ); void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); - const ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitScaleData >& getExplicitScales() const {return m_aExplicitScales;} - const ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitIncrementData >& getExplicitIncrements() const {return m_aExplicitIncrements;} + const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData >& getExplicitScales() const {return m_aExplicitScales;} + const ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitIncrementData >& getExplicitIncrements() const {return m_aExplicitIncrements;} double getOriginByDimension( sal_Int32 nDim ) const { return m_fCoordinateOrigin[nDim]; } ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > + ::com::sun::star::chart2::XBoundedCoordinateSystem > getModel() const; virtual void createGridShapes(); @@ -134,35 +134,35 @@ public: protected: //methods VCoordinateSystem( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSys ); + ::com::sun::star::chart2::XBoundedCoordinateSystem >& xCooSys ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XGrid > >& + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XGrid > >& getGridListByDimension( sal_Int32 nDim ); - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > getAxisByDimension( sal_Int32 nDim ) const; protected: //member ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XBoundedCoordinateSystem > m_xCooSysModel; + ::com::sun::star::chart2::XBoundedCoordinateSystem > m_xCooSysModel; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis > m_xAxis0; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis > m_xAxis1; - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XAxis > m_xAxis2; + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > m_xAxis0; + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > m_xAxis1; + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > m_xAxis2; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid > > m_xGridList0; + ::com::sun::star::chart2::XGrid > > m_xGridList0; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid > > m_xGridList1; + ::com::sun::star::chart2::XGrid > > m_xGridList1; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XGrid > > m_xGridList2; + ::com::sun::star::chart2::XGrid > > m_xGridList2; double m_fCoordinateOrigin[3]; - ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitScaleData > m_aExplicitScales; - ::com::sun::star::uno::Sequence< ::drafts::com::sun::star::chart2::ExplicitIncrementData > m_aExplicitIncrements; + ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitScaleData > m_aExplicitScales; + ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::ExplicitIncrementData > m_aExplicitIncrements; // ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 20d895eab9c9..464e6b8074e9 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VDataSeries.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: iha $ $Date: 2004-01-06 19:39:20 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,20 +67,20 @@ //for auto_ptr #include <memory> -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ -#include <drafts/com/sun/star/chart2/DataPointLabel.hpp> +#ifndef _COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ +#include <com/sun/star/chart2/DataPointLabel.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOL_HPP_ -#include <drafts/com/sun/star/chart2/Symbol.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOL_HPP_ +#include <com/sun/star/chart2/Symbol.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 -#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_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 _COM_SUN_STAR_DRAWING_HOMOGENMATRIX_HPP_ #include <com/sun/star/drawing/HomogenMatrix.hpp> @@ -109,10 +109,10 @@ class VDataSeries { public: VDataSeries( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries >& xDataSeries ); + ::com::sun::star::chart2::XDataSeries >& xDataSeries ); virtual ~VDataSeries(); - ::com::sun::star::uno::Reference< ::drafts::com::sun::star::chart2::XDataSeries > + ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > getModel() const; void setCategoryXAxis(); @@ -132,7 +132,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getPropertiesOfSeries() const; - ::drafts::com::sun::star::chart2::Symbol* + ::com::sun::star::chart2::Symbol* getSymbolProperties( sal_Int32 index ) const; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; @@ -160,33 +160,33 @@ public: rtl::OUString getLabelCID_Stub() const; rtl::OUString getDataCurveCID( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xDataCurveModelProp ) const; - ::drafts::com::sun::star::chart2::DataPointLabel* + ::com::sun::star::chart2::DataPointLabel* getDataPointLabelIfLabel( sal_Int32 index ) const; bool getTextLabelMultiPropertyLists( sal_Int32 index, tNameSequence*& pPropNames, tAnySequence*& pPropValues ) const; private: //methods VDataSeries(); bool isAttributedDataPoint( sal_Int32 index ) const; - ::drafts::com::sun::star::chart2::DataPointLabel* + ::com::sun::star::chart2::DataPointLabel* getDataPointLabel( sal_Int32 index ) const; private: //member ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSeries > m_xDataSeries; + ::com::sun::star::chart2::XDataSeries > m_xDataSeries; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSequence > > m_aDataSequences; + ::com::sun::star::chart2::XDataSequence > > m_aDataSequences; //all points given by the model data (here are not only the visible points meant) sal_Int32 m_nPointCount; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSequence > m_xData_XValues; + ::com::sun::star::chart2::XDataSequence > m_xData_XValues; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSequence > m_xData_YValues; + ::com::sun::star::chart2::XDataSequence > m_xData_YValues; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDataSequence > m_xData_ZValues; + ::com::sun::star::chart2::XDataSequence > m_xData_ZValues; mutable ::com::sun::star::uno::Sequence< double > m_XValues_Double; ::com::sun::star::uno::Sequence< double > m_YValues_Double; @@ -199,20 +199,20 @@ private: //member rtl::OUString m_aLabelCID_Stub; //some cached values for data labels as they are very expensive - mutable ::std::auto_ptr< ::drafts::com::sun::star::chart2::DataPointLabel > + mutable ::std::auto_ptr< ::com::sun::star::chart2::DataPointLabel > m_apLabel_Series; mutable ::std::auto_ptr< tNameSequence > m_apLabelPropNames_Series; mutable ::std::auto_ptr< tAnySequence > m_apLabelPropValues_Series; - mutable ::std::auto_ptr< ::drafts::com::sun::star::chart2::DataPointLabel > + mutable ::std::auto_ptr< ::com::sun::star::chart2::DataPointLabel > m_apLabel_AttributedPoint; mutable ::std::auto_ptr< tNameSequence > m_apLabelPropNames_AttributedPoint; mutable ::std::auto_ptr< tAnySequence > m_apLabelPropValues_AttributedPoint; mutable sal_Int32 m_nCurrentAttributedPoint; - mutable ::std::auto_ptr< ::drafts::com::sun::star::chart2::Symbol > + mutable ::std::auto_ptr< ::com::sun::star::chart2::Symbol > m_apSymbolProperties_Series; - mutable ::std::auto_ptr< ::drafts::com::sun::star::chart2::Symbol > + mutable ::std::auto_ptr< ::com::sun::star::chart2::Symbol > m_apSymbolProperties_AttributedPoint; // }; diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index c3d27bd711a5..54eaef7f3592 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VDiagram.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2003-12-04 15:59:18 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,8 @@ #include <com/sun/star/drawing/XShapes.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 _CHART2_VIEW_SHAPEFACTORY_HXX @@ -94,7 +94,7 @@ class VDiagram { public: //methods VDiagram( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > & xDiagram, + ::com::sun::star::chart2::XDiagram > & xDiagram, sal_Int32 nDimension=3, sal_Bool bPolar=sal_False); virtual ~VDiagram(); @@ -138,7 +138,7 @@ private: //members sal_Int32 m_nDimension; sal_Bool m_bPolar; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XDiagram > m_xDiagram; + ::com::sun::star::chart2::XDiagram > m_xDiagram; }; //............................................................................. diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 8df204eff32e..416704898b77 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VSeriesPlotter.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:05 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,8 @@ #include "PropertyMapper.hxx" #include "LabelAlignment.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 //............................................................................. @@ -182,7 +182,7 @@ public: static sal_Int32 getPointCount( const ::std::vector< VDataSeriesGroup >& rSlots ); static VSeriesPlotter* createSeriesPlotter( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType >& xChartTypeModel ); + ::com::sun::star::chart2::XChartType >& xChartTypeModel ); //------------------------------------------------------------------------- //------------------------------------------------------------------------- @@ -194,7 +194,7 @@ private: //methods protected: //methods VSeriesPlotter( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType >& xChartTypeModel + ::com::sun::star::chart2::XChartType >& xChartTypeModel , bool bCategoryXAxis=true ); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > @@ -279,7 +279,7 @@ protected: //methods protected: //member ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XChartType > m_xChartTypeModel; + ::com::sun::star::chart2::XChartType > m_xChartTypeModel; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xChartTypeModelProps; diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 29368d198ee4..4e1d758ad9a5 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -2,9 +2,9 @@ * * $RCSfile: ChartView.cxx,v $ * - * $Revision: 1.31 $ + * $Revision: 1.32 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:06 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,39 +74,39 @@ #include "ChartModelHelper.hxx" #include "ChartTypeHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_EXPLICITSUBINCREMENT_HPP_ -#include <drafts/com/sun/star/chart2/ExplicitSubIncrement.hpp> +#ifndef _COM_SUN_STAR_CHART2_EXPLICITSUBINCREMENT_HPP_ +#include <com/sun/star/chart2/ExplicitSubIncrement.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XAxisContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XAXISCONTAINER_HPP_ +#include <com/sun/star/chart2/XAxisContainer.hpp> #endif -#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 -#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 _DRAFTS_COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ -#include <drafts/com/sun/star/chart2/XGridContainer.hpp> +#ifndef _COM_SUN_STAR_CHART2_XGRIDCONTAINER_HPP_ +#include <com/sun/star/chart2/XGridContainer.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XSTACKABLESCALEGROUP_HPP_ -#include <drafts/com/sun/star/chart2/XStackableScaleGroup.hpp> +#ifndef _COM_SUN_STAR_CHART2_XSTACKABLESCALEGROUP_HPP_ +#include <com/sun/star/chart2/XStackableScaleGroup.hpp> #endif -#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 _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ -#include <drafts/com/sun/star/layout/RelativePosition.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ +#include <com/sun/star/layout/RelativePosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVESIZE_HPP_ -#include <drafts/com/sun/star/layout/RelativeSize.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVESIZE_HPP_ +#include <com/sun/star/layout/RelativeSize.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_LINESTYLE_HPP_ @@ -119,8 +119,7 @@ namespace chart //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; ChartView::~ChartView() { @@ -538,7 +537,7 @@ bool getPosAndSizeForDiagram( uno::Reference< beans::XPropertySet > xProp(xDiagram, uno::UNO_QUERY); //size: - ::drafts::com::sun::star::layout::RelativeSize aRelativeSize; + ::com::sun::star::layout::RelativeSize aRelativeSize; if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativeSize" ) )>>=aRelativeSize) ) { rOutSize.Height = static_cast<sal_Int32>(aRelativeSize.Secondary*rPageSize.Height); @@ -548,7 +547,7 @@ bool getPosAndSizeForDiagram( rOutSize = awt::Size(nWidth,nHeight); //position: - ::drafts::com::sun::star::layout::RelativePosition aRelativePosition; + ::com::sun::star::layout::RelativePosition aRelativePosition; if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativePosition" ) )>>=aRelativePosition) ) { //@todo decide wether x is primary or secondary @@ -629,7 +628,7 @@ std::auto_ptr<VTitle> createTitle( const uno::Reference< XTitle >& xTitle awt::Point aNewPosition(0,0); sal_Int32 nYDistance = static_cast<sal_Int32>(rPageSize.Height*lcl_getPageLayoutDistancePercentage()); sal_Int32 nXDistance = static_cast<sal_Int32>(rPageSize.Width*lcl_getPageLayoutDistancePercentage()); - ::drafts::com::sun::star::layout::RelativePosition aRelativePosition; + ::com::sun::star::layout::RelativePosition aRelativePosition; uno::Reference< beans::XPropertySet > xProp(xTitle, uno::UNO_QUERY); if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativePosition" ) )>>=aRelativePosition) ) { diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx index bcfa62704dd3..a3c6936f57ef 100644 --- a/chart2/source/view/main/DataPointSymbolSupplier.cxx +++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx @@ -2,9 +2,9 @@ * * $RCSfile: DataPointSymbolSupplier.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: iha $ $Date: 2003-11-13 12:04:40 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:24 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,7 +68,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -//using namespace ::drafts::com::sun::star::chart2; +//using namespace ::com::sun::star::chart2; uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList( uno::Reference< lang::XMultiServiceFactory > xShapeFactory diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx index d548e855b197..333a2ab980b1 100644 --- a/chart2/source/view/main/LabelPositionHelper.cxx +++ b/chart2/source/view/main/LabelPositionHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: LabelPositionHelper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:06 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:25 $ * * 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; LabelPositionHelper::LabelPositionHelper( PlottingPositionHelper* pPosHelper diff --git a/chart2/source/view/main/NumberFormatterWrapper.cxx b/chart2/source/view/main/NumberFormatterWrapper.cxx index 2e4cfc9e1236..fdb2c5aa7694 100644 --- a/chart2/source/view/main/NumberFormatterWrapper.cxx +++ b/chart2/source/view/main/NumberFormatterWrapper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: NumberFormatterWrapper.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: bm $ $Date: 2003-10-06 09:58:34 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,11 +80,11 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; FixedNumberFormatter::FixedNumberFormatter( NumberFormatterWrapper* pNumberFormatterWrapper - , const ::drafts::com::sun::star::chart2::NumberFormat& rNumberFormat ) + , const ::com::sun::star::chart2::NumberFormat& rNumberFormat ) : m_pNumberFormatterWrapper(pNumberFormatterWrapper) , m_nFormatIndex(0) { diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index b17adc6b620f..f348e377c8f8 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PlotterBase.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:07 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,8 +66,8 @@ #include <rtl/math.hxx> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ -#include <drafts/com/sun/star/chart2/DataPointLabel.hpp> +#ifndef _COM_SUN_STAR_CHART2_DATAPOINTLABEL_HPP_ +#include <com/sun/star/chart2/DataPointLabel.hpp> #endif #ifndef _TOOLS_DEBUG_HXX @@ -79,7 +79,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index de63e9bf72f4..6c7920482375 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PlottingPositionHelper.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: iha $ $Date: 2004-01-23 15:21:37 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,7 +75,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; PlottingPositionHelper::PlottingPositionHelper() : m_aScales() diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx index 478a081fed30..a3d903a3e7a7 100644 --- a/chart2/source/view/main/PolarLabelPositionHelper.cxx +++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: PolarLabelPositionHelper.cxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:07 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; PolarLabelPositionHelper::PolarLabelPositionHelper( PolarPlottingPositionHelper* pPosHelper diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index a0853c523cac..62f7e1f9a9ae 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VDataSeries.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: iha $ $Date: 2004-01-17 13:10:08 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,11 +63,11 @@ #include "macros.hxx" #include "CommonConverters.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_SYMBOL_HPP_ -#include <drafts/com/sun/star/chart2/Symbol.hpp> +#ifndef _COM_SUN_STAR_CHART2_SYMBOL_HPP_ +#include <com/sun/star/chart2/Symbol.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 //#include "CommonConverters.hxx" @@ -80,8 +80,8 @@ #include <tools/debug.hxx> #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 _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> @@ -104,7 +104,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; VDataSeries::VDataSeries() { @@ -157,7 +157,7 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries ) m_xData_XValues = xDataSequence; m_XValues_Double = DataSequenceToDoubleSequence( m_xData_XValues ); } - else if( aRole.equals(C2U("values")) ) + else if( aRole.equals(C2U("y-values")) ) { m_xData_YValues = xDataSequence; m_YValues_Double = DataSequenceToDoubleSequence( m_xData_YValues ); diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 6fc5453392a9..7a5ec180a6d2 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VLegend.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: bm $ $Date: 2004-01-19 14:15:49 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,38 +75,38 @@ #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIESTREEPARENT_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeriesTreeParent.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIESTREEPARENT_HPP_ +#include <com/sun/star/chart2/XDataSeriesTreeParent.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_TEXTHORIZONTALADJUST_HPP_ #include <com/sun/star/drawing/TextHorizontalAdjust.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_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_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_DRAWING_LINEJOINT_HPP_ #include <com/sun/star/drawing/LineJoint.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_LEGENDEXPANSION_HPP_ -#include <drafts/com/sun/star/chart2/LegendExpansion.hpp> +#ifndef _COM_SUN_STAR_CHART2_LEGENDEXPANSION_HPP_ +#include <com/sun/star/chart2/LegendExpansion.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ -#include <drafts/com/sun/star/chart2/LegendPosition.hpp> +#ifndef _COM_SUN_STAR_CHART2_LEGENDPOSITION_HPP_ +#include <com/sun/star/chart2/LegendPosition.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_ANCHORPOINT_HPP_ -#include <drafts/com/sun/star/layout/AnchorPoint.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_ANCHORPOINT_HPP_ +#include <com/sun/star/layout/AnchorPoint.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ -#include <drafts/com/sun/star/layout/RelativePosition.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_RELATIVEPOSITION_HPP_ +#include <com/sun/star/layout/RelativePosition.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 // header for class Matrix3D @@ -123,7 +123,6 @@ #include <vector> using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; //............................................................................. namespace chart @@ -931,7 +930,7 @@ void VLegend::changePosition( bool bAutoPosition = true; double fPrimaryOffset=0.02;// shift legend about 2% into the primary direction by default double fSecondaryOffset=0.0; - ::drafts::com::sun::star::layout::RelativePosition aRelativePosition; + ::com::sun::star::layout::RelativePosition aRelativePosition; if( (xLegendProp->getPropertyValue( C2U( "RelativePosition" ) )>>=aRelativePosition) ) { fPrimaryOffset = aRelativePosition.Primary; diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx index 7d005175d034..ef2117c9fa2d 100644 --- a/chart2/source/view/main/VLegend.hxx +++ b/chart2/source/view/main/VLegend.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VLegend.hxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: bm $ $Date: 2003-12-17 16:43:21 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,8 @@ #ifndef _VLEGEND_HXX #define _VLEGEND_HXX -#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_DRAWING_XSHAPES_HPP_ #include <com/sun/star/drawing/XShapes.hpp> @@ -73,11 +73,11 @@ #ifndef _COM_SUN_STAR_AWT_RECTANGLE_HPP_ #include <com/sun/star/awt/Rectangle.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XDATASERIESTREEPARENT_HPP_ -#include <drafts/com/sun/star/chart2/XDataSeriesTreeParent.hpp> +#ifndef _COM_SUN_STAR_CHART2_XDATASERIESTREEPARENT_HPP_ +#include <com/sun/star/chart2/XDataSeriesTreeParent.hpp> #endif -#ifndef _DRAFTS_COM_SUN_STAR_LAYOUT_ALIGNMENT_HPP_ -#include <drafts/com/sun/star/layout/Alignment.hpp> +#ifndef _COM_SUN_STAR_LAYOUT_ALIGNMENT_HPP_ +#include <com/sun/star/layout/Alignment.hpp> #endif #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include <com/sun/star/frame/XModel.hpp> @@ -96,7 +96,7 @@ class VLegend { public: VLegend( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend > & xLegend ); + ::com::sun::star::chart2::XLegend > & xLegend ); void SAL_CALL init( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTargetPage, @@ -123,7 +123,7 @@ public: static bool isVisible( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend > & xLegend ); + ::com::sun::star::chart2::XLegend > & xLegend ); private: ::com::sun::star::uno::Reference< @@ -131,7 +131,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XLegend > m_xLegend; + ::com::sun::star::chart2::XLegend > m_xLegend; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index efeb70bfa3ad..c372e946bd43 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VLegendSymbolFactory.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: bm $ $Date: 2003-12-17 16:43:22 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -73,7 +73,6 @@ // #define DISABLE_DASHES_AT_BORDER using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star; namespace { diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index 9caee5556ebd..0e7e24810bfa 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -2,9 +2,9 @@ * * $RCSfile: VTitle.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: iha $ $Date: 2003-12-12 20:07:51 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,11 +66,11 @@ #include "chartview/ObjectIdentifier.hxx" #include "RelativeSizeHelper.hxx" -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XFORMATTEDSTRING_HPP_ -#include <drafts/com/sun/star/chart2/XFormattedString.hpp> +#ifndef _COM_SUN_STAR_CHART2_XFORMATTEDSTRING_HPP_ +#include <com/sun/star/chart2/XFormattedString.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 // header for class Matrix3D @@ -106,7 +106,7 @@ namespace chart { //............................................................................. using namespace ::com::sun::star; -using namespace ::drafts::com::sun::star::chart2; +using namespace ::com::sun::star::chart2; VTitle::VTitle( const uno::Reference< XTitle > & xTitle , double fAdditionalRotationAngleDegree ) diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx index 4cdb09b79e75..e80ddf6d4b07 100644 --- a/chart2/source/view/main/VTitle.hxx +++ b/chart2/source/view/main/VTitle.hxx @@ -2,9 +2,9 @@ * * $RCSfile: VTitle.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: iha $ $Date: 2003-12-12 20:07:24 $ + * last change: $Author: bm $ $Date: 2004-01-26 09:13:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -61,8 +61,8 @@ #ifndef _CHART2_VTITLE_HXX #define _CHART2_VTITLE_HXX -#ifndef _DRAFTS_COM_SUN_STAR_CHART2_XTITLE_HPP_ -#include <drafts/com/sun/star/chart2/XTitle.hpp> +#ifndef _COM_SUN_STAR_CHART2_XTITLE_HPP_ +#include <com/sun/star/chart2/XTitle.hpp> #endif #ifndef _COM_SUN_STAR_DRAWING_XSHAPES_HPP_ @@ -85,7 +85,7 @@ class VTitle { public: VTitle( const ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > & xTitle + ::com::sun::star::chart2::XTitle > & xTitle , double fAdditionalRotationAngleDegree=0.0 ); //the shape will be rotated by the sum of this value and the rotation given by the title model virtual ~VTitle(); @@ -105,7 +105,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory; ::com::sun::star::uno::Reference< - ::drafts::com::sun::star::chart2::XTitle > m_xTitle; + ::com::sun::star::chart2::XTitle > m_xTitle; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xShape; |