diff options
Diffstat (limited to 'chart2/source/view/axes')
| -rw-r--r-- | chart2/source/view/axes/ScaleAutomatism.cxx | 7 | ||||
| -rw-r--r-- | chart2/source/view/axes/TickmarkHelper.cxx | 21 | ||||
| -rw-r--r-- | chart2/source/view/axes/TickmarkHelper.hxx | 5 | ||||
| -rw-r--r-- | chart2/source/view/axes/VCoordinateSystem.cxx | 19 | ||||
| -rw-r--r-- | chart2/source/view/axes/VPolarGrid.cxx | 5 | ||||
| -rw-r--r-- | chart2/source/view/axes/VPolarGrid.hxx | 4 |
6 files changed, 15 insertions, 46 deletions
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index 9f24b193276e..29e4fc0d06da 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ScaleAutomatism.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.24.1 $ * * This file is part of OpenOffice.org. * @@ -185,6 +185,11 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement( } } +ScaleData ScaleAutomatism::getScale() const +{ + return m_aSourceScale; +} + // private -------------------------------------------------------------------- void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory( diff --git a/chart2/source/view/axes/TickmarkHelper.cxx b/chart2/source/view/axes/TickmarkHelper.cxx index 3202b6311476..25de4dc61864 100644 --- a/chart2/source/view/axes/TickmarkHelper.cxx +++ b/chart2/source/view/axes/TickmarkHelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TickmarkHelper.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.8.1 $ * * This file is part of OpenOffice.org. * @@ -344,11 +344,6 @@ double TickmarkHelper::getMaximumAtIncrement( double fMax, const ExplicitIncreme return fRet; } -double TickmarkHelper::getScaledWidth() const -{ - return m_fScaledVisibleMax - m_fScaledVisibleMin; -} - //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -557,20 +552,6 @@ bool TickmarkHelper::isVisible( double fScaledValue ) const return true; } -bool TickmarkHelper::isPostEquidistant( sal_Int32 nDepth ) const -{ - if( nDepth<0 || nDepth>m_rIncrement.SubIncrements.getLength() ) - { - DBG_ERROR("invalid depth for tickmark"); - return true; - } - - if( nDepth==0 ) - return m_rIncrement.PostEquidistant; - - return m_rIncrement.SubIncrements[nDepth-1].PostEquidistant; -} - void TickmarkHelper::getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const { uno::Sequence< uno::Sequence< double > > aAllTicks; diff --git a/chart2/source/view/axes/TickmarkHelper.hxx b/chart2/source/view/axes/TickmarkHelper.hxx index 4e758aa0ceb5..287635ee9487 100644 --- a/chart2/source/view/axes/TickmarkHelper.hxx +++ b/chart2/source/view/axes/TickmarkHelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: TickmarkHelper.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.24.1 $ * * This file is part of OpenOffice.org. * @@ -156,14 +156,11 @@ public: void getAllTicks( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; void getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; - bool isPostEquidistant( sal_Int32 nDepth ) const; // 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; - protected: //methods void addSubTicks( sal_Int32 nDepth, ::com::sun::star::uno::Sequence< diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index b152210134ea..6e43ebc75b67 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: VCoordinateSystem.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.36.1 $ * * This file is part of OpenOffice.org. * @@ -333,23 +333,6 @@ ExplicitIncrementData VCoordinateSystem::getExplicitIncrement( sal_Int32 nDimens return aRet; } -sal_Int32 VCoordinateSystem::getMaximumIncrementIndexByDimension( sal_Int32 nDimensionIndex ) const -{ - sal_Int32 nRet = 0; - tFullExplicitIncrementMap::const_iterator aIt = m_aSecondaryExplicitIncrements.begin(); - tFullExplicitIncrementMap::const_iterator aEnd = m_aSecondaryExplicitIncrements.end(); - for(; aIt!=aEnd; ++aIt) - { - if(aIt->first.first==nDimensionIndex) - { - sal_Int32 nLocalIdx = aIt->first.second; - if( nRet < nLocalIdx ) - nRet = nLocalIdx; - } - } - return nRet; -} - rtl::OUString VCoordinateSystem::createCIDForAxis( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) { rtl::OUString aAxisParticle( ObjectIdentifier::createParticleForAxis( nDimensionIndex, nAxisIndex ) ); diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index 770f8791f372..f9278b94b245 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: VPolarGrid.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.44.1 $ * * This file is part of OpenOffice.org. * @@ -117,7 +117,7 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis( else rPoints[0].realloc(0); } - +#ifdef NOTYET void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicTarget , ::std::vector< ::std::vector< TickInfo > >& /* rRadiusTickInfos */ , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos @@ -176,6 +176,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT m_pShapeFactory->setShapeName( xShape, C2U("MarkHandles") ); } } +#endif void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogicTarget , ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index 672b7da09c5c..74cd7fac27ed 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: VPolarGrid.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.44.1 $ * * This file is part of OpenOffice.org. * @@ -85,10 +85,12 @@ private: //member , ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos , const ::std::vector<VLineProperties>& rLinePropertiesList ); +#if NOTYET void create2DAngleGrid( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xLogicTarget , ::std::vector< ::std::vector< TickInfo > >& rRadiusTickInfos , ::std::vector< ::std::vector< TickInfo > >& rAngleTickInfos , const ::std::vector<VLineProperties>& rLinePropertiesList ); +#endif }; //............................................................................. |