diff options
| author | Jelle van der Waa <jelle@vdwaa.nl> | 2013-07-28 14:55:43 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-29 11:34:33 +0000 |
| commit | dd9c97d587d2a295d44e8685d253d30542a2c85a (patch) | |
| tree | 8736a3552ac8c56fc9102a6518072c68295c4a25 /chart2/source/view/axes | |
| parent | 05bd5b46ea659df95fb6f0c895c090629b541e0f (diff) | |
fdo#62475 removed pointless comments
Change-Id: I3f5e86dba2df950aeb12c895f52d99274c0959aa
Reviewed-on: https://gerrit.libreoffice.org/5148
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'chart2/source/view/axes')
35 files changed, 0 insertions, 255 deletions
diff --git a/chart2/source/view/axes/DateHelper.cxx b/chart2/source/view/axes/DateHelper.cxx index 9a8da15cdcd6..5e5267de5b9e 100644 --- a/chart2/source/view/axes/DateHelper.cxx +++ b/chart2/source/view/axes/DateHelper.cxx @@ -22,10 +22,8 @@ #include <rtl/math.hxx> #include <com/sun/star/chart/TimeUnit.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; bool DateHelper::IsInSameYear( const Date& rD1, const Date& rD2 ) @@ -102,8 +100,6 @@ double DateHelper::RasterizeDateValue( double fValue, const Date& rNullDate, lon return aDate - rNullDate; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx index 934a01f85e60..685a5690c48a 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -31,10 +31,8 @@ static const OUString lcl_aServiceName_InverseDateScaling( "com.sun.star.chart2. static const double lcl_fNumberOfMonths = 12.0;//todo: this needs to be offered by basic tools Date class if it should be more generic } -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::chart::TimeUnit::DAY; @@ -113,8 +111,6 @@ uno::Sequence< OUString > DateScaling::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( DateScaling, lcl_aServiceName_DateScaling ) -// ---------------------------------------- - InverseDateScaling::InverseDateScaling( const Date& rNullDate, sal_Int32 nTimeUnit, bool bShifted ) : m_aNullDate( rNullDate ) , m_nTimeUnit( nTimeUnit ) @@ -194,8 +190,6 @@ uno::Sequence< OUString > InverseDateScaling::getSupportedServiceNames_Static() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static APPHELPER_XSERVICEINFO_IMPL( InverseDateScaling, lcl_aServiceName_InverseDateScaling ) -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx index 1ef6b448ca55..7f99f805626d 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -26,12 +26,9 @@ #include <cppuhelper/implbase3.hxx> #include <tools/date.hxx> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -99,9 +96,7 @@ private: const bool m_bShifted; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx index e9b289f4d8d6..8d8e7a872d8c 100644 --- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx +++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "MinimumAndMaximumSupplier.hxx" #include <com/sun/star/chart/TimeUnit.hpp> @@ -25,10 +24,8 @@ #include <rtl/math.hxx> #include <com/sun/star/awt/Size.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; MergedMinimumAndMaximumSupplier::MergedMinimumAndMaximumSupplier() @@ -207,8 +204,6 @@ void MergedMinimumAndMaximumSupplier::setTimeResolutionOnXAxis( long nTimeResolu (*aIt)->setTimeResolutionOnXAxis( nTimeResolution, rNullDate ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index 5cc8d50e8001..6802a0bb0843 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -28,10 +28,8 @@ #include <rtl/math.hxx> #include <limits> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::chart::TimeUnit::DAY; @@ -60,9 +58,6 @@ void lcl_ensureMaximumSubIncrementCount( sal_Int32& rnSubIntervalCount ) }//end anonymous namespace - -//............................................................................. - ExplicitScaleData::ExplicitScaleData() : Minimum(0.0) , Maximum(10.0) @@ -82,7 +77,6 @@ ExplicitSubIncrement::ExplicitSubIncrement() { } - ExplicitIncrementData::ExplicitIncrementData() : MajorTimeInterval(1,::com::sun::star::chart::TimeUnit::DAY) , MinorTimeInterval(1,::com::sun::star::chart::TimeUnit::DAY) @@ -93,8 +87,6 @@ ExplicitIncrementData::ExplicitIncrementData() { } -//............................................................................. - ScaleAutomatism::ScaleAutomatism( const ScaleData& rSourceScale, const Date& rNullDate ) : m_aSourceScale( rSourceScale ) , m_fValueMinimum( 0.0 ) @@ -202,7 +194,6 @@ void ScaleAutomatism::calculateExplicitScaleAndIncrement( rExplicitScale.Maximum = m_fValueMaximum; } - //--------------------------------------------------------------- //fill explicit increment rExplicitScale.ShiftedCategoryPosition = m_aSourceScale.ShiftedCategoryPosition; @@ -247,8 +238,6 @@ Date ScaleAutomatism::getNullDate() const return m_aNullDate; } -// private -------------------------------------------------------------------- - void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory( ExplicitScaleData& rExplicitScale, ExplicitIncrementData& rExplicitIncrement, @@ -284,7 +273,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory( rExplicitIncrement.Distance = ::rtl::math::approxCeil( (fMaximumCeil - fMinimumFloor) / MAXIMUM_MANUAL_INCREMENT_COUNT ); } - //--------------------------------------------------------------- //fill explicit sub increment sal_Int32 nSubCount = m_aSourceScale.IncrementData.SubIncrements.getLength(); for( sal_Int32 nN=0; nN<nSubCount; nN++ ) @@ -307,8 +295,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForCategory( } } -//----------------------------------------------------------------------------------------- - void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic( ExplicitScaleData& rExplicitScale, ExplicitIncrementData& rExplicitIncrement, @@ -548,7 +534,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic( ::std::swap( rExplicitScale.Maximum, rExplicitScale.Minimum ); } - //--------------------------------------------------------------- //fill explicit sub increment sal_Int32 nSubCount = m_aSourceScale.IncrementData.SubIncrements.getLength(); for( sal_Int32 nN=0; nN<nSubCount; nN++ ) @@ -571,8 +556,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic( } } -//----------------------------------------------------------------------------------------- - void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis( ExplicitScaleData& rExplicitScale, ExplicitIncrementData& rExplicitIncrement, @@ -641,7 +624,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis( if( nMaxMainIncrementCount > 1 ) nMaxMainIncrementCount--; - //choose major time interval: long nDayCount = (aMaxDate-aMinDate); long nMainIncrementCount = 1; @@ -766,8 +748,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis( } -//----------------------------------------------------------------------------------------- - void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear( ExplicitScaleData& rExplicitScale, ExplicitIncrementData& rExplicitIncrement, @@ -996,7 +976,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear( bAutoDistance = true; } - //--------------------------------------------------------------- //fill explicit sub increment sal_Int32 nSubCount = m_aSourceScale.IncrementData.SubIncrements.getLength(); for( sal_Int32 nN=0; nN<nSubCount; nN++ ) @@ -1019,8 +998,6 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear( } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/TickmarkProperties.hxx b/chart2/source/view/axes/TickmarkProperties.hxx index b82f0f5645e8..3c82ca2505f1 100644 --- a/chart2/source/view/axes/TickmarkProperties.hxx +++ b/chart2/source/view/axes/TickmarkProperties.hxx @@ -22,12 +22,9 @@ #include "VLineProperties.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -39,9 +36,7 @@ struct TickmarkProperties VLineProperties aLineProperties; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/Tickmarks.cxx b/chart2/source/view/axes/Tickmarks.cxx index 296fe0bdb058..2973cdc911d9 100644 --- a/chart2/source/view/axes/Tickmarks.cxx +++ b/chart2/source/view/axes/Tickmarks.cxx @@ -24,10 +24,8 @@ #include <rtl/math.hxx> #include <memory> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::rtl::math; @@ -89,10 +87,6 @@ TickInfo* PureTickIter::nextInfo() return 0; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - TickFactory::TickFactory( const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement ) : m_rScale( rScale ) @@ -141,9 +135,7 @@ void TickFactory::getAllTicksShifted( ::std::vector< ::std::vector< TickInfo > > EquidistantTickFactory( m_rScale, m_rIncrement ).getAllTicksShifted( rAllTickInfos ); } -//----------------------------------------------------------------------------- // ___TickFactory_2D___ -//----------------------------------------------------------------------------- TickFactory_2D::TickFactory_2D( const ExplicitScaleData& rScale, const ExplicitIncrementData& rIncrement //, double fStrech_SceneToScreen, double fOffset_SceneToScreen ) @@ -317,8 +309,6 @@ void TickFactory_2D::updateScreenValues( ::std::vector< ::std::vector< TickInfo } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx index 79c831480606..ea61a948b664 100644 --- a/chart2/source/view/axes/Tickmarks.hxx +++ b/chart2/source/view/axes/Tickmarks.hxx @@ -29,10 +29,8 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. struct TickInfo { @@ -147,9 +145,7 @@ private: //member double m_fOffset_LogicToScreen; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/Tickmarks_Dates.cxx b/chart2/source/view/axes/Tickmarks_Dates.cxx index e4e7e55dc9c8..3b51061e6240 100644 --- a/chart2/source/view/axes/Tickmarks_Dates.cxx +++ b/chart2/source/view/axes/Tickmarks_Dates.cxx @@ -22,10 +22,8 @@ #include <rtl/math.hxx> #include "DateHelper.hxx" -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::rtl::math; @@ -155,8 +153,6 @@ void DateTickFactory::getAllTicksShifted( ::std::vector< ::std::vector< TickInfo getAllTicks( rAllTickInfos, true ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/Tickmarks_Dates.hxx b/chart2/source/view/axes/Tickmarks_Dates.hxx index 567664c7bd0a..775c7a6947c7 100644 --- a/chart2/source/view/axes/Tickmarks_Dates.hxx +++ b/chart2/source/view/axes/Tickmarks_Dates.hxx @@ -21,10 +21,8 @@ #include "Tickmarks.hxx" -//............................................................................. namespace chart { -//............................................................................. class DateTickFactory { @@ -51,9 +49,7 @@ private: //member double m_fScaledVisibleMax; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx index ce6b834c4508..5a464c3d87f6 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx @@ -24,10 +24,8 @@ #include <limits> #include <memory> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::rtl::math; @@ -182,7 +180,6 @@ void EquidistantTickFactory::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno:: addSubTicks( nDepth+1, rParentTicks ); } - sal_Int32 EquidistantTickFactory::getMaxTickCount( sal_Int32 nDepth ) const { //return the maximum amount of ticks @@ -420,10 +417,6 @@ void EquidistantTickFactory::getAllTicksShifted( ::std::vector< ::std::vector< T EquidistantTickFactory( m_rScale, aShiftedIncrement ).getAllTicks(rAllTickInfos); } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< double > >& rTicks , const ExplicitIncrementData& rIncrement , sal_Int32 nMinDepth, sal_Int32 nMaxDepth ) @@ -638,8 +631,6 @@ TickInfo* EquidistantTickIter::nextInfo() return NULL; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index f171b2ff2d1d..464aae682279 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -21,10 +21,8 @@ #include "Tickmarks.hxx" -//............................................................................. namespace chart { -//............................................................................. class EquidistantTickIter : public TickIter { @@ -56,7 +54,6 @@ private: //methods bool gotoFirst(); bool gotoNext(); - double getTickValue(sal_Int32 nDepth, sal_Int32 nIndex) const { if(m_pSimpleTicks) @@ -140,9 +137,7 @@ private: //member double m_fOuterMajorTickBorderMax_Scaled; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index 48b4f6698004..0bb4af907087 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "VAxisBase.hxx" #include "ShapeFactory.hxx" #include "CommonConverters.hxx" @@ -27,10 +26,8 @@ #include <memory> #include <boost/scoped_ptr.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -174,7 +171,6 @@ bool VAxisBase::prepareShapeCreation() if( m_bReCreateAllTickInfos ) { - //----------------------------------------- //create all scaled tickmark values removeTextShapesFromTicks(); @@ -185,7 +181,6 @@ bool VAxisBase::prepareShapeCreation() if( m_xGroupShape_Shapes.is() ) return true; - //----------------------------------------- //create named group shape m_xGroupShape_Shapes = this->createGroupShape( m_xLogicTarget, m_nDimension==2 ? m_aCID : ""); @@ -248,8 +243,6 @@ void VAxisBase::updateUnscaledValuesAtTicks( TickIter& rIter ) } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index c037ff5cf67b..912da21455b7 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -24,12 +24,9 @@ #include "Tickmarks.hxx" #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -63,8 +60,6 @@ public: void setExrtaLinePositionAtOtherAxis( const double& fCrossingAt ); - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- protected: //methods sal_Int32 getIndexOfLongestLabel( const ::com::sun::star::uno::Sequence< OUString >& rLabels ); void removeTextShapesFromTicks(); @@ -96,9 +91,7 @@ protected: //member sal_Int32 m_nMaximumTextHeightSoFar; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VAxisOrGridBase.cxx b/chart2/source/view/axes/VAxisOrGridBase.cxx index 088882cb8d7f..507deb431ce6 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.cxx +++ b/chart2/source/view/axes/VAxisOrGridBase.cxx @@ -17,16 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "VAxisOrGridBase.hxx" #include "ShapeFactory.hxx" #include "CommonConverters.hxx" #include "Tickmarks.hxx" -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -71,8 +68,6 @@ TickFactory* VAxisOrGridBase::createTickFactory() return new TickFactory( m_aScale, m_aIncrement ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx index 6827905fa487..ed98304cf5d0 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.hxx +++ b/chart2/source/view/axes/VAxisOrGridBase.hxx @@ -28,12 +28,9 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <basegfx/matrix/b3dhommatrix.hxx> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- class TickFactory; class VAxisOrGridBase : public PlotterBase @@ -51,8 +48,6 @@ public: virtual TickFactory* createTickFactory(); - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- protected: //member ExplicitScaleData m_aScale; ExplicitIncrementData m_aIncrement; @@ -65,9 +60,7 @@ protected: //member CuboidPlanePosition m_eBottomPos; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 3a7c866fbfb8..8cf540b057b9 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -30,10 +30,8 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/text/WritingMode2.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -156,8 +154,6 @@ TickmarkProperties AxisProperties::getBiggestTickmarkProperties() return aTickmarkProperties; } -//-------------------------------------------------------------------------- - AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel , ExplicitCategoriesProvider* pExplicitCategoriesProvider ) : m_xAxisModel(xAxisModel) @@ -375,8 +371,6 @@ void AxisProperties::init( bool bCartesian ) } } -//----------------------------------------------------------------------------- - AxisLabelProperties::AxisLabelProperties() : m_aFontReferenceSize( ChartModelHelper::getDefaultPageSize() ) , m_aMaximumSpaceForLabels( 0 , 0, m_aFontReferenceSize.Width, m_aFontReferenceSize.Height ) @@ -435,8 +429,6 @@ bool AxisLabelProperties::getIsStaggered() const return ( STAGGER_ODD == eStaggering || STAGGER_EVEN == eStaggering ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index eda2862bb2ee..38291055043c 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -38,12 +38,9 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -153,9 +150,7 @@ protected: VLineProperties makeLinePropertiesForDepth( sal_Int32 nDepth ) const; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 6d0e7b6ba68d..b022fdf2fa39 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -49,10 +49,8 @@ #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::rtl::math; @@ -61,10 +59,6 @@ using ::com::sun::star::uno::Reference; using ::basegfx::B2DPolygon; using ::basegfx::B2DPolyPolygon; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - VCartesianAxis::VCartesianAxis( const AxisProperties& rAxisProperties , const Reference< util::XNumberFormatsSupplier >& xNumberFormatsSupplier , sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount @@ -664,7 +658,6 @@ bool VCartesianAxis::createTextShapes( TickInfo* pPREPreviousVisibleTickInfo = NULL; TickInfo* pLastVisibleNeighbourTickInfo = NULL; - //------------------------------------------------ //prepare properties for multipropertyset-interface of shape tNameSequence aPropNames; tAnySequence aPropValues; @@ -683,7 +676,6 @@ bool VCartesianAxis::createTextShapes( *pColorAny >>= nColor; uno::Any* pLimitedSpaceAny = PropertyMapper::getValuePointerForLimitedSpace(aPropValues,aPropNames,bLimitedHeight); - //------------------------------------------------ sal_Int32 nTick = 0; for( TickInfo* pTickInfo = rTickIter.firstInfo() @@ -1401,7 +1393,6 @@ void VCartesianAxis::createLabels() if( !prepareShapeCreation() ) return; - //----------------------------------------- //create labels if( m_aAxisProperties.m_bDisplayLabels ) { @@ -1410,10 +1401,8 @@ void VCartesianAxis::createLabels() if( !pTickFactory2D ) return; - //----------------------------------------- //get the transformed screen values for all tickmarks in aAllTickInfos pTickFactory2D->updateScreenValues( m_aAllTickInfos ); - //----------------------------------------- //'hide' tickmarks with identical screen values in aAllTickInfos hideIdenticalScreenValues( m_aAllTickInfos ); @@ -1458,7 +1447,6 @@ void VCartesianAxis::createMaximumLabels() if( !prepareShapeCreation() ) return; - //----------------------------------------- //create labels if( m_aAxisProperties.m_bDisplayLabels ) { @@ -1467,7 +1455,6 @@ void VCartesianAxis::createMaximumLabels() if( !pTickFactory2D ) return; - //----------------------------------------- //get the transformed screen values for all tickmarks in aAllTickInfos pTickFactory2D->updateScreenValues( m_aAllTickInfos ); @@ -1496,7 +1483,6 @@ void VCartesianAxis::createMaximumLabels() void VCartesianAxis::updatePositions() { - //----------------------------------------- //update positions of labels if( m_aAxisProperties.m_bDisplayLabels ) { @@ -1505,7 +1491,6 @@ void VCartesianAxis::updatePositions() if( !pTickFactory2D ) return; - //----------------------------------------- //update positions of all existing text shapes pTickFactory2D->updateScreenValues( m_aAllTickInfos ); @@ -1608,11 +1593,9 @@ void VCartesianAxis::createShapes() if( !pTickFactory2D ) return; - //----------------------------------------- //create line shapes if(2==m_nDimension) { - //----------------------------------------- //create extra long ticks to separate complex categories (create them only there where the labels are) if( isComplexCategoryAxis() ) { @@ -1648,7 +1631,6 @@ void VCartesianAxis::createShapes() createTickMarkLineShapes( *aDepthIter, aTickmarkPropertiesList[nDepth], *pTickFactory2D, true /*bOnlyAtLabels*/ ); } } - //----------------------------------------- //create normal ticks for major and minor intervals { ::std::vector< ::std::vector< TickInfo > > aUnshiftedTickInfos; @@ -1669,7 +1651,6 @@ void VCartesianAxis::createShapes() for( sal_Int32 nDepth=0; aDepthIter != aDepthEnd && nDepth < nTickmarkPropertiesCount; ++aDepthIter, nDepth++ ) createTickMarkLineShapes( *aDepthIter, m_aAxisProperties.m_aTickmarkPropertiesList[nDepth], *pTickFactory2D, false /*bOnlyAtLabels*/ ); } - //----------------------------------------- //create axis main lines //it serves also as the handle shape for the axis selection { @@ -1681,7 +1662,6 @@ void VCartesianAxis::createShapes() //because of this name this line will be used for marking the axis m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); } - //----------------------------------------- //create an additional line at NULL if( !AxisHelper::isAxisPositioningEnabled() ) { @@ -1700,8 +1680,6 @@ void VCartesianAxis::createShapes() //createLabels(); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index aaa17183e805..0d619e4bd1b5 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -24,16 +24,12 @@ #include <memory> -//............................................................................. namespace chart { -//............................................................................. class VCartesianAxis : public VAxisBase { - //------------------------------------------------------------------------- // public methods - //------------------------------------------------------------------------- public: VCartesianAxis( const AxisProperties& rAxisProperties , const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier @@ -57,16 +53,13 @@ public: TickIter* createMaximumLabelTickIterator( sal_Int32 nTextLevel ); sal_Int32 getTextLevelCount() const; - //------------------------------------------------------------------------- virtual TickFactory* createTickFactory(); - //------------------------------------------------------------------------- double getLogicValueWhereMainLineCrossesOtherAxis() const; double getLogicValueWhereLabelLineCrossesOtherAxis() const; bool getLogicValueWhereExtraLineCrossesOtherAxis( double& fCrossesOtherAxis) const; void get2DAxisMainLine( ::basegfx::B2DVector& rStart, ::basegfx::B2DVector& rEnd, double fCrossesOtherAxis ); - //------------------------------------------------------------------------- //Layout interface for cartesian axes: //the returned value describes the minimum size that is necessary @@ -83,10 +76,6 @@ public: //(this is e.g. true if the parameters allow for labels parallel to the axis.) // sal_bool canQuicklyCalculateMinimumOrthogonalSize(); - - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - struct ScreenPosAndLogicPos { double fLogicX; @@ -119,9 +108,7 @@ protected: //methods ScreenPosAndLogicPos getScreenPosAndLogicPos( double fLogicX, double fLogicY, double fLogicZ ) const; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index c79a1a16b3ad..6c63d09bfa78 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -28,16 +28,12 @@ //for auto_ptr #include <memory> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -//............................................................................. - class TextualDataProvider : public ::cppu::WeakImplHelper1< ::com::sun::star::chart2::data::XTextualDataSequence > @@ -62,8 +58,6 @@ private: //member uno::Sequence< OUString > m_aTextSequence; }; -//............................................................................. - VCartesianCoordinateSystem::VCartesianCoordinateSystem( const Reference< XCoordinateSystem >& xCooSys ) : VCoordinateSystem(xCooSys) { @@ -215,8 +209,6 @@ void VCartesianCoordinateSystem::updateScalesAndIncrementsOnAxes() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx index bf753888522e..474966f6234c 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx @@ -21,12 +21,9 @@ #include "VCoordinateSystem.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class VCartesianCoordinateSystem : public VCoordinateSystem @@ -50,9 +47,7 @@ private: VCartesianCoordinateSystem(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index 2c7ca4b4ba48..ebff751bfb94 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -31,10 +31,8 @@ #include <vector> #include <boost/scoped_ptr.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -163,11 +161,6 @@ void addLine3D( drawing::PolyPolygonShape3D& rPoints, sal_Int32 nIndex AddPointToPoly( rPoints, aPoint, nIndex ); } -//--------------------------------------------------------------------------------- -//--------------------------------------------------------------------------------- -//--------------------------------------------------------------------------------- -//--------------------------------------------------------------------------------- - VCartesianGrid::VCartesianGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount , const Sequence< Reference< beans::XPropertySet > > & rGridPropertiesList ) : VAxisOrGridBase( nDimensionIndex, nDimensionCount ) @@ -206,26 +199,22 @@ void VCartesianGrid::createShapes() return; //somehow equal to axis tickmarks - //----------------------------------------- //create named group shape Reference< drawing::XShapes > xGroupShape_Shapes( this->createGroupShape( m_xLogicTarget, m_aCID ) ); if(!xGroupShape_Shapes.is()) return; - //----------------------------------------- ::std::vector<VLineProperties> aLinePropertiesList; fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList ); - //----------------------------------------- //create all scaled tickmark values boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() ); TickFactory& aTickFactory = *apTickFactory.get(); ::std::vector< ::std::vector< TickInfo > > aAllTickInfos; aTickFactory.getAllTicks( aAllTickInfos ); - //----------------------------------------- //create tick mark line shapes ::std::vector< ::std::vector< TickInfo > >::iterator aDepthIter = aAllTickInfos.begin(); const ::std::vector< ::std::vector< TickInfo > >::const_iterator aDepthEnd = aAllTickInfos.end(); @@ -233,7 +222,6 @@ void VCartesianGrid::createShapes() if(aDepthIter == aDepthEnd)//no tickmarks at all return; - sal_Int32 nLinePropertiesCount = aLinePropertiesList.size(); for( sal_Int32 nDepth=0 ; aDepthIter != aDepthEnd && nDepth < nLinePropertiesCount @@ -288,7 +276,6 @@ void VCartesianGrid::createShapes() m_pShapeFactory->createLine2D( xTarget, aHandlesPoints, &aHandleLineProperties ); m_pShapeFactory->setShapeName( xHandleShape, "HandlesOnly" ); } - //----------------------------------------- else //if(2!=m_nDimension) { GridLinePoints aGridLinePoints( m_pPosHelper, m_nDimensionIndex, m_eLeftWallPos, m_eBackWallPos, m_eBottomPos ); @@ -320,8 +307,6 @@ void VCartesianGrid::createShapes() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx index 7d092adccdf3..97bdbdcad6eb 100644 --- a/chart2/source/view/axes/VCartesianGrid.hxx +++ b/chart2/source/view/axes/VCartesianGrid.hxx @@ -22,20 +22,15 @@ #include "VAxisOrGridBase.hxx" #include "VLineProperties.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class VCartesianGrid : public VAxisOrGridBase { -//------------------------------------------------------------------------- // public methods -//------------------------------------------------------------------------- public: VCartesianGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount , const ::com::sun::star::uno::Sequence< @@ -57,9 +52,7 @@ private: ::com::sun::star::beans::XPropertySet > > m_aGridPropertiesList; //main grid, subgrid, subsubgrid etc }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 314d8121e4ef..521e58aab737 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -41,10 +41,8 @@ #include <rtl/math.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -587,8 +585,6 @@ sal_Int32 VCoordinateSystem::getNumberFormatKeyForAxis( xAxis, m_xCooSysModel, xNumberFormatsSupplier ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 64688b4f7907..fb89a0b9967a 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -29,10 +29,8 @@ #include <boost/scoped_ptr.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::rtl::math; @@ -63,7 +61,6 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( FixedNumberFormatter aFixedNumberFormatter( m_xNumberFormatsSupplier, rAxisLabelProperties.nNumberFormatKey ); - //------------------------------------------------ //prepare text properties for multipropertyset-interface of shape tNameSequence aPropNames; tAnySequence aPropValues; @@ -80,8 +77,6 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis( const uno::Sequence< OUString >* pLabels = m_bUseTextLabels? &m_aTextLabels : 0; - //------------------------------------------------ - //TickInfo* pLastVisibleNeighbourTickInfo = NULL; sal_Int32 nTick = 0; @@ -171,7 +166,6 @@ void VPolarAngleAxis::createLabels() if( m_aAxisProperties.m_bDisplayLabels ) { - //----------------------------------------- //get the transformed screen values for all tickmarks in aAllTickInfos boost::scoped_ptr< TickFactory > apTickFactory( this->createTickFactory() ); @@ -205,7 +199,6 @@ void VPolarAngleAxis::createShapes() double fLogicRadius = m_pPosHelper->getOuterLogicRadius(); double fLogicZ = 1.0;//as defined - //----------------------------------------- //create axis main lines drawing::PointSequenceSequence aPoints(1); VPolarGrid::createLinePointSequence_ForAngleAxis( aPoints, m_aAllTickInfos, m_aIncrement, m_aScale, m_pPosHelper, fLogicRadius, fLogicZ ); @@ -214,13 +207,10 @@ void VPolarAngleAxis::createShapes() //because of this name this line will be used for marking the axis m_pShapeFactory->setShapeName( xShape, "MarkHandles" ); - //----------------------------------------- //create labels createLabels(); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarAngleAxis.hxx b/chart2/source/view/axes/VPolarAngleAxis.hxx index 080ccc96f401..086e5f706e4d 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.hxx +++ b/chart2/source/view/axes/VPolarAngleAxis.hxx @@ -22,12 +22,9 @@ #include "VPolarAxis.hxx" #include "Tickmarks_Equidistant.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -53,9 +50,7 @@ private: //methods , double fLogicRadius, double fLogicZ ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarAxis.cxx b/chart2/source/view/axes/VPolarAxis.cxx index 881f0592da43..f6256931ef83 100644 --- a/chart2/source/view/axes/VPolarAxis.cxx +++ b/chart2/source/view/axes/VPolarAxis.cxx @@ -26,10 +26,8 @@ #include <boost/scoped_ptr.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -68,8 +66,6 @@ sal_Bool VPolarAxis::isAnythingToDraw() return ( 2==m_nDimension && VAxisBase::isAnythingToDraw() ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx index 88f6f852a9bb..552d760bb0dd 100644 --- a/chart2/source/view/axes/VPolarAxis.hxx +++ b/chart2/source/view/axes/VPolarAxis.hxx @@ -21,12 +21,9 @@ #include "VAxisBase.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -55,9 +52,7 @@ protected: //member ::std::vector< ExplicitIncrementData > m_aIncrements; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx index 4f259e0b3e45..50a8ce538633 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx @@ -23,10 +23,8 @@ #include "AxisIndexDefines.hxx" #include "AxisHelper.hxx" -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -181,8 +179,6 @@ void VPolarCoordinateSystem::createGridShapes() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.hxx b/chart2/source/view/axes/VPolarCoordinateSystem.hxx index 74f9853ce540..6b96df26df4f 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.hxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.hxx @@ -21,12 +21,9 @@ #include "VCoordinateSystem.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class VPolarCoordinateSystem : public VCoordinateSystem @@ -54,9 +51,7 @@ private: VPolarCoordinateSystem(); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index fb485e3623bb..ca74ceba06b8 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -31,10 +31,8 @@ #include <vector> #include <memory> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; @@ -230,18 +228,15 @@ void VPolarGrid::createShapes() if(!m_aGridPropertiesList.getLength()) return; - //----------------------------------------- //create all scaled tickmark values ::std::vector< ::std::vector< TickInfo > > aAngleTickInfos; ::std::vector< ::std::vector< TickInfo > > aRadiusTickInfos; getAllTickInfos( 0, aAngleTickInfos ); getAllTickInfos( 1, aRadiusTickInfos ); - //----------------------------------------- ::std::vector<VLineProperties> aLinePropertiesList; VCartesianGrid::fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList ); - //----------------------------------------- //create tick mark line shapes if(2==m_nDimension) { @@ -252,8 +247,6 @@ void VPolarGrid::createShapes() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index 1f8dd68fc142..703b1b335c15 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -24,21 +24,16 @@ #include "VLineProperties.hxx" #include <com/sun/star/drawing/PointSequenceSequence.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class PolarPlottingPositionHelper; class VPolarGrid : public VAxisOrGridBase { -//------------------------------------------------------------------------- // public methods -//------------------------------------------------------------------------- public: VPolarGrid( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount , const ::com::sun::star::uno::Sequence< @@ -74,9 +69,7 @@ private: //member , const ::std::vector<VLineProperties>& rLinePropertiesList ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index 67f2dc5715dd..0a2133ce52cf 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "VPolarRadiusAxis.hxx" #include "VCartesianAxis.hxx" #include "PlottingPositionHelper.hxx" @@ -25,10 +24,8 @@ #include "Tickmarks_Equidistant.hxx" #include <rtl/math.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; using namespace ::rtl::math; @@ -158,7 +155,6 @@ void VPolarRadiusAxis::createShapes() aAxisProperties.m_pfMainLinePositionAtOtherAxis = new double( pTickInfo->getUnscaledTickValue() ); aAxisProperties.m_bDisplayLabels=false; - //------------------- VCartesianAxis aAxis(aAxisProperties,m_xNumberFormatsSupplier ,1,2,new PolarPlottingPositionHelper()); aAxis.setExplicitScaleAndIncrement( m_aScale, m_aIncrement ); @@ -170,8 +166,6 @@ void VPolarRadiusAxis::createShapes() } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index 6114a46f3689..7d16ffba9f2a 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -23,12 +23,9 @@ #include <memory> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -80,9 +77,7 @@ private: //member std::auto_ptr<VCartesianAxis> m_apAxisWithLabels; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |