chart2: use a constant instead of a function for a contant value

Change-Id: I21cbe01732bf78f58b3242669e696fb1f82aa64d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133119
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit f80376d76c6956c4b6321162cdb94128746420fa)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133157
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>

1 files changed, 16 insertions, 19 deletions

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 8a5f3b17d33c..666ea63fd213 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1809,10 +1809,9 @@ std::shared_ptr< DrawModelWrapper > ChartView::getDrawModelWrapper()
 
 namespace
 {
-sal_Int32 lcl_getDiagramTitleSpace()
-{
-    return 200; //=0,2 cm spacing
-}
+
+constexpr sal_Int32 constDiagramTitleSpace = 200; //=0,2 cm spacing
+
 bool lcl_getPropertySwapXAndYAxis( const uno::Reference< XDiagram >& xDiagram )
 {
     bool bSwapXAndY = false;
@@ -1837,7 +1836,7 @@ bool lcl_getPropertySwapXAndYAxis( const uno::Reference< XDiagram >& xDiagram )
     return bSwapXAndY;
 }
 
-}
+} // end anonymous namespace
 
 sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForAxis(
                   const Reference< chart2::XAxis >& xAxis
@@ -1915,28 +1914,28 @@ awt::Rectangle ExplicitValueProvider::AddSubtractAxisTitleSizes(
                 OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, rModel ) );
                 nTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height;
                 if( nTitleSpaceHeight )
-                    nTitleSpaceHeight+=lcl_getDiagramTitleSpace();
+                    nTitleSpaceHeight += constDiagramTitleSpace;
             }
             if( xTitle_Width.is() )
             {
                 OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, rModel ) );
                 nTitleSpaceWidth = pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width;
                 if(nTitleSpaceWidth)
-                    nTitleSpaceWidth+=lcl_getDiagramTitleSpace();
+                    nTitleSpaceWidth += constDiagramTitleSpace;
             }
             if( xSecondTitle_Height.is() )
             {
                 OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, rModel ) );
                 nSecondTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height;
                 if( nSecondTitleSpaceHeight )
-                    nSecondTitleSpaceHeight+=lcl_getDiagramTitleSpace();
+                    nSecondTitleSpaceHeight += constDiagramTitleSpace;
             }
             if( xSecondTitle_Width.is() )
             {
                 OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, rModel ) );
                 nSecondTitleSpaceWidth += pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width;
                 if( nSecondTitleSpaceWidth )
-                    nSecondTitleSpaceWidth+=lcl_getDiagramTitleSpace();
+                    nSecondTitleSpaceWidth += constDiagramTitleSpace;
             }
             if( bSubtract )
             {
@@ -1958,12 +1957,10 @@ awt::Rectangle ExplicitValueProvider::AddSubtractAxisTitleSizes(
     return aRet;
 }
 
-namespace {
-
-double lcl_getPageLayoutDistancePercentage()
+namespace
 {
-    return 0.02;
-}
+
+constexpr double constPageLayoutDistancePercentage = 0.02;
 
 bool getAvailablePosAndSizeForDiagram(
     CreateShapeParam2D& rParam, const awt::Size & rPageSize, const uno::Reference< beans::XPropertySet >& xProp)
@@ -1971,8 +1968,8 @@ bool getAvailablePosAndSizeForDiagram(
     rParam.mbUseFixedInnerSize = false;
 
     //@todo: we need a size dependent on the axis labels
-    sal_Int32 nYDistance = static_cast<sal_Int32>(rPageSize.Height*lcl_getPageLayoutDistancePercentage());
-    sal_Int32 nXDistance = static_cast<sal_Int32>(rPageSize.Width*lcl_getPageLayoutDistancePercentage());
+    sal_Int32 nYDistance = static_cast<sal_Int32>(rPageSize.Height * constPageLayoutDistancePercentage);
+    sal_Int32 nXDistance = static_cast<sal_Int32>(rPageSize.Width * constPageLayoutDistancePercentage);
     rParam.maRemainingSpace.X += nXDistance;
     rParam.maRemainingSpace.Width -= 2*nXDistance;
     rParam.maRemainingSpace.Y += nYDistance;
@@ -2035,8 +2032,8 @@ void changePositionOfAxisTitle( VTitle* pVTitle, TitleAlignment eAlignment
 
     awt::Point aNewPosition(0,0);
     awt::Size aTitleSize = pVTitle->getFinalSize();
-    sal_Int32 nYDistance = static_cast<sal_Int32>(rPageSize.Height*lcl_getPageLayoutDistancePercentage());
-    sal_Int32 nXDistance = static_cast<sal_Int32>(rPageSize.Width*lcl_getPageLayoutDistancePercentage());
+    sal_Int32 nYDistance = static_cast<sal_Int32>(rPageSize.Height * constPageLayoutDistancePercentage);
+    sal_Int32 nXDistance = static_cast<sal_Int32>(rPageSize.Width * constPageLayoutDistancePercentage);
     switch( eAlignment )
     {
     case ALIGN_TOP:
@@ -2091,7 +2088,7 @@ std::shared_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType
     std::shared_ptr<VTitle> apVTitle;
 
     // #i109336# Improve auto positioning in chart
-    double fPercentage = lcl_getPageLayoutDistancePercentage();
+    double fPercentage = constPageLayoutDistancePercentage;
     sal_Int32 nXDistance = static_cast< sal_Int32 >( rPageSize.Width * fPercentage );
     sal_Int32 nYDistance = static_cast< sal_Int32 >( rPageSize.Height * fPercentage );
     if ( eType == TitleHelper::MAIN_TITLE )