[Libreoffice-commits] core.git: chart2/source

[Mike Kaganski (via logerrit)]

 chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8e475035a77b47001ad09ca0c333d3eabe82bf27
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Sun Apr 28 00:47:50 2019 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sun Apr 28 08:35:57 2019 +0200

    tdf#120703 PVS: Blind attempt to implement original idea
    
    The strange implementation was there ever since commit
    bd36338009672fdabd5b6d585f8c1092b617196a.
    
    The other possibility is to just remove the block above the last
    assignment to aRet
    
    Change-Id: I5bd3bf1f518ab894e5df4cbc7d86a76d325e4600
    Reviewed-on: https://gerrit.libreoffice.org/71447
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index c55c03d7b976..efd80288411c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -555,10 +555,10 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
                     aTimeIncrement.TimeResolution <<= aExplicitScale.TimeResolution;
                     aRet <<= aTimeIncrement;
                 }
+                else
+                    aRet <<= aScaleData.TimeIncrement;
             }
 
-            if( aScaleData.AxisType == AxisType::DATE || aScaleData.AutoDateAxis )
-                aRet <<= aScaleData.TimeIncrement;
             break;
         }
         case SCALE_PROP_LOGARITHMIC: