diff options
Diffstat (limited to 'chart2/source/view/axes')
18 files changed, 98 insertions, 99 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; |