diff options
Diffstat (limited to 'chart2/source')
17 files changed, 31 insertions, 31 deletions
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index 4c3fd3c31c22..8f7b0cdb8146 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -99,7 +99,7 @@ ThreeD_SceneAppearance_TabPage::ThreeD_SceneAppearance_TabPage( , m_xChartModel ( xChartModel ) , m_aFT_Scheme ( this, SchResId( FT_SCHEME ) ) , m_aLB_Scheme ( this, SchResId( LB_SCHEME ) ) - , m_aFL_Seperator ( this, SchResId( FL_SEPERATOR ) ) + , m_aFL_Separator ( this, SchResId( FL_SEPARATOR ) ) , m_aCB_Shading ( this, SchResId( CB_SHADING ) ) , m_aCB_ObjectLines ( this, SchResId( CB_OBJECTLINES ) ) , m_aCB_RoundedEdge ( this, SchResId( CB_ROUNDEDEDGE ) ) diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc index ed579afb1e32..66fc1d2691d2 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hrc @@ -24,7 +24,7 @@ #define CB_SHADING 2 #define CB_ROUNDEDEDGE 3 -#define FL_SEPERATOR 1 +#define FL_SEPARATOR 1 #define LB_SCHEME 2 diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index b23e254cda5c..cf319c42f09e 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -70,7 +70,7 @@ private: FixedText m_aFT_Scheme; ListBox m_aLB_Scheme; - FixedLine m_aFL_Seperator; + FixedLine m_aFL_Separator; CheckBox m_aCB_Shading; CheckBox m_aCB_ObjectLines; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src index 33ceb123cbba..5e51ae933235 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src @@ -33,9 +33,9 @@ #define POS_X_2 POS_X_1+WIDTH_FT+4 #define POS_Y_SCHEME 8 -#define POS_Y_SEPERATOR (POS_Y_SCHEME+13) +#define POS_Y_SEPARATOR (POS_Y_SCHEME+13) -#define POS_Y_SHADING (POS_Y_SEPERATOR+16) +#define POS_Y_SHADING (POS_Y_SEPARATOR+16) #define POS_Y_OBJECTLINES (POS_Y_SHADING+16) #define POS_Y_ROUNDEDEDGE (POS_Y_OBJECTLINES+16) @@ -63,9 +63,9 @@ TabPage TP_3D_SCENEAPPEARANCE Pos = MAP_APPFONT ( POS_X_2 , POS_Y_SCHEME-2 ) ; Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ; }; - FixedLine FL_SEPERATOR + FixedLine FL_SEPARATOR { - Pos = MAP_APPFONT ( POS_X_0 , POS_Y_SEPERATOR ) ; + Pos = MAP_APPFONT ( POS_X_0 , POS_Y_SEPARATOR ) ; Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_FL ) ; }; diff --git a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx index 909ad9473945..e9b289f4d8d6 100644 --- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx +++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx @@ -175,11 +175,11 @@ bool MergedMinimumAndMaximumSupplier::isExpandNarrowValuesTowardZero( sal_Int32 return false; } -bool MergedMinimumAndMaximumSupplier::isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) +bool MergedMinimumAndMaximumSupplier::isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) { // should not be called for( MinimumAndMaximumSupplierSet::iterator aIt = begin(), aEnd = end(); aIt != aEnd; ++aIt ) - if( (*aIt)->isSeperateStackingForDifferentSigns( nDimensionIndex ) ) + if( (*aIt)->isSeparateStackingForDifferentSigns( nDimensionIndex ) ) return true; return false; } diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index b4b3940a8b73..025441cc2cb4 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -129,7 +129,7 @@ bool AreaChart::isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) VSeriesPlotter::isExpandIfValuesCloseToBorder( nDimensionIndex ); } -bool AreaChart::isSeperateStackingForDifferentSigns( sal_Int32 /*nDimensionIndex*/ ) +bool AreaChart::isSeparateStackingForDifferentSigns( sal_Int32 /*nDimensionIndex*/ ) { // no separate stacking in all types of line/area charts return false; diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index cb6ea9f3416d..f177b0b04cf4 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -58,7 +58,7 @@ public: //------------------------------------------------------------------------- virtual double getMaximumX(); virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); //------------------------------------------------------------------------- diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index c8942b6049bb..9caca6e7d23a 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -470,7 +470,7 @@ void BarChart::createShapes() double fMinimumY = 0.0, fMaximumY = 0.0; aXSlotIter->calculateYMinAndMaxForCategory( nPointIndex - , isSeperateStackingForDifferentSigns( 1 ), fMinimumY, fMaximumY, nAttachedAxisIndex ); + , isSeparateStackingForDifferentSigns( 1 ), fMinimumY, fMaximumY, nAttachedAxisIndex ); if( !::rtl::math::isNan( fMaximumY ) && fMaximumY > 0) aLogicYSumMap[nAttachedAxisIndex] += fMaximumY; @@ -513,7 +513,7 @@ void BarChart::createShapes() double fMinimumY = 0.0, fMaximumY = 0.0; aXSlotIter->calculateYMinAndMaxForCategory( nPointIndex - , isSeperateStackingForDifferentSigns( 1 ), fMinimumY, fMaximumY, nAttachedAxisIndex ); + , isSeparateStackingForDifferentSigns( 1 ), fMinimumY, fMaximumY, nAttachedAxisIndex ); double fLogicPositiveYSum = 0.0; if( !::rtl::math::isNan( fMaximumY ) ) diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index f3feec1209f0..a87a2ef9d919 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -154,7 +154,7 @@ bool BubbleChart::isExpandIfValuesCloseToBorder( sal_Int32 /*nDimensionIndex*/ ) return true; } -bool BubbleChart::isSeperateStackingForDifferentSigns( sal_Int32 /*nDimensionIndex*/ ) +bool BubbleChart::isSeparateStackingForDifferentSigns( sal_Int32 /*nDimensionIndex*/ ) { return false; } diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx index 23f0d249e16a..23b34edc269e 100644 --- a/chart2/source/view/charttypes/BubbleChart.hxx +++ b/chart2/source/view/charttypes/BubbleChart.hxx @@ -49,7 +49,7 @@ public: // MinimumAndMaximumSupplier //------------------------------------------------------------------------- virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); //------------------------------------------------------------------------- diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 1860b39c1874..1973e05bab22 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -63,7 +63,7 @@ CandleStickChart::~CandleStickChart() // MinimumAndMaximumSupplier //------------------------------------------------------------------------- -bool CandleStickChart::isSeperateStackingForDifferentSigns( sal_Int32 /* nDimensionIndex */ ) +bool CandleStickChart::isSeparateStackingForDifferentSigns( sal_Int32 /* nDimensionIndex */ ) { return false; } diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx index 6ea2399335bd..cac36dca3bee 100644 --- a/chart2/source/view/charttypes/CandleStickChart.hxx +++ b/chart2/source/view/charttypes/CandleStickChart.hxx @@ -47,7 +47,7 @@ public: //------------------------------------------------------------------------- // MinimumAndMaximumSupplier //------------------------------------------------------------------------- - virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); //------------------------------------------------------------------------- diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 06be798a46e1..ddfbc364a724 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -306,7 +306,7 @@ bool PieChart::isExpandNarrowValuesTowardZero( sal_Int32 /* nDimensionIndex */ ) return false; } -bool PieChart::isSeperateStackingForDifferentSigns( sal_Int32 /* nDimensionIndex */ ) +bool PieChart::isSeparateStackingForDifferentSigns( sal_Int32 /* nDimensionIndex */ ) { return false; } diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index d563ef0d1c09..b6346aa9b794 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -62,7 +62,7 @@ public: virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ); virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ); - virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); //------------------------------------------------------------------------- //------------------------------------------------------------------------- diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index a49fed9edddb..d9041f9503db 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -1267,7 +1267,7 @@ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, s rXSlots[nN].calculateYMinAndMaxForCategoryRange( static_cast<sal_Int32>(fMinimumX-1.0) //first category (index 0) matches with real number 1.0 , static_cast<sal_Int32>(fMaximumX-1.0) //first category (index 0) matches with real number 1.0 - , isSeperateStackingForDifferentSigns( 1 ) + , isSeparateStackingForDifferentSigns( 1 ) , fLocalMinimum, fLocalMaximum, nAxisIndex ); if(fMaximum<fLocalMaximum) fMaximum=fLocalMaximum; @@ -1301,7 +1301,7 @@ double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, s rXSlots[nN].calculateYMinAndMaxForCategoryRange( static_cast<sal_Int32>(fMinimumX-1.0) //first category (index 0) matches with real number 1.0 , static_cast<sal_Int32>(fMaximumX-1.0) //first category (index 0) matches with real number 1.0 - , isSeperateStackingForDifferentSigns( 1 ) + , isSeparateStackingForDifferentSigns( 1 ) , fLocalMinimum, fLocalMaximum, nAxisIndex ); if(fMaximum<fLocalMaximum) fMaximum=fLocalMaximum; @@ -1362,7 +1362,7 @@ bool VSeriesPlotter::isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) return nDimensionIndex == 1; } -bool VSeriesPlotter::isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) +bool VSeriesPlotter::isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) { // default implementation: only for Y axis return nDimensionIndex == 1; @@ -1704,7 +1704,7 @@ void VDataSeriesGroup::getMinimumAndMaximiumYInContinuousXRange( } void VDataSeriesGroup::calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex - , bool bSeperateStackingForDifferentSigns + , bool bSeparateStackingForDifferentSigns , double& rfMinimumY, double& rfMaximumY, sal_Int32 nAxisIndex ) { ::rtl::math::setInf(&rfMinimumY, false); @@ -1733,7 +1733,7 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex ::std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin(); ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end(); - if( bSeperateStackingForDifferentSigns ) + if( bSeparateStackingForDifferentSigns ) { for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter ) { @@ -1795,7 +1795,7 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex void VDataSeriesGroup::calculateYMinAndMaxForCategoryRange( sal_Int32 nStartCategoryIndex, sal_Int32 nEndCategoryIndex - , bool bSeperateStackingForDifferentSigns + , bool bSeparateStackingForDifferentSigns , double& rfMinimumY, double& rfMaximumY, sal_Int32 nAxisIndex ) { //@todo maybe cache these values @@ -1813,7 +1813,7 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategoryRange( double fMaximumY; ::rtl::math::setNan(&fMaximumY); this->calculateYMinAndMaxForCategory( nCatIndex - , bSeperateStackingForDifferentSigns, fMinimumY, fMaximumY, nAxisIndex ); + , bSeparateStackingForDifferentSigns, fMinimumY, fMaximumY, nAxisIndex ); if(rfMinimumY > fMinimumY) rfMinimumY = fMinimumY; diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx index 20a4882dd42f..b32855ab2258 100644 --- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx +++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx @@ -51,7 +51,7 @@ public: virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) = 0; virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ) = 0; virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) = 0; - virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) = 0; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) = 0; //return a constant out of ::com::sun::star::chart::TimeUnit that allows to display the smallest distance between occuring dates virtual long calculateTimeResolutionOnXAxis() = 0; @@ -83,7 +83,7 @@ public: virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ); virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ); - virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); virtual long calculateTimeResolutionOnXAxis(); virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ); diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index ce6596aa0f63..d14306d80976 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -92,10 +92,10 @@ public: void getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const; void calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex - , bool bSeperateStackingForDifferentSigns + , bool bSeparateStackingForDifferentSigns , double& rfMinimumY, double& rfMaximumY, sal_Int32 nAxisIndex ); void calculateYMinAndMaxForCategoryRange( sal_Int32 nStartCategoryIndex, sal_Int32 nEndCategoryIndex - , bool bSeperateStackingForDifferentSigns + , bool bSeparateStackingForDifferentSigns , double& rfMinimumY, double& rfMaximumY, sal_Int32 nAxisIndex ); ::std::vector< VDataSeries* > m_aSeriesVector; @@ -174,7 +174,7 @@ public: virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ); virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ); - virtual bool isSeperateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); virtual long calculateTimeResolutionOnXAxis(); virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ); |