summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx20
-rw-r--r--chart2/source/view/inc/VSeriesPlotter.hxx8
-rw-r--r--oovbaapi/ooo/vba/access/AcCommand.idl2
3 files changed, 15 insertions, 15 deletions
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 232e86369f1d..04bd30f3bdcc 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -1675,13 +1675,13 @@ long VSeriesPlotter::calculateTimeResolutionOnXAxis()
double VSeriesPlotter::getMinimumX()
{
double fMinimum, fMaximum;
- getMinimumAndMaximiumX( fMinimum, fMaximum );
+ getMinimumAndMaximumX( fMinimum, fMaximum );
return fMinimum;
}
double VSeriesPlotter::getMaximumX()
{
double fMinimum, fMaximum;
- getMinimumAndMaximiumX( fMinimum, fMaximum );
+ getMinimumAndMaximumX( fMinimum, fMaximum );
return fMaximum;
}
@@ -1690,7 +1690,7 @@ double VSeriesPlotter::getMinimumYInRange( double fMinimumX, double fMaximumX, s
if( !m_bCategoryXAxis || ( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() ) )
{
double fMinY, fMaxY;
- getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
+ getMinimumAndMaximumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
return fMinY;
}
@@ -1723,7 +1723,7 @@ double VSeriesPlotter::getMaximumYInRange( double fMinimumX, double fMaximumX, s
if( !m_bCategoryXAxis || ( m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis() ) )
{
double fMinY, fMaxY;
- getMinimumAndMaximiumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
+ getMinimumAndMaximumYInContinuousXRange( fMinY, fMaxY, fMinimumX, fMaximumX, nAxisIndex );
return fMaxY;
}
@@ -1803,7 +1803,7 @@ bool VSeriesPlotter::isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIn
return nDimensionIndex == 1;
}
-void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximum ) const
+void VSeriesPlotter::getMinimumAndMaximumX( double& rfMinimum, double& rfMaximum ) const
{
::rtl::math::setInf(&rfMinimum, false);
::rtl::math::setInf(&rfMaximum, true);
@@ -1813,7 +1813,7 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximu
for (auto const& XSlot : ZSlot)
{
double fLocalMinimum, fLocalMaximum;
- XSlot.getMinimumAndMaximiumX( fLocalMinimum, fLocalMaximum );
+ XSlot.getMinimumAndMaximumX( fLocalMinimum, fLocalMaximum );
if( !std::isnan(fLocalMinimum) && fLocalMinimum< rfMinimum )
rfMinimum = fLocalMinimum;
if( !std::isnan(fLocalMaximum) && fLocalMaximum> rfMaximum )
@@ -1826,7 +1826,7 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximu
::rtl::math::setNan(&rfMaximum);
}
-void VSeriesPlotter::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const
+void VSeriesPlotter::getMinimumAndMaximumYInContinuousXRange( double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const
{
::rtl::math::setInf(&rfMinY, false);
::rtl::math::setInf(&rfMaxY, true);
@@ -1836,7 +1836,7 @@ void VSeriesPlotter::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, d
for (auto const& XSlot : ZSlot)
{
double fLocalMinimum, fLocalMaximum;
- XSlot.getMinimumAndMaximiumYInContinuousXRange( fLocalMinimum, fLocalMaximum, fMinX, fMaxX, nAxisIndex );
+ XSlot.getMinimumAndMaximumYInContinuousXRange( fLocalMinimum, fLocalMaximum, fMinX, fMaxX, nAxisIndex );
if( !std::isnan(fLocalMinimum) && fLocalMinimum< rfMinY )
rfMinY = fLocalMinimum;
if( !std::isnan(fLocalMaximum) && fLocalMaximum> rfMaxY )
@@ -1911,7 +1911,7 @@ sal_Int32 VDataSeriesGroup::getAttachedAxisIndexForFirstSeries() const
return nRet;
}
-void VDataSeriesGroup::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximum ) const
+void VDataSeriesGroup::getMinimumAndMaximumX( double& rfMinimum, double& rfMaximum ) const
{
::rtl::math::setInf(&rfMinimum, false);
@@ -2070,7 +2070,7 @@ private:
}
-void VDataSeriesGroup::getMinimumAndMaximiumYInContinuousXRange(
+void VDataSeriesGroup::getMinimumAndMaximumYInContinuousXRange(
double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const
{
::rtl::math::setNan(&rfMinY);
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 735922911e9b..ddc53126a40f 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -84,8 +84,8 @@ public:
sal_Int32 getPointCount() const;
sal_Int32 getAttachedAxisIndexForFirstSeries() const;
- void getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximum ) const;
- void getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const;
+ void getMinimumAndMaximumX( double& rfMinimum, double& rfMaximum ) const;
+ void getMinimumAndMaximumYInContinuousXRange( double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const;
void calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex
, bool bSeparateStackingForDifferentSigns
@@ -175,8 +175,8 @@ public:
virtual long calculateTimeResolutionOnXAxis() override;
virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ) override;
- void getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximum ) const;
- void getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const;
+ void getMinimumAndMaximumX( double& rfMinimum, double& rfMaximum ) const;
+ void getMinimumAndMaximumYInContinuousXRange( double& rfMinY, double& rfMaxY, double fMinX, double fMaxX, sal_Int32 nAxisIndex ) const;
// Methods for handling legends and legend entries.
diff --git a/oovbaapi/ooo/vba/access/AcCommand.idl b/oovbaapi/ooo/vba/access/AcCommand.idl
index 87523faf9bf3..3cad0a18038f 100644
--- a/oovbaapi/ooo/vba/access/AcCommand.idl
+++ b/oovbaapi/ooo/vba/access/AcCommand.idl
@@ -194,7 +194,7 @@ module ooo { module vba { module access {
const long acCmdMacroConditions = 87;
const long acCmdMacroNames = 86;
const long acCmdMakeMDEFile = 7;
- const long acCmdMaximiumRecords = 508;
+ const long acCmdMaximumRecords = 508;
const long acCmdMicrosoftAccessHelpTopics = 100;
const long acCmdMicrosoftOnTheWeb = 236;
const long acCmdMicrosoftScriptEditor = 390;