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 | |
| 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')
91 files changed, 0 insertions, 785 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: */ diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 025441cc2cb4..2eb90db819c7 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -43,18 +43,12 @@ #include <com/sun/star/drawing/NormalsKind.hpp> #include <com/sun/star/lang/XServiceName.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::rtl::math; using namespace ::com::sun::star::chart2; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - AreaChart::AreaChart( const uno::Reference<XChartType>& xChartTypeModel , sal_Int32 nDimensionCount , bool bCategoryXAxis @@ -135,8 +129,6 @@ bool AreaChart::isSeparateStackingForDifferentSigns( sal_Int32 /*nDimensionIndex return false; } -//----------------------------------------------------------------- - LegendSymbolStyle AreaChart::getLegendSymbolStyle() { if( m_bArea || m_nDimension == 3 ) @@ -610,20 +602,17 @@ void AreaChart::impl_createSeriesShapes() //iterate through all series again to create the series shapes ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); -//============================================================================= for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); - //============================================================================= for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter ) { ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); - //============================================================================= std::map< sal_Int32, drawing::PolyPolygonShape3D* > aPreviousSeriesPolyMap;//a PreviousSeriesPoly for each different nAttachedAxisIndex drawing::PolyPolygonShape3D* pSeriesPoly = NULL; @@ -727,7 +716,6 @@ void AreaChart::createShapes() m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ); m_xRegressionCurveEquationTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ); - //--------------------------------------------- //check necessary here that different Y axis can not be stacked in the same group? ... hm? //update/create information for current group @@ -747,7 +735,6 @@ void AreaChart::createShapes() bool bDateCategory = (m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis()); -//============================================================================= //iterate through all x values per indices for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ ) { @@ -792,7 +779,6 @@ void AreaChart::createShapes() } } -//============================================================================= aZSlotIter = m_aZSlots.begin(); for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ ) { @@ -808,7 +794,6 @@ void AreaChart::createShapes() const std::vector<VDataSeries*>::const_iterator aSeriesEnd = rSeriesList.end(); std::map< sal_Int32, double > aLogicYForNextSeriesMap;//one for each different nAttachedAxisIndex - //============================================================================= //iterate through all series for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; ++aSeriesIter, ++nSeriesIndex ) { @@ -1102,9 +1087,6 @@ void AreaChart::createShapes() }//next x slot }//next z slot }//next category -//============================================================================= -//============================================================================= -//============================================================================= impl_createSeriesShapes(); @@ -1124,8 +1106,6 @@ void AreaChart::createShapes() OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< area chart :: createShapes():: skipped points: %d created points: %d", nSkippedPoints, nCreatedPoints ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index f177b0b04cf4..9f1d78bbf2d4 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -23,16 +23,12 @@ #include "VSeriesPlotter.hxx" #include <com/sun/star/chart2/CurveStyle.hpp> -//............................................................................. namespace chart { -//............................................................................. class AreaChart : public VSeriesPlotter { - //------------------------------------------------------------------------- // public methods - //------------------------------------------------------------------------- public: AreaChart( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartTypeModel @@ -49,25 +45,17 @@ public: virtual void createShapes(); virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); - //------------------- virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; virtual bool keepAspectRatio() const; - //------------------------------------------------------------------------- // MinimumAndMaximumSupplier - //------------------------------------------------------------------------- virtual double getMaximumX(); virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); - //------------------------------------------------------------------------- - virtual LegendSymbolStyle getLegendSymbolStyle(); virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ); - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- private: //methods //no default constructor AreaChart(); @@ -112,9 +100,7 @@ private: //member ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xRegressionCurveEquationTarget; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 9caca6e7d23a..ef9e1a19a38c 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -33,10 +33,8 @@ #include <com/sun/star/chart2/DataPointGeometry3D.hpp> #include <rtl/math.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::rtl::math; using namespace ::com::sun::star::chart2; @@ -68,8 +66,6 @@ BarChart::~BarChart() delete m_pMainPosHelper; } -//------------------------------------------------------------------------- - PlottingPositionHelper& BarChart::getPlottingPositionHelper( sal_Int32 nAxisIndex ) const { PlottingPositionHelper& rPosHelper = VSeriesPlotter::getPlottingPositionHelper( nAxisIndex ); @@ -425,8 +421,6 @@ void BarChart::createShapes() uno::Reference< drawing::XShapes > xTextTarget( m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); - - //--------------------------------------------- uno::Reference< drawing::XShapes > xRegressionCurveEquationTarget( m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); //check necessary here that different Y axis can not be stacked in the same group? ... hm? @@ -448,7 +442,6 @@ void BarChart::createShapes() sal_Int32 nStartIndex = 0; sal_Int32 nEndIndex = VSeriesPlotter::getPointCount(); -//============================================================================= //iterate through all x values per indices for( sal_Int32 nPointIndex = nStartIndex; nPointIndex < nEndIndex; nPointIndex++ ) { @@ -479,14 +472,12 @@ void BarChart::createShapes() } } -//============================================================================= aZSlotIter = m_aZSlots.begin(); for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end(); -//============================================================================= //iterate through all x slots in this category double fSlotX=0; for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 ) @@ -553,7 +544,6 @@ void BarChart::createShapes() ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); - //============================================================================= //iterate through all series in this x slot for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) { @@ -582,8 +572,6 @@ void BarChart::createShapes() bDrawConnectionLinesInited = true; } - //------------ - uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes( getSeriesGroupShape(*aSeriesIter, xSeriesTarget) ); @@ -807,7 +795,6 @@ void BarChart::createShapes() //create error bar createErrorBar_Y( aUnscaledLogicPosition, **aSeriesIter, nPointIndex, m_xLogicTarget, &fLogicX ); - //------------ //create data point label if( (**aSeriesIter).getDataPointLabelIfLabel(nPointIndex) ) { @@ -849,14 +836,10 @@ void BarChart::createShapes() }//next x slot }//next z slot }//next category -//============================================================================= -//============================================================================= -//============================================================================= if( bDrawConnectionLines ) { ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); -//============================================================================= for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); @@ -873,7 +856,6 @@ void BarChart::createShapes() } PlotterBase::m_pPosHelper = pPosHelper; -//============================================================================= //iterate through all x slots in this category for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 ) { @@ -881,7 +863,6 @@ void BarChart::createShapes() ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); -//============================================================================= //iterate through all series in this x slot for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) { @@ -918,8 +899,6 @@ void BarChart::createShapes() OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< bar chart :: createShapes():: skipped points: %d created points: %d", nSkippedPoints, nCreatedPoints ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index c419e24b0022..48f251f68c6a 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -22,17 +22,13 @@ #include "VSeriesPlotter.hxx" -//............................................................................. namespace chart { -//............................................................................. class BarPositionHelper; class BarChart : public VSeriesPlotter { - //------------------------------------------------------------------------- // public methods - //------------------------------------------------------------------------- public: BarChart( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartTypeModel @@ -42,14 +38,9 @@ public: virtual void createShapes(); virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); - //------------------- virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; virtual bool keepAspectRatio() const; - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - private: //methods //no default constructor BarChart(); @@ -80,9 +71,7 @@ private: //member ::com::sun::star::uno::Sequence< sal_Int32 > m_aOverlapSequence; ::com::sun::star::uno::Sequence< sal_Int32 > m_aGapwidthSequence; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/BarPositionHelper.cxx b/chart2/source/view/charttypes/BarPositionHelper.cxx index 72760431dbd2..58aa7786e87f 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.cxx +++ b/chart2/source/view/charttypes/BarPositionHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "BarPositionHelper.hxx" #include "Linear3DTransformation.hxx" #include "ViewDefines.hxx" @@ -25,10 +24,8 @@ #include "DateHelper.hxx" #include <com/sun/star/chart/TimeUnit.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -76,8 +73,6 @@ void BarPositionHelper::setScaledCategoryWidth( double fScaledCategoryWidth ) m_fScaledCategoryWidth = fScaledCategoryWidth; CategoryPositionHelper::setCategoryWidth( m_fScaledCategoryWidth ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/BarPositionHelper.hxx b/chart2/source/view/charttypes/BarPositionHelper.hxx index 1b3a046770bf..8a43dae38a00 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.hxx +++ b/chart2/source/view/charttypes/BarPositionHelper.hxx @@ -23,12 +23,9 @@ #include "PlottingPositionHelper.hxx" #include "CategoryPositionHelper.hxx" -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -47,9 +44,7 @@ public: virtual void setScaledCategoryWidth( double fScaledCategoryWidth ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index a87a2ef9d919..fbd81cb88f1b 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "BubbleChart.hxx" #include "PlottingPositionHelper.hxx" #include "ShapeFactory.hxx" @@ -38,18 +37,12 @@ #include <com/sun/star/drawing/NormalsKind.hpp> #include <com/sun/star/lang/XServiceName.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::rtl::math; using namespace ::com::sun::star::chart2; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - BubbleChart::BubbleChart( const uno::Reference<XChartType>& xChartTypeModel , sal_Int32 nDimensionCount ) : VSeriesPlotter( xChartTypeModel, nDimensionCount, false ) @@ -159,8 +152,6 @@ bool BubbleChart::isSeparateStackingForDifferentSigns( sal_Int32 /*nDimensionInd return false; } -//----------------------------------------------------------------- - LegendSymbolStyle BubbleChart::getLegendSymbolStyle() { return LegendSymbolStyle_CIRCLE; @@ -230,7 +221,6 @@ void BubbleChart::createShapes() if( m_fMaxLogicBubbleSize <= 0 || m_fBubbleSizeFactorToScreen <= 0 ) return; -//============================================================================= //iterate through all x values per indices for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ ) { @@ -248,7 +238,6 @@ void BubbleChart::createShapes() ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); - //============================================================================= //iterate through all series for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; ++aSeriesIter, ++nSeriesIndex ) { @@ -373,7 +362,6 @@ void BubbleChart::createShapes() break; } - awt::Point aScreenPosition2D( LabelPositionHelper(pPosHelper,m_nDimension,m_xLogicTarget,m_pShapeFactory) .transformSceneToScreenPosition( aScenePosition3D ) ); sal_Int32 nOffset = 0; @@ -392,14 +380,9 @@ void BubbleChart::createShapes() }//next x slot }//next z slot }//next category -//============================================================================= -//============================================================================= -//============================================================================= OSL_TRACE( "\nPPPPPPPPP<<<<<<<<<<<< area chart :: createShapes():: skipped points: %d created points: %d", nSkippedPoints, nCreatedPoints ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx index 23b34edc269e..08a859c9e46c 100644 --- a/chart2/source/view/charttypes/BubbleChart.hxx +++ b/chart2/source/view/charttypes/BubbleChart.hxx @@ -22,16 +22,12 @@ #include "VSeriesPlotter.hxx" #include <com/sun/star/drawing/Direction3D.hpp> -//............................................................................. namespace chart { -//............................................................................. class BubbleChart : public VSeriesPlotter { - //------------------------------------------------------------------------- // public methods - //------------------------------------------------------------------------- public: BubbleChart( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartTypeModel @@ -42,22 +38,14 @@ public: virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); - //------------------- virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - //------------------------------------------------------------------------- // MinimumAndMaximumSupplier - //------------------------------------------------------------------------- virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); - //------------------------------------------------------------------------- - virtual LegendSymbolStyle getLegendSymbolStyle(); - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- private: //methods //no default constructor BubbleChart(); @@ -76,9 +64,7 @@ private: //member double m_fMaxLogicBubbleSize;//calculated values double m_fBubbleSizeFactorToScreen;//calculated values }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 1973e05bab22..88cb2c2c9035 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "CandleStickChart.hxx" #include "ShapeFactory.hxx" #include "CommonConverters.hxx" @@ -32,19 +31,13 @@ #include <rtl/math.hxx> #include <editeng/unoprnms.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::rtl::math; using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - CandleStickChart::CandleStickChart( const uno::Reference<XChartType>& xChartTypeModel , sal_Int32 nDimensionCount ) : VSeriesPlotter( xChartTypeModel, nDimensionCount ) @@ -59,19 +52,13 @@ CandleStickChart::~CandleStickChart() delete m_pMainPosHelper; } -//------------------------------------------------------------------------- // MinimumAndMaximumSupplier -//------------------------------------------------------------------------- bool CandleStickChart::isSeparateStackingForDifferentSigns( sal_Int32 /* nDimensionIndex */ ) { return false; } -//----------------------------------------------------------------- -//----------------------------------------------------------------- -//----------------------------------------------------------------- - LegendSymbolStyle CandleStickChart::getLegendSymbolStyle() { return LegendSymbolStyle_LINE; @@ -115,7 +102,6 @@ void CandleStickChart::createShapes() uno::Reference< drawing::XShapes > xTextTarget( m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); - //--------------------------------------------- //check necessary here that different Y axis can not be stacked in the same group? ... hm? bool bJapaneseStyle=true;//@todo is this the correct default? @@ -152,13 +138,11 @@ void CandleStickChart::createShapes() sal_Int32 nStartIndex = 0; sal_Int32 nEndIndex = VSeriesPlotter::getPointCount(); double fLogicZ = 1.5;//as defined -//============================================================================= //iterate through all x values per indices for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ ) { ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin(); const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end(); -//============================================================================= for( sal_Int32 nZ=0; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ ) { ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin(); @@ -178,7 +162,6 @@ void CandleStickChart::createShapes() //update/create information for current group pPosHelper->updateSeriesCount( aZSlotIter->size() ); -//============================================================================= //iterate through all x slots in this category for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 ) { @@ -186,7 +169,6 @@ void CandleStickChart::createShapes() ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin(); const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end(); - //============================================================================= //iterate through all series in this x slot for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) { @@ -343,9 +325,6 @@ void CandleStickChart::createShapes() }//next x slot }//next z slot }//next category -//============================================================================= -//============================================================================= -//============================================================================= /* @todo remove series shapes if empty //remove and delete point-group-shape if empty if(!xSeriesGroupShape_Shapes->getCount()) @@ -360,8 +339,6 @@ void CandleStickChart::createShapes() //... todo } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx index cac36dca3bee..101044ad4b2d 100644 --- a/chart2/source/view/charttypes/CandleStickChart.hxx +++ b/chart2/source/view/charttypes/CandleStickChart.hxx @@ -22,17 +22,13 @@ #include "VSeriesPlotter.hxx" -//............................................................................. namespace chart { -//............................................................................. class BarPositionHelper; class CandleStickChart : public VSeriesPlotter { - //------------------------------------------------------------------------- // public methods - //------------------------------------------------------------------------- public: CandleStickChart( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartTypeModel @@ -44,19 +40,11 @@ public: virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - //------------------------------------------------------------------------- // MinimumAndMaximumSupplier - //------------------------------------------------------------------------- virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); - //------------------------------------------------------------------------- - virtual LegendSymbolStyle getLegendSymbolStyle(); - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - private: //methods //no default constructor CandleStickChart(); @@ -64,9 +52,7 @@ private: //methods private: //member BarPositionHelper* m_pMainPosHelper; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/chart2/source/view/charttypes/CategoryPositionHelper.cxx index e37c0287f347..1e6ef85b81ef 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.cxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.cxx @@ -17,13 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "CategoryPositionHelper.hxx" -//............................................................................. namespace chart { -//............................................................................. CategoryPositionHelper::CategoryPositionHelper( double fSeriesCount, double fCategoryWidth ) : m_fSeriesCount(fSeriesCount) @@ -88,8 +85,6 @@ void CategoryPositionHelper::setCategoryWidth( double fCategoryWidth ) m_fCategoryWidth = fCategoryWidth; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/CategoryPositionHelper.hxx b/chart2/source/view/charttypes/CategoryPositionHelper.hxx index b759f511253b..a17ec26027ed 100644 --- a/chart2/source/view/charttypes/CategoryPositionHelper.hxx +++ b/chart2/source/view/charttypes/CategoryPositionHelper.hxx @@ -20,12 +20,9 @@ #ifndef _CHART2_CATEGORYPOSITIONHELPER_HXX #define _CHART2_CATEGORYPOSITIONHELPER_HXX -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -55,9 +52,7 @@ protected: double m_fOuterDistance; //>=0 m_fOuterDistance=1 --> distance == width }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index ddfbc364a724..48a97f14a362 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -34,10 +34,8 @@ #include <boost/scoped_ptr.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -102,10 +100,6 @@ bool PiePositionHelper::getInnerAndOuterRadius( double fCategoryX return bIsVisible; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - PieChart::PieChart( const uno::Reference<XChartType>& xChartTypeModel , sal_Int32 nDimensionCount , bool bExcludingPositioning ) @@ -143,16 +137,12 @@ PieChart::~PieChart() delete m_pPosHelper; } -//----------------------------------------------------------------- - void PieChart::setScales( const std::vector< ExplicitScaleData >& rScales, bool /* bSwapXAndYAxis */ ) { OSL_ENSURE(m_nDimension<=static_cast<sal_Int32>(rScales.size()),"Dimension of Plotter does not fit two dimension of given scale sequence"); m_pPosHelper->setScales( rScales, true ); } -//----------------------------------------------------------------- - drawing::Direction3D PieChart::getPreferredDiagramAspectRatio() const { if( m_nDimension == 3 ) @@ -180,7 +170,6 @@ uno::Reference< drawing::XShape > PieChart::createDataPoint( , double fLogicZ, double fDepth, double fExplodePercentage , tPropertyNameValueMap* pOverwritePropertiesMap ) { - //--------------------------- //transform position: drawing::Direction3D aOffset; if( !::rtl::math::approxEqual( fExplodePercentage, 0.0 ) ) @@ -192,7 +181,6 @@ uno::Reference< drawing::XShape > PieChart::createDataPoint( aOffset = aNewOrigin - aOrigin; } - //--------------------------- //create point uno::Reference< drawing::XShape > xShape(0); if(m_nDimension==3) @@ -327,10 +315,8 @@ void PieChart::createShapes() createGroupShape( m_xLogicTarget,OUString() )); uno::Reference< drawing::XShapes > xTextTarget( m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() )); - //--------------------------------------------- //check necessary here that different Y axis can not be stacked in the same group? ... hm? -//============================================================================= ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = m_aZSlots[0].begin(); const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = m_aZSlots[0].end(); @@ -352,7 +338,6 @@ void PieChart::createShapes() catch (const uno::Exception&) { } } -//============================================================================= for( double fSlotX=0; aXSlotIter != aXSlotEnd && (m_bUseRings||fSlotX<0.5 ); ++aXSlotIter, fSlotX+=1.0 ) { ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector); @@ -422,14 +407,12 @@ void PieChart::createShapes() ASSERT_EXCEPTION( e ); } - //--------------------------- //transforme to unit circle: double fUnitCircleWidthAngleDegree = m_pPosHelper->getWidthAngleDegree( fLogicStartAngleValue, fLogicEndAngleValue ); double fUnitCircleStartAngleDegree = m_pPosHelper->transformToAngleDegree( fLogicStartAngleValue ); double fUnitCircleInnerRadius = m_pPosHelper->transformToRadius( fLogicInnerRadius ); double fUnitCircleOuterRadius = m_pPosHelper->transformToRadius( fLogicOuterRadius ); - //--------------------------- //point color: boost::scoped_ptr< tPropertyNameValueMap > apOverwritePropertiesMap(NULL); { @@ -548,9 +531,6 @@ void PieChart::createShapes() }//next series in x slot (next y slot) }//next category }//next x slot -//============================================================================= -//============================================================================= -//============================================================================= /* @todo remove series shapes if empty //remove and delete point-group-shape if empty if(!xSeriesGroupShape_Shapes->getCount()) @@ -783,7 +763,6 @@ bool PieChart::tryMoveLabels( PieLabelInfo* pFirstBorder, PieLabelInfo* pSecondB void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSize ) { - //------------------------------------------------------------------ //check whether there are any labels that should be moved std::vector< PieLabelInfo >::iterator aIt1 = m_aLabelInfoList.begin(); std::vector< PieLabelInfo >::const_iterator aEnd = m_aLabelInfoList.end(); @@ -803,7 +782,6 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi if( ::rtl::math::approxEqual( fPageDiagonaleLength, 0.0 ) ) return; - //------------------------------------------------------------------ //init next and previous aIt1 = m_aLabelInfoList.begin(); std::vector< PieLabelInfo >::iterator aIt2 = aIt1; @@ -820,14 +798,11 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi } aIt1->pNext = &(*(m_aLabelInfoList.begin())); - - //------------------------------------------------------------------ //detect overlaps and move sal_Int32 nMaxIterations = 50; while( detectLabelOverlapsAndMove( rPageSize ) && nMaxIterations > 0 ) nMaxIterations--; - //------------------------------------------------------------------ //create connection lines for the moved labels aEnd = m_aLabelInfoList.end(); VLineProperties aVLineProperties; @@ -851,7 +826,6 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi else if( nY1 > aRect.getMaxY() ) nY2 = aRect.getMaxY(); - //when the line is very short compared to the page size don't create one ::basegfx::B2DVector aLength(nX1-nX2, nY1-nY2); if( (aLength.getLength()/fPageDiagonaleLength) < 0.01 ) @@ -877,8 +851,6 @@ void PieChart::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& rPageSi } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index b6346aa9b794..73efe3782840 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -24,17 +24,13 @@ #include <basegfx/vector/b2dvector.hxx> #include <basegfx/range/b2irectangle.hxx> -//............................................................................. namespace chart { -//............................................................................. class PiePositionHelper; class PieChart : public VSeriesPlotter { - //------------------------------------------------------------------------- // public methods - //------------------------------------------------------------------------- public: PieChart( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartTypeModel @@ -47,7 +43,6 @@ public: virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); - //------------------- virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; virtual bool keepAspectRatio() const; virtual bool shouldSnapRectToUsedArea(); @@ -64,9 +59,6 @@ public: virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ); virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- private: //methods //no default constructor PieChart(); @@ -117,9 +109,7 @@ private: //member double m_fMaxOffset; /// cached max offset value (init'ed to NaN) }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx index 20714d485008..8c5963276df5 100644 --- a/chart2/source/view/charttypes/Splines.cxx +++ b/chart2/source/view/charttypes/Splines.cxx @@ -26,10 +26,8 @@ #define MAX_BSPLINE_DEGREE 15 -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; namespace @@ -57,7 +55,6 @@ public: double fY1FirstDerivation, double fYnFirstDerivation ); - /** @descr creates an object that calculates cublic splines on construction for the special case of periodic cubic spline @@ -66,7 +63,6 @@ public: */ lcl_SplineCalculation( const tPointVecType & rSortedPoints); - /** @descr this function corresponds to the function splint in [1]. [1] Numerical Recipies in C, 2nd edition @@ -115,8 +111,6 @@ private: void CalculatePeriodic(); }; -//----------------------------------------------------------------------------- - lcl_SplineCalculation::lcl_SplineCalculation( const tPointVecType & rSortedPoints, double fY1FirstDerivation, @@ -132,8 +126,6 @@ lcl_SplineCalculation::lcl_SplineCalculation( Calculate(); } -//----------------------------------------------------------------------------- - lcl_SplineCalculation::lcl_SplineCalculation( const tPointVecType & rSortedPoints) : m_aPoints( rSortedPoints ), @@ -146,8 +138,6 @@ lcl_SplineCalculation::lcl_SplineCalculation( ::rtl::math::setInf( &m_fLastInterpolatedValue, sal_False ); CalculatePeriodic(); } -//----------------------------------------------------------------------------- - void lcl_SplineCalculation::Calculate() { @@ -412,8 +402,6 @@ double lcl_SplineCalculation::GetInterpolatedValue( double x ) ( h*h ) / 6.0 ); } -//----------------------------------------------------------------------------- - // helper methods for B-spline // Create parameter t_0 to t_n using the centripetal method with a power of 0.5 @@ -543,8 +531,6 @@ void applyNtoParameterT(const lcl_tSizeType i,const double tk,const sal_uInt32 p } // anonymous namespace -//----------------------------------------------------------------------------- - // Calculates uniform parametric splines with subinterval length 1, // according ODF1.2 part 1, chapter 'chart interpolation'. void SplineCalculater::CalculateCubicSplines( @@ -675,7 +661,6 @@ void SplineCalculater::CalculateCubicSplines( } } - // The implementation follows closely ODF1.2 spec, chapter chart:interpolation // using the same names as in spec as far as possible, without prefix. // More details can be found on @@ -968,8 +953,6 @@ void SplineCalculater::CalculateBSplines( } // next piece of the series } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/Splines.hxx b/chart2/source/view/charttypes/Splines.hxx index fdf0fa75450a..541abc2d8fd5 100644 --- a/chart2/source/view/charttypes/Splines.hxx +++ b/chart2/source/view/charttypes/Splines.hxx @@ -22,12 +22,9 @@ #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -46,10 +43,7 @@ public: , sal_uInt32 nSplineDepth ); }; - -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 40bf94cab050..35c7a562aa83 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -80,8 +80,6 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//----------------------------------------------------------------------------- - VDataSeriesGroup::CachedYValues::CachedYValues() : m_bValuesDirty(true) , m_fMinimumY(0.0) @@ -132,8 +130,6 @@ sal_Int32 VDataSeriesGroup::getSeriesCount() const return m_aSeriesVector.size(); } -//----------------------------------------------------------------------------- - VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeModel , sal_Int32 nDimensionCount, bool bCategoryXAxis ) : PlotterBase( nDimensionCount ) @@ -446,7 +442,6 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re if( !pLabel ) return xTextShape; - //------------------------------------------------ //prepare legend symbol float fViewFontSize( 10.0 ); @@ -540,7 +535,6 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re } } } - //------------------------------------------------ //prepare properties for multipropertyset-interface of shape tNameSequence* pPropNames; tAnySequence* pPropValues; @@ -548,7 +542,6 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re return xTextShape; LabelPositionHelper::changeTextAdjustment( *pPropValues, *pPropNames, eAlignment ); - //------------------------------------------------ //create text shape xTextShape = ShapeFactory(m_xShapeFactory). createText( xTarget_, aText.makeStringAndClear() @@ -738,7 +731,6 @@ void lcl_AddErrorBottomLine( const drawing::Position3D& rPosition, ::basegfx::B2 double MaxY = pPosHelper->getLogicMaxY(); double fZ = pPosHelper->getLogicMinZ(); - if( bYError ) { //main direction has constant x value @@ -1221,7 +1213,6 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( } } - void VSeriesPlotter::setMappedProperties( const uno::Reference< drawing::XShape >& xTargetShape , const uno::Reference< beans::XPropertySet >& xSource @@ -1238,9 +1229,7 @@ void VSeriesPlotter::setTimeResolutionOnXAxis( long TimeResolution, const Date& m_aNullDate = rNullDate; } -//------------------------------------------------------------------------- // MinimumAndMaximumSupplier -//------------------------------------------------------------------------- long VSeriesPlotter::calculateTimeResolutionOnXAxis() { long nRet = ::com::sun::star::chart::TimeUnit::YEAR; @@ -2456,8 +2445,6 @@ VSeriesPlotter* VSeriesPlotter::createSeriesPlotter( return pRet; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 5b018c5235c8..c8efd6a5b9b6 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -42,10 +42,8 @@ #include <svx/scene3d.hxx> #include <svx/e3dsceneupdater.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -175,7 +173,6 @@ void VDiagram::createShapes_2d() m_xCoordinateRegionShape = uno::Reference<drawing::XShape>( xShapes, uno::UNO_QUERY ); } - //--------------------------- bool bAddFloorAndWall = DiagramHelper::isSupportingFloorAndWall( m_xDiagram ); //add back wall @@ -218,7 +215,6 @@ void VDiagram::createShapes_2d() } - //--------------------------- //position and size for diagram adjustPosAndSize_2d( m_aAvailablePosIncludingAxes, m_aAvailableSizeIncludingAxes ); } @@ -496,15 +492,11 @@ void VDiagram::createShapes_3d() uno::Reference< drawing::XShapes > xOuterGroup_Shapes = uno::Reference<drawing::XShapes>( m_xOuterGroupShape, uno::UNO_QUERY ); - - //------------------------------------------------------------------------- //create additional group to manipulate the aspect ratio of the whole diagram: xOuterGroup_Shapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, OUString() ); m_xAspectRatio3D = uno::Reference< beans::XPropertySet >( xOuterGroup_Shapes, uno::UNO_QUERY ); - //--------------------------- - bool bAddFloorAndWall = DiagramHelper::isSupportingFloorAndWall( m_xDiagram ); const bool bDoubleSided = false; @@ -661,7 +653,6 @@ void VDiagram::createShapes_3d() ShapeFactory::setShapeName( xShape, aFloorCID ); } } - //--------------------------- //create an additional scene for the smaller inner coordinate region: { @@ -774,8 +765,6 @@ void VDiagram::reduceToMimimumSize() return adjustPosAndSize( aNewPos, aNewSize ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/Clipping.hxx b/chart2/source/view/inc/Clipping.hxx index 56d8df60ab66..5243ec452196 100644 --- a/chart2/source/view/inc/Clipping.hxx +++ b/chart2/source/view/inc/Clipping.hxx @@ -23,12 +23,9 @@ #include <basegfx/range/b2drectangle.hxx> #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -56,9 +53,7 @@ public: , bool bSplitPiecesToDifferentPolygons = true ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/DateHelper.hxx b/chart2/source/view/inc/DateHelper.hxx index 90c50f5a74b6..f34f1ca71642 100644 --- a/chart2/source/view/inc/DateHelper.hxx +++ b/chart2/source/view/inc/DateHelper.hxx @@ -22,12 +22,9 @@ #include <com/sun/star/chart2/XScaling.hpp> #include <tools/date.hxx> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -45,9 +42,7 @@ public: static double RasterizeDateValue( double fValue, const Date& rNullDate, long TimeResolution ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/LabelPositionHelper.hxx b/chart2/source/view/inc/LabelPositionHelper.hxx index f67e4b4969c8..af2a2a030a74 100644 --- a/chart2/source/view/inc/LabelPositionHelper.hxx +++ b/chart2/source/view/inc/LabelPositionHelper.hxx @@ -26,12 +26,9 @@ #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/XShapes.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class PlottingPositionHelper; @@ -72,9 +69,7 @@ private: ShapeFactory* m_pShapeFactory; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx index b32855ab2258..fc54ca47c819 100644 --- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx +++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx @@ -24,12 +24,9 @@ #include <tools/date.hxx> #include <set> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -96,9 +93,7 @@ private: inline MinimumAndMaximumSupplierSet::iterator end() { return m_aMinimumAndMaximumSupplierList.end(); } }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index cb04561deac1..3deb8e42df24 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -32,10 +32,8 @@ #include <cppuhelper/implbase1.hxx> #include <vector> -//............................................................................. namespace chart { -//............................................................................. class ShapeFactory; class PlottingPositionHelper; @@ -88,9 +86,7 @@ protected: //member // needs to be created and deleted by the derived class PlottingPositionHelper* m_pPosHelper; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 5dd6dae8059d..4e2962647ac3 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -32,10 +32,8 @@ #include <com/sun/star/drawing/XShapes.hpp> #include <basegfx/matrix/b3dhommatrix.hxx> -//............................................................................. namespace chart { -//............................................................................. class ShapeFactory; @@ -406,9 +404,7 @@ inline bool PlottingPositionHelper::maySkipPointsInRegressionCalculation() const return m_bMaySkipPointsInRegressionCalculation; } -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/PolarLabelPositionHelper.hxx b/chart2/source/view/inc/PolarLabelPositionHelper.hxx index 7ffa3b1628ec..00a4e0929492 100644 --- a/chart2/source/view/inc/PolarLabelPositionHelper.hxx +++ b/chart2/source/view/inc/PolarLabelPositionHelper.hxx @@ -24,12 +24,9 @@ #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/drawing/Position3D.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class PolarPlottingPositionHelper; @@ -62,9 +59,7 @@ private: PolarPlottingPositionHelper* m_pPosHelper; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx index 04159ed9b588..eeae772af9b0 100644 --- a/chart2/source/view/inc/PropertyMapper.hxx +++ b/chart2/source/view/inc/PropertyMapper.hxx @@ -23,12 +23,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XShape.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -119,9 +116,7 @@ public: , tAnySequence& rPropValues ); }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/ScaleAutomatism.hxx b/chart2/source/view/inc/ScaleAutomatism.hxx index 4fa108e6a66b..b25b414669d5 100644 --- a/chart2/source/view/inc/ScaleAutomatism.hxx +++ b/chart2/source/view/inc/ScaleAutomatism.hxx @@ -24,12 +24,8 @@ #include <tools/date.hxx> -//............................................................................. namespace chart { -//............................................................................. - -//----------------------------------------------------------------------------- /** This class implements the calculation of automatic axis limits. */ @@ -120,9 +116,7 @@ private: Date m_aNullDate; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 83ee1a89ca45..c08361107dac 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -33,10 +33,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -//............................................................................. namespace chart { -//............................................................................. class Stripe; class ShapeFactory @@ -51,7 +49,6 @@ public: ::com::sun::star::drawing::XShapes >& xTarget , OUString aName = OUString() ); - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > createGroup3D( const ::com::sun::star::uno::Reference< @@ -159,8 +156,6 @@ public: , const ::com::sun::star::drawing::Position3D& rPos , const ::com::sun::star::drawing::Direction3D& rSize ); - //------------------- create 2D elements: - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D , const OUString& rText @@ -240,9 +235,7 @@ private: m_xShapeFactory; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx index 22886f0780f1..f14ad44f369f 100644 --- a/chart2/source/view/inc/Stripe.hxx +++ b/chart2/source/view/inc/Stripe.hxx @@ -23,12 +23,9 @@ #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/uno/Any.h> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** A Stripe represents a 2 dimensional foursquare plane in a 3 dimaensional room. @todo could: it is not necessary to have 4 point members here; it would be sufficient to have one point and 2 directions @@ -75,9 +72,7 @@ private: ::com::sun::star::drawing::Direction3D m_aManualNormal; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 6c33b3719015..3fc781b3e509 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -38,12 +38,9 @@ #include <boost/shared_ptr.hpp> #include <boost/scoped_ptr.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ class VAxisBase; @@ -196,9 +193,7 @@ private: boost::scoped_ptr< ExplicitCategoriesProvider > m_apExplicitCategoriesProvider; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index b7a5116b4317..224c54f4676b 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -51,7 +51,6 @@ public: sal_Int32 detectNumberFormatKey( sal_Int32 index ) const; sal_Int32 getLength() const; - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > Model; diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index eeadfcbf51bc..cc4603bd2bf3 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -25,14 +25,11 @@ #include "ShapeFactory.hxx" #include <basegfx/range/b2irectangle.hxx> -//............................................................................. namespace chart { -//............................................................................. class ShapeFactory; -//----------------------------------------------------------------------------- /** The VDiagram is responsible to generate the visible parts of the Diagram that is wall, floor, axes and data series. The axes and data series are subobjects which are created and managed by the @@ -117,10 +114,7 @@ private: //members ::com::sun::star::awt::Size m_aCurrentSizeWithoutAxes; }; -//............................................................................. } //namespace chart -//............................................................................. #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/VLineProperties.hxx b/chart2/source/view/inc/VLineProperties.hxx index 0f061e0919a3..494aee1b16c0 100644 --- a/chart2/source/view/inc/VLineProperties.hxx +++ b/chart2/source/view/inc/VLineProperties.hxx @@ -22,12 +22,9 @@ #include <com/sun/star/beans/XPropertySet.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -47,9 +44,7 @@ struct VLineProperties bool isLineVisible() const; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index d14306d80976..970bc1b9823e 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/drawing/Direction3D.hpp> - namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; @@ -157,9 +156,7 @@ public: virtual void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------- // MinimumAndMaximumSupplier - //------------------------------------------------------------------------- virtual double getMinimumX(); virtual double getMaximumX(); @@ -184,9 +181,6 @@ public: void getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximum ) const; void getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const; - //------------------------------------------------------------------------- - //------------------------------------------------------------------------- - virtual std::vector< ViewLegendEntry > createLegendEntries( const ::com::sun::star::awt::Size& rEntryKeyAspectRatio, ::com::sun::star::chart::ChartLegendExpansion eLegendExpansion, @@ -200,7 +194,6 @@ public: ::com::sun::star::uno::XComponentContext >& xContext ); - virtual LegendSymbolStyle getLegendSymbolStyle(); virtual com::sun::star::awt::Size getPreferredLegendKeyAspectRatio(); diff --git a/chart2/source/view/inc/ViewDefines.hxx b/chart2/source/view/inc/ViewDefines.hxx index 5a38fcd6bce8..b391c9b7b72b 100644 --- a/chart2/source/view/inc/ViewDefines.hxx +++ b/chart2/source/view/inc/ViewDefines.hxx @@ -22,9 +22,7 @@ namespace chart { -//========================================================================= // -//========================================================================= #define CHART_3DOBJECT_SEGMENTCOUNT ((sal_Int32)32) //There needs to be a little distance betweengrid lines and walls in 3D, otherwise the lines are partly hidden by the walls #define GRID_TO_WALL_DISTANCE (1.0) @@ -33,7 +31,6 @@ const double ZDIRECTION = 1.0; const sal_Int32 AXIS2D_TICKLENGTH = 150;//value like in old chart const sal_Int32 AXIS2D_TICKLABELSPACING = 100;//value like in old chart - }//end namespace chart #endif diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index 6057d0f262d2..c2c6507ce798 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartItemPool.hxx" #include "macros.hxx" #include "chartview/ChartSfxItemIds.hxx" diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index a19a4130914e..f783e2444473 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -230,8 +230,6 @@ void ChartView::impl_deleteCoordinateSystems() aVectorToDeleteObjects.clear(); } - -//----------------------------------------------------------------- // datatransfer::XTransferable namespace { @@ -352,7 +350,6 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast) ); } -//----------------------------------------------------------------- // ____ XUnoTunnel ___ ::sal_Int64 SAL_CALL ChartView::getSomething( const uno::Sequence< ::sal_Int8 >& aIdentifier ) throw( uno::RuntimeException) @@ -366,7 +363,6 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla return 0; } -//----------------------------------------------------------------- // lang::XServiceInfo APPHELPER_XSERVICEINFO_IMPL(ChartView,CHART_VIEW_SERVICE_IMPLEMENTATION_NAME) @@ -379,9 +375,6 @@ APPHELPER_XSERVICEINFO_IMPL(ChartView,CHART_VIEW_SERVICE_IMPLEMENTATION_NAME) return aSNS; } -//----------------------------------------------------------------- -//----------------------------------------------------------------- - ::basegfx::B3DHomMatrix createTransformationSceneToScreen( const ::basegfx::B2IRectangle& rDiagramRectangleWithoutAxes ) { @@ -528,8 +521,6 @@ sal_Int32 AxisUsage::getMaxAxisIndexForDimension( sal_Int32 nDimensionIndex ) return nRet; } -//----------------------------------------------------- - class SeriesPlotterContainer { public: @@ -594,7 +585,6 @@ std::vector< LegendEntryProvider* > SeriesPlotterContainer::getLegendEntryProvid void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( const uno::Reference< frame::XModel >& xChartModel ) { - //------------ get model series from model sal_Int32 nDiagramIndex = 0;//todo if more than one diagram is supported uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) ); if( !xDiagram.is()) @@ -638,7 +628,6 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( ASSERT_EXCEPTION( ex ); } - //--------------------------------------------------------------------- //prepare for autoscaling and shape creation // - create plotter for charttypes (for each first scale group at each plotter, as they are independent) // - add series to plotter (thus each charttype can provide minimum and maximum values for autoscaling) @@ -700,7 +689,6 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( if(pVCooSys) pVCooSys->addMinimumAndMaximumSupplier(pPlotter); - //------------ add series to plotter and thus prepare him(it) for providing minimum and maximum values uno::Reference< XDataSeriesContainer > xDataSeriesContainer( xChartType, uno::UNO_QUERY ); OSL_ASSERT( xDataSeriesContainer.is()); if( !xDataSeriesContainer.is() ) @@ -1181,8 +1169,6 @@ drawing::Direction3D SeriesPlotterContainer::getPreferredAspectRatio() return aPreferredAspectRatio; } -//----------------------------------------------------- - namespace { @@ -1343,8 +1329,6 @@ sal_Int16 lcl_getDefaultWritingModeFromPool( ::boost::shared_ptr< DrawModelWrapp } //end anonymous namespace -//------------ create complete diagram shape (inclusive axis and series) - awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlotterContainer , const uno::Reference< drawing::XShapes>& xDiagramPlusAxes_Shapes , const awt::Point& rAvailablePos @@ -1394,7 +1378,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& ); } - // - prepare list of all axis and how they are used Date aNullDate = NumberFormatterWrapper( uno::Reference< util::XNumberFormatsSupplier >( m_xChartModel, uno::UNO_QUERY ) ).getNullDate(); rSeriesPlotterContainer.initAxisUsageList(aNullDate); @@ -1402,10 +1385,8 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlotterContainer.setScalesFromCooSysToPlotter(); rSeriesPlotterContainer.setNumberFormatsFromAxes(); - //--------------------------------------------------------------------- //create shapes - //------------ create diagram shapes //aspect ratio drawing::Direction3D aPreferredAspectRatio( rSeriesPlotterContainer.getPreferredAspectRatio() ); @@ -1503,7 +1484,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& const ::std::vector< VSeriesPlotter* >::const_iterator aPlotterEnd = rSeriesPlotterList.end(); for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter ) { - //------------ set transformation to plotter / create series VSeriesPlotter* pSeriesPlotter = *aPlotterIter; OUString aCID; //III uno::Reference< drawing::XShapes > xSeriesTarget(0); @@ -1563,7 +1543,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& // - create data series for all charttypes for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; ++aPlotterIter ) { - //------------ set transformation to plotter / create series VSeriesPlotter* pSeriesPlotter = *aPlotterIter; VCoordinateSystem* pVCooSys = lcl_getCooSysForPlotter( rVCooSysList, pSeriesPlotter ); if(2==nDimensionCount) @@ -1635,10 +1614,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& return aUsedOuterRect; } -//------------------------------------------------------------- -//------------------------------------------------------------- -//------------------------------------------------------------- - sal_Bool ChartView::getExplicitValuesForAxis( uno::Reference< XAxis > xAxis , ExplicitScaleData& rExplicitScale @@ -2325,7 +2300,6 @@ void formatPage( if( ! xModelPage.is()) return; - if( !xShapeFactory.is() ) return; @@ -2468,7 +2442,6 @@ void ChartView::createShapes() { SolarMutexGuard aSolarGuard; - //------------ apply fill properties to page // todo: it would be nicer to just pass the page m_xDrawPage and format it, // but the draw page does not support XPropertySet formatPage( m_xChartModel, aPageSize, xPageShapes, m_xShapeFactory ); @@ -2493,24 +2466,19 @@ void ChartView::createShapes() bool bAutoPositionDummy = true; - //------------ create main title shape lcl_createTitle( TitleHelper::MAIN_TITLE, xPageShapes, m_xShapeFactory, m_xChartModel , aRemainingSpace, aPageSize, ALIGN_TOP, bAutoPositionDummy ); if(aRemainingSpace.Width<=0||aRemainingSpace.Height<=0) return; - //------------ create sub title shape lcl_createTitle( TitleHelper::SUB_TITLE, xPageShapes, m_xShapeFactory, m_xChartModel , aRemainingSpace, aPageSize, ALIGN_TOP, bAutoPositionDummy ); if(aRemainingSpace.Width<=0||aRemainingSpace.Height<=0) return; - - //------------ prepare series to give input to the legend (create categories and symbols etc.) SeriesPlotterContainer aSeriesPlotterContainer( m_aVCooSysList ); aSeriesPlotterContainer.initializeCooSysAndSeriesPlotter( m_xChartModel ); - //------------ create legend lcl_createLegend( LegendHelper::getLegend( m_xChartModel ), xPageShapes, m_xShapeFactory, m_xCC , aRemainingSpace, aPageSize, m_xChartModel, aSeriesPlotterContainer.getLegendEntryProviderList() , lcl_getDefaultWritingModeFromPool( m_pDrawModelWrapper ) ); @@ -2520,7 +2488,6 @@ void ChartView::createShapes() Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); sal_Int32 nDimension = DiagramHelper::getDimension( xDiagram ); - //------------ create x axis title bool bAutoPosition_XTitle = true; boost::shared_ptr<VTitle> apVTitle_X; if( ChartTypeHelper::isSupportingMainAxis( xChartType, nDimension, 0 ) ) @@ -2529,7 +2496,6 @@ void ChartView::createShapes() if(aRemainingSpace.Width<=0||aRemainingSpace.Height<=0) return; - //------------ create y axis title bool bAutoPosition_YTitle = true; boost::shared_ptr<VTitle> apVTitle_Y; if( ChartTypeHelper::isSupportingMainAxis( xChartType, nDimension, 1 ) ) @@ -2538,7 +2504,6 @@ void ChartView::createShapes() if(aRemainingSpace.Width<=0||aRemainingSpace.Height<=0) return; - //------------ create z axis title bool bAutoPosition_ZTitle = true; boost::shared_ptr<VTitle> apVTitle_Z; if( ChartTypeHelper::isSupportingMainAxis( xChartType, nDimension, 2 ) ) @@ -2550,7 +2515,6 @@ void ChartView::createShapes() bool bDummy = false; bool bIsVertical = DiagramHelper::getVertical( xDiagram, bDummy, bDummy ); - //------------ create secondary x axis title bool bAutoPosition_SecondXTitle = true; boost::shared_ptr<VTitle> apVTitle_SecondX; if( ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimension, 0 ) ) @@ -2559,7 +2523,6 @@ void ChartView::createShapes() if(aRemainingSpace.Width<=0||aRemainingSpace.Height<=0) return; - //------------ create secondary y axis title bool bAutoPosition_SecondYTitle = true; boost::shared_ptr<VTitle> apVTitle_SecondY; if( ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimension, 1 ) ) @@ -2568,7 +2531,6 @@ void ChartView::createShapes() if(aRemainingSpace.Width<=0||aRemainingSpace.Height<=0) return; - //------------ create complete diagram shape (inclusive axis and series) awt::Point aAvailablePosDia; awt::Size aAvailableSizeForDiagram; bool bUseFixedInnerSize = false; @@ -2618,9 +2580,7 @@ void ChartView::createShapes() #endif } -//----------------------------------------------------------------- // util::XEventListener (base of XCloseListener) -//----------------------------------------------------------------- void SAL_CALL ChartView::disposing( const lang::EventObject& /* rSource */ ) throw(uno::RuntimeException) { @@ -3032,8 +2992,6 @@ OUString ChartView::dump() throw (uno::RuntimeException) } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx index a6e9e916807c..c57dcfbae3b1 100644 --- a/chart2/source/view/main/ChartView.hxx +++ b/chart2/source/view/main/ChartView.hxx @@ -112,16 +112,12 @@ public: virtual ::sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------- // ::com::sun::star::util::XEventListener (base of XCloseListener and XModifyListener) - //------------------------------------------------------------------------------------- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::util::XModifyListener - //----------------------------------------------------------------- virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException); @@ -129,23 +125,17 @@ public: //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - //----------------------------------------------------------------- // ::com::sun::star::util::XModeChangeBroadcaster - //----------------------------------------------------------------- virtual void SAL_CALL addModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL addModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::util::XUpdatable - //----------------------------------------------------------------- virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::beans::XPropertySet - //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); @@ -154,9 +144,7 @@ public: virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------- // ::com::sun::star::lang::XMultiServiceFactory - //----------------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( @@ -198,7 +186,6 @@ private: //methods , bool bUseFixedInnerSize , const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& xDiagram_MarkHandles ); - private: //member ::osl::Mutex m_aMutex; diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx index 00b424427128..65deaa52c9a5 100644 --- a/chart2/source/view/main/Clipping.cxx +++ b/chart2/source/view/main/Clipping.cxx @@ -24,18 +24,12 @@ #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/DoubleSequence.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using ::basegfx::B2DRectangle; using ::basegfx::B2DTuple; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - namespace{ /** @descr This is a supporting function for lcl_clip2d. It computes a new parametric value for an entering (dTE) or leaving (dTL) intersection point with one @@ -287,8 +281,6 @@ void Clipping::clipPolygonAtRectangle( const drawing::PolyPolygonShape3D& rPolyg } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx index cdd80540093a..5ce3f65f9932 100644 --- a/chart2/source/view/main/DataPointSymbolSupplier.cxx +++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "chartview/DataPointSymbolSupplier.hxx" #include "ShapeFactory.hxx" #include "macros.hxx" -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList( @@ -50,8 +47,6 @@ uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList( return xGroupShapes; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index 2a2bc1838db1..2a0abf188ce1 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "chartview/DrawModelWrapper.hxx" #include "macros.hxx" #include "ShapeFactory.hxx" @@ -59,7 +58,6 @@ using namespace ::com::sun::star; -//............................................................................. namespace { // this code is copied from sfx2/source/doc/objembed.cxx @@ -101,10 +99,8 @@ OutputDevice * lcl_GetParentRefDevice( const uno::Reference< frame::XModel > & x } // anonymous namespace -//.. ........................................................................... namespace chart { -//............................................................................. DrawModelWrapper::DrawModelWrapper( uno::Reference<uno::XComponentContext> const & xContext ) @@ -394,8 +390,6 @@ bool DrawModelWrapper::removeShape( const uno::Reference< drawing::XShape >& xSh return false; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx index 2ef17307407b..fd2c9b4add9a 100644 --- a/chart2/source/view/main/LabelPositionHelper.cxx +++ b/chart2/source/view/main/LabelPositionHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "LabelPositionHelper.hxx" #include "PlottingPositionHelper.hxx" #include "CommonConverters.hxx" @@ -28,10 +27,8 @@ #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -102,7 +99,6 @@ void LabelPositionHelper::doDynamicFontResize( tAnySequence& rPropValues , const awt::Size& rNewReferenceSize ) { - //------------------------- //handle dynamic font resize: awt::Size aOldReferenceSize; if( xAxisModelProps->getPropertyValue( "ReferencePageSize") >>= aOldReferenceSize ) @@ -470,8 +466,6 @@ void LabelPositionHelper::correctPositionForRotation( const uno::Reference< draw , static_cast<sal_Int32>(aOldPos.Y + fYCorrection ) ) ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx index 914e0a4b52d9..c909d24cdfa2 100644 --- a/chart2/source/view/main/Linear3DTransformation.cxx +++ b/chart2/source/view/main/Linear3DTransformation.cxx @@ -93,7 +93,6 @@ sal_Int32 SAL_CALL Linear3DTransformation::getTargetDimension() return 3; } - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index 0067632842b8..f079d90da7fe 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -23,17 +23,11 @@ #include <rtl/math.hxx> #include <com/sun/star/chart2/DataPointLabel.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - PlotterBase::PlotterBase( sal_Int32 nDimensionCount ) : m_xLogicTarget(NULL) , m_xFinalTarget(NULL) @@ -71,7 +65,6 @@ void PlotterBase::setScales( const std::vector< ExplicitScaleData >& rScales, bo m_pPosHelper->setScales( rScales, bSwapXAndYAxis ); } - void PlotterBase::setTransformationSceneToScreen( const drawing::HomogenMatrix& rMatrix) { OSL_PRECOND(m_nDimension==2,"Set this transformation only in case of 2D"); @@ -116,8 +109,6 @@ bool PlotterBase::isValidPosition( const drawing::Position3D& rPos ) return true; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index 76c2bc9ac78c..1269536bb43a 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -34,10 +34,8 @@ #include <rtl/math.hxx> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -247,7 +245,6 @@ void PlottingPositionHelper::transformScaledLogicToScene( drawing::PolyPolygonSh } } - void PlottingPositionHelper::clipScaledLogicValues( double* pX, double* pY, double* pZ ) const { //get logic clip values: @@ -323,10 +320,6 @@ drawing::Direction3D PlottingPositionHelper::getScaledLogicWidth() const return aRet; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- - PolarPlottingPositionHelper::PolarPlottingPositionHelper( NormalAxis eNormalAxis ) : m_fRadiusOffset(0.0) , m_fAngleDegreeOffset(90.0) diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx index 23d5194d2f1e..f620f18da0bf 100644 --- a/chart2/source/view/main/PolarLabelPositionHelper.cxx +++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "PolarLabelPositionHelper.hxx" #include "PlottingPositionHelper.hxx" #include "CommonConverters.hxx" @@ -26,10 +25,8 @@ #include <com/sun/star/chart/DataLabelPlacement.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -122,7 +119,6 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi fAngleDegree = 270.0; } } - //------------------------------ //set LabelAlignment if( !bCenter ) { @@ -173,8 +169,6 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi return aRet; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 18339acfea38..b4c276c17299 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -27,10 +27,8 @@ #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/drawing/LineJoint.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; namespace @@ -461,8 +459,6 @@ void PropertyMapper::getPreparedTextShapePropertyLists( PropertyMapper::getMultiPropertyListsFromValueMap( rPropNames, rPropValues, aValueMap ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 5ce6f7290597..c3629da6f1b3 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -41,7 +41,6 @@ #include <com/sun/star/text/XText.hpp> #include <com/sun/star/uno/Any.hxx> - #include <editeng/unoprnms.hxx> #include <rtl/math.hxx> #include <svx/svdocirc.hxx> @@ -55,16 +54,10 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- // set a name/CID at a shape (is used for selection handling) -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape , const OUString& rName ) @@ -87,8 +80,6 @@ void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape } } -//----------------------------------------------------------------------------- - OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xShape ) { OUString aRet; @@ -110,8 +101,6 @@ OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xS return aRet; } -//----------------------------------------------------------------------------- - uno::Reference< drawing::XShapes > ShapeFactory::getChartRootShape( const uno::Reference< drawing::XDrawPage>& xDrawPage ) { @@ -136,8 +125,6 @@ uno::Reference< drawing::XShapes > ShapeFactory::getChartRootShape( return xRet; } -//----------------------------------------------------------------------------- - uno::Reference< drawing::XShapes > ShapeFactory::getOrCreateChartRootShape( const uno::Reference< drawing::XDrawPage>& xDrawPage ) { @@ -152,11 +139,7 @@ uno::Reference< drawing::XShapes > ShapeFactory::getOrCreateChartRootShape( return xRet; } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- // diverse PolyPolygon create methods -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- uno::Any createPolyPolygon_Cube( const drawing::Direction3D& rSize, double fRoundedEdge, bool bRounded = true ) @@ -179,7 +162,6 @@ uno::Any createPolyPolygon_Cube( const bool bRoundEdges = fRoundedEdge && fOffset < fWidthH && 2.0 * fOffset < fHeightSign*fHeight; const sal_Int32 nPointCount = bRoundEdges ? 13 : 5; - //-------------------------------------- drawing::PolyPolygonShape3D aPP; aPP.SequenceX.realloc(1); @@ -256,7 +238,6 @@ uno::Any createPolyPolygon_Cylinder( //fHeight may be negative OSL_PRECOND(fRadius>0, "The radius of a cylinder needs to be > 0"); - //-------------------------------------- drawing::PolyPolygonShape3D aPP; nVerticalSegmentCount=1; @@ -283,7 +264,6 @@ uno::Any createPolyPolygon_Cylinder( if( fHeight<0.0 ) ::std::swap(fY1,fY2); - //---------------------------- for(sal_Int32 nN = 2; nN--;) *pInnerSequenceZ++ = 0.0; @@ -292,7 +272,6 @@ uno::Any createPolyPolygon_Cylinder( *pInnerSequenceX++ = fRadius; *pInnerSequenceY++ = fY1; - //---------------------------- pOuterSequenceX++;pOuterSequenceY++;pOuterSequenceZ++; pOuterSequenceX->realloc(2); @@ -303,7 +282,6 @@ uno::Any createPolyPolygon_Cylinder( pInnerSequenceY = pOuterSequenceY->getArray(); pInnerSequenceZ = pOuterSequenceZ->getArray(); - //---------------------------- for(sal_Int32 nN = 2; nN--;) *pInnerSequenceZ++ = 0.0; @@ -312,7 +290,6 @@ uno::Any createPolyPolygon_Cylinder( *pInnerSequenceX++ = fRadius; *pInnerSequenceY++ = fY2; - //---------------------------- pOuterSequenceX++;pOuterSequenceY++;pOuterSequenceZ++; pOuterSequenceX->realloc(2); @@ -323,7 +300,6 @@ uno::Any createPolyPolygon_Cylinder( pInnerSequenceY = pOuterSequenceY->getArray(); pInnerSequenceZ = pOuterSequenceZ->getArray(); - //---------------------------- for(sal_Int32 nN = 2; nN--;) *pInnerSequenceZ++ = 0.0; @@ -332,7 +308,6 @@ uno::Any createPolyPolygon_Cylinder( *pInnerSequenceX++ = 0.0; *pInnerSequenceY++ = fY2; - //---------------------------- return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) ); } @@ -384,7 +359,6 @@ uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeig ::std::swap(fY1,fY3); } - //---------------------------- for(sal_Int32 nN = 2; nN--;) *pInnerSequenceZ++ = 0.0; @@ -393,7 +367,6 @@ uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeig *pInnerSequenceY++ = fY2; *pInnerSequenceX++ = fX2; - //---------------------------- pOuterSequenceX++;pOuterSequenceY++;pOuterSequenceZ++; pOuterSequenceX->realloc(2); @@ -404,7 +377,6 @@ uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeig pInnerSequenceY = pOuterSequenceY->getArray(); pInnerSequenceZ = pOuterSequenceZ->getArray(); - //---------------------------- for(sal_Int32 nN = 2; nN--;) *pInnerSequenceZ++ = 0.0; @@ -413,16 +385,11 @@ uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeig *pInnerSequenceY++ = fY3; *pInnerSequenceX++ = fX3; - //---------------------------- return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) ); } -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- // methods for 3D shape creation -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- uno::Reference<drawing::XShape> ShapeFactory::createCube( @@ -769,10 +736,6 @@ uno::Reference<drawing::XShape> return xShape; } -//------------------------------------------------------------------------------------------------------------ -//------------------------------------------------------------------------------------------------------------ -//------------------------------------------------------------------------------------------------------------ - void appendAndCloseBezierCoords( drawing::PolyPolygonBezierCoords& rReturn, const drawing::PolyPolygonBezierCoords& rAdd, sal_Bool bAppendInverse ) { if(!rAdd.Coordinates.getLength()) @@ -798,8 +761,6 @@ void appendAndCloseBezierCoords( drawing::PolyPolygonBezierCoords& rReturn, cons rReturn.Flags[0][nOldCount+nAddCount] = rReturn.Flags[0][0]; } -//------------------------------------------------------------------------------------------------------------ - drawing::PolyPolygonBezierCoords getCircularArcBezierCoords( double fStartAngleRadian, double fWidthAngleRadian, double fUnitRadius , const ::basegfx::B2DHomMatrix& rTransformationFromUnitCircle @@ -913,8 +874,6 @@ drawing::PolyPolygonBezierCoords getCircularArcBezierCoords( return aReturn; } -//------------------------------------------------------------------------------------------------------------ - drawing::PolyPolygonBezierCoords getRingBezierCoords( double fUnitCircleInnerRadius , double fUnitCircleOuterRadius @@ -939,8 +898,6 @@ drawing::PolyPolygonBezierCoords getRingBezierCoords( return aReturn; } -//------------------------------------------------------------------------------------------------------------ - uno::Reference< drawing::XShape > ShapeFactory::createPieSegment2D( const uno::Reference< drawing::XShapes >& xTarget @@ -991,8 +948,6 @@ uno::Reference< drawing::XShape > return xShape; } -//------------------------------------------------------------------------------------------------------------ - uno::Reference< drawing::XShape > ShapeFactory::createPieSegment( const uno::Reference< drawing::XShapes >& xTarget @@ -1074,10 +1029,6 @@ uno::Reference< drawing::XShape > return xShape; } -//------------------------------------------------------------------------------------------------------------ -//------------------------------------------------------------------------------------------------------------ -//------------------------------------------------------------------------------------------------------------ - uno::Reference< drawing::XShape > ShapeFactory::createStripe( const uno::Reference< drawing::XShapes >& xTarget , const Stripe& rStripe @@ -1315,7 +1266,6 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D& break; } - //-------------------------------------- drawing::PolyPolygonShape3D aPP; aPP.SequenceX.realloc(1); @@ -1446,7 +1396,6 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D& *pInnerSequenceX++ = fX-fWidthH; *pInnerSequenceY++ = fY-fHeightH; - *pInnerSequenceX++ = fX+fWidthH; *pInnerSequenceY++ = fY-fHeightH; @@ -1480,7 +1429,6 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D& *pInnerSequenceX++ = fX+fWidthH; *pInnerSequenceY++ = fY-0.2*fHeightH; - *pInnerSequenceX++ = fX+fWidthH; *pInnerSequenceY++ = fY+0.2*fHeightH; @@ -1499,7 +1447,6 @@ drawing::PolyPolygonShape3D createPolyPolygon_Symbol( const drawing::Position3D& *pInnerSequenceX++ = fX+0.2*fWidthH; *pInnerSequenceY++ = fY-fHeightH; - *pInnerSequenceX++ = fX+0.2*fWidthH; *pInnerSequenceY++ = fY+fHeightH; @@ -2366,8 +2313,6 @@ void ShapeFactory::removeSubShapes( const uno::Reference< drawing::XShapes >& xS } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx index bc6a0846943f..2d99143152b0 100644 --- a/chart2/source/view/main/Stripe.cxx +++ b/chart2/source/view/main/Stripe.cxx @@ -26,10 +26,8 @@ using namespace ::com::sun::star; -//............................................................................. namespace chart { -//............................................................................. Stripe::Stripe( const drawing::Position3D& rPoint1 , const drawing::Direction3D& rDirectionToPoint2 @@ -345,8 +343,6 @@ uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const return uno::Any( &aPP, ::getCppuType((const drawing::PolyPolygonShape3D*)0) ); } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 6296c0151482..b4b17382a6be 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -48,10 +48,8 @@ using namespace ::com::sun::star::chart2; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Sequence; -//............................................................................. namespace chart { -//............................................................................. namespace { @@ -796,8 +794,6 @@ VLegend::VLegend( { } -// ---------------------------------------- - void VLegend::init( const Reference< drawing::XShapes >& xTargetPage, const Reference< lang::XMultiServiceFactory >& xFactory, @@ -808,15 +804,11 @@ void VLegend::init( m_xModel = xModel; } -// ---------------------------------------- - void VLegend::setDefaultWritingMode( sal_Int16 nDefaultWritingMode ) { m_nDefaultWritingMode = nDefaultWritingMode; } -// ---------------------------------------- - bool VLegend::isVisible( const Reference< XLegend > & xLegend ) { if( ! xLegend.is()) @@ -836,8 +828,6 @@ bool VLegend::isVisible( const Reference< XLegend > & xLegend ) return bShow; } -// ---------------------------------------- - void VLegend::createShapes( const awt::Size & rAvailableSpace, const awt::Size & rPageSize ) @@ -960,8 +950,6 @@ void VLegend::createShapes( } } -// ---------------------------------------- - void VLegend::changePosition( awt::Rectangle & rOutAvailableSpace, const awt::Size & rPageSize ) @@ -1014,8 +1002,6 @@ void VLegend::changePosition( } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/VLegend.hxx b/chart2/source/view/main/VLegend.hxx index 4fb7d98ba364..f3117237147d 100644 --- a/chart2/source/view/main/VLegend.hxx +++ b/chart2/source/view/main/VLegend.hxx @@ -28,14 +28,11 @@ #include <vector> -//............................................................................. namespace chart { -//............................................................................. class LegendEntryProvider; -//----------------------------------------------------------------------------- /** */ @@ -96,9 +93,7 @@ private: sal_Int16 m_nDefaultWritingMode;//to be used when writing mode is set to page }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index 22c4155811d9..8cf06e6913bf 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -17,22 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "VLineProperties.hxx" #include "macros.hxx" #include <com/sun/star/drawing/LineStyle.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- // get line properties from a propertyset -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- VLineProperties::VLineProperties() { @@ -94,8 +87,6 @@ bool VLineProperties::isLineVisible() const return bRet; } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx index d82a5aa4fe91..856509c2c878 100644 --- a/chart2/source/view/main/VPolarTransformation.cxx +++ b/chart2/source/view/main/VPolarTransformation.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "VPolarTransformation.hxx" #include "ViewDefines.hxx" #include "CommonConverters.hxx" @@ -31,7 +30,6 @@ using ::com::sun::star::uno::RuntimeException; namespace chart { - VPolarTransformation::VPolarTransformation( const PolarPlottingPositionHelper& rPositionHelper ) : m_aPositionHelper(rPositionHelper) , m_aUnitCartesianToScene( rPositionHelper.getUnitCartesianToScene() ) @@ -80,7 +78,6 @@ sal_Int32 SAL_CALL VPolarTransformation::getTargetDimension() return 3; } - } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx index 0fb341b1ef18..81b1be50e79d 100644 --- a/chart2/source/view/main/VTitle.cxx +++ b/chart2/source/view/main/VTitle.cxx @@ -32,10 +32,8 @@ #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XTextCursor.hpp> -//............................................................................. namespace chart { -//............................................................................. using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -276,8 +274,6 @@ void VTitle::createShapes( } } -//............................................................................. } //namespace chart -//............................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx index f9699cd85548..97e630d1ebc5 100644 --- a/chart2/source/view/main/VTitle.hxx +++ b/chart2/source/view/main/VTitle.hxx @@ -23,12 +23,9 @@ #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -//............................................................................. namespace chart { -//............................................................................. -//----------------------------------------------------------------------------- /** */ @@ -68,9 +65,7 @@ private: sal_Int32 m_nYPos; }; -//............................................................................. } //namespace chart -//............................................................................. #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/view/main/_serviceregistration_view.cxx b/chart2/source/view/main/_serviceregistration_view.cxx index ae434a46ed90..e15fedb747fc 100644 --- a/chart2/source/view/main/_serviceregistration_view.cxx +++ b/chart2/source/view/main/_serviceregistration_view.cxx @@ -44,6 +44,5 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartview_component_getFactory( pImplName, pServiceManager, pRegistryKey , g_entries_chart2_view ); } } -//========================================================================= /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |