diff options
Diffstat (limited to 'chart2/source/view')
-rw-r--r-- | chart2/source/view/axes/VAxisProperties.hxx | 2 | ||||
-rw-r--r-- | chart2/source/view/charttypes/BarChart.cxx | 2 | ||||
-rw-r--r-- | chart2/source/view/charttypes/BarChart.hxx | 2 | ||||
-rw-r--r-- | chart2/source/view/charttypes/VSeriesPlotter.cxx | 4 | ||||
-rw-r--r-- | chart2/source/view/inc/VCoordinateSystem.hxx | 2 | ||||
-rw-r--r-- | chart2/source/view/inc/VDataSeries.hxx | 2 | ||||
-rw-r--r-- | chart2/source/view/inc/VSeriesPlotter.hxx | 2 | ||||
-rw-r--r-- | chart2/source/view/main/ChartView.cxx | 10 | ||||
-rw-r--r-- | chart2/source/view/main/ChartView.hxx | 2 | ||||
-rw-r--r-- | chart2/source/view/main/Clipping.cxx | 2 | ||||
-rw-r--r-- | chart2/source/view/main/PolarLabelPositionHelper.cxx | 2 | ||||
-rw-r--r-- | chart2/source/view/main/VLegend.cxx | 2 |
12 files changed, 17 insertions, 17 deletions
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index 9e57ee4b5c65..3cb8de727ed3 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -86,7 +86,7 @@ struct AxisLabelProperties double fRotationAngleDegree; sal_Int32 nRhythm; //show only each nth label with n==nRhythm - bool bRhythmIsFix; //states wether the given rhythm is fix or may be changed + bool bRhythmIsFix; //states whether the given rhythm is fix or may be changed //methods: void init( const ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 2beca1158479..b7dc757a6486 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -586,7 +586,7 @@ void BarChart::createShapes() bDrawConnectionLines = false; if( bDrawConnectionLines && pSeriesList->size()==1 ) { - //detect wether we have a stacked chart or not: + //detect whether we have a stacked chart or not: StackingDirection eDirection = pSeries->getStackingDirection(); if( eDirection != StackingDirection_Y_STACKING ) bDrawConnectionLines = false; diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index 93816beb33ae..68a8db8af201 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -80,7 +80,7 @@ private: //methods , double fScaledLowerBarDepth, double fScaledUpperBarDepth, double fBaseValue , BarPositionHelper* pPosHelper ) const; - virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const;//nAxisIndex indicates wether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 ) + virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const;//nAxisIndex indicates whether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 ) void adaptOverlapAndGapwidthForGroupBarsPerAxis(); diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 6af1d3d11445..82cec0cc9bf3 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -447,7 +447,7 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re m_pShapeFactory->createGroup2D( this->getLabelsGroupShape(rDataSeries, xTarget) , ObjectIdentifier::createPointCID( rDataSeries.getLabelCID_Stub(),nPointIndex ) ) ); - //check wether the label needs to be created and how: + //check whether the label needs to be created and how: DataPointLabel* pLabel = rDataSeries.getDataPointLabelIfLabel( nPointIndex ); if( !pLabel ) @@ -1113,7 +1113,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes( chart2::RelativePosition aRelativePosition; if( xEquationProperties->getPropertyValue( C2U("RelativePosition")) >>= aRelativePosition ) { - //@todo decide wether x is primary or secondary + //@todo decide whether x is primary or secondary double fX = aRelativePosition.Primary*m_aPageReferenceSize.Width; double fY = aRelativePosition.Secondary*m_aPageReferenceSize.Height; aScreenPosition2D.X = static_cast< sal_Int32 >( ::rtl::math::round( fX )); diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index f4b5e380d8b0..4efe6288873f 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -165,7 +165,7 @@ protected: //member rtl::OUString m_aCooSysParticle; - typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates wether this is a main or secondary axis + typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates whether this is a main or secondary axis // ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index a7738e7f54f4..55e0a9692172 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -218,7 +218,7 @@ private: //member ::com::sun::star::chart2::StackingDirection m_eStackingDirection; - sal_Int32 m_nAxisIndex;//indicates wether this is attached to a main or secondary axis + sal_Int32 m_nAxisIndex;//indicates whether this is attached to a main or secondary axis sal_Bool m_bConnectBars; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 53cabce9ecc4..00996a11a12f 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -407,7 +407,7 @@ protected: //methods , const tPropertyNameMap& rMap , tPropertyNameValueMap* pOverwriteMap=0 ); - virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const;//nAxisIndex indicates wether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 ) + virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const;//nAxisIndex indicates whether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 ) VDataSeries* getFirstSeries() const; diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 1750879eaef0..9297cef1b779 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -443,7 +443,7 @@ VCoordinateSystem* lcl_getCooSysForPlotter( const std::vector< VCoordinateSystem return 0; } -typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates wether this is a main or secondary axis +typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates whether this is a main or secondary axis typedef std::pair< VCoordinateSystem* , tFullAxisIndex > tFullCoordinateSystem; typedef std::map< VCoordinateSystem*, tFullAxisIndex > tCoordinateSystemMap; @@ -1881,7 +1881,7 @@ awt::Rectangle ExplicitValueProvider::addAxisTitleSizes( ExplicitValueProvider* pExplicitValueProvider = ExplicitValueProvider::getExplicitValueProvider(xChartView); if( pExplicitValueProvider ) { - //detect wether x axis points into x direction or not + //detect whether x axis points into x direction or not if( lcl_getPropertySwapXAndYAxis( ChartModelHelper::findDiagram( xChartModel ) ) ) { std::swap( xTitle_Height, xTitle_Width ); @@ -1948,7 +1948,7 @@ awt::Rectangle ExplicitValueProvider::substractAxisTitleSizes( ExplicitValueProvider* pExplicitValueProvider = ExplicitValueProvider::getExplicitValueProvider(xChartView); if( pExplicitValueProvider ) { - //detect wether x axis points into x direction or not + //detect whether x axis points into x direction or not if( lcl_getPropertySwapXAndYAxis( ChartModelHelper::findDiagram( xChartModel ) ) ) { std::swap( xTitle_Height, xTitle_Width ); @@ -2046,7 +2046,7 @@ bool getAvailablePosAndSizeForDiagram( chart2::RelativePosition aRelativePosition; if( xProp.is() && (xProp->getPropertyValue( C2U( "RelativePosition" ) )>>=aRelativePosition) ) { - //@todo decide wether x is primary or secondary + //@todo decide whether x is primary or secondary //the coordinates re relative to the page double fX = aRelativePosition.Primary*rPageSize.Width; @@ -2178,7 +2178,7 @@ std::auto_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType { rbAutoPosition = false; - //@todo decide wether x is primary or secondary + //@todo decide whether x is primary or secondary double fX = aRelativePosition.Primary*rPageSize.Width; double fY = aRelativePosition.Secondary*rPageSize.Height; diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx index a7aec605e89b..32beb467e791 100644 --- a/chart2/source/view/main/ChartView.hxx +++ b/chart2/source/view/main/ChartView.hxx @@ -235,7 +235,7 @@ private: //member ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; - bool volatile m_bViewDirty; //states wether the view needs to be rebuild + bool volatile m_bViewDirty; //states whether the view needs to be rebuild bool volatile m_bInViewUpdate; bool volatile m_bViewUpdatePending; bool volatile m_bRefreshAddIn; diff --git a/chart2/source/view/main/Clipping.cxx b/chart2/source/view/main/Clipping.cxx index 667e9544a123..d2fc334de1cb 100644 --- a/chart2/source/view/main/Clipping.cxx +++ b/chart2/source/view/main/Clipping.cxx @@ -113,7 +113,7 @@ bool lcl_clip2d(B2DTuple& rPoint0, B2DTuple& rPoint1, const B2DRectangle& rRecta double fTE = 0, fTL = 1; - // Test wether at least a part lies in the four half-planes with respect to + // Test whether at least a part lies in the four half-planes with respect to // the rectangles four edges. if( lcl_CLIPt(aDirection.getX(), rRectangle.getMinX() - rPoint0.getX(), fTE, fTL) ) if( lcl_CLIPt(-aDirection.getX(), rPoint0.getX() - rRectangle.getMaxX(), fTE, fTL) ) diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx b/chart2/source/view/main/PolarLabelPositionHelper.cxx index c62215b2efc2..dbce1afba98d 100644 --- a/chart2/source/view/main/PolarLabelPositionHelper.cxx +++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx @@ -94,7 +94,7 @@ awt::Point PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi if(3==m_nDimensionCount && nLabelPlacement == ::com::sun::star::chart::DataLabelPlacement::OUTSIDE) { - //check wether the upper or the downer edge is more distant from the center + //check whether the upper or the downer edge is more distant from the center //take the farest point to put the label to awt::Point aP0( this->transformSceneToScreenPosition( diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 469ab95f50d0..bd575c284a3d 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -358,7 +358,7 @@ awt::Size lcl_placeLegendEntries( nCurrentColumn++; if( nCurrentColumn < nCurrentColumnCount ) { - //check wether the current column width is sufficient for the new entry + //check whether the current column width is sufficient for the new entry if( aColumnWidths[nCurrentColumn]>=nNewWidth ) { //all good proceed with next entry |