fixed fdo#40363 freeze chart wizard with non-gregorian date

Use the newly introduced Date::Normalize() instead of a never ending
while(!date.IsValid())

1 files changed, 2 insertions, 4 deletions

diff --git a/chart2/source/view/axes/DateHelper.cxx b/chart2/source/view/axes/DateHelper.cxx
index 6749e749171e..247e0f66c16a 100644
--- a/chart2/source/view/axes/DateHelper.cxx
+++ b/chart2/source/view/axes/DateHelper.cxx
@@ -73,8 +73,7 @@ Date DateHelper::GetDateSomeMonthsAway( const Date& rD, long nMonthDistance )
         nNewMonth += 12;
     aRet.SetMonth( sal_uInt16(nNewMonth) );
     aRet.SetYear( sal_uInt16(nNewYear) );
-    while(!aRet.IsValidAndGregorian())
-        aRet--;
+    aRet.Normalize();
     return aRet;
 }
 
@@ -82,8 +81,7 @@ Date DateHelper::GetDateSomeYearsAway( const Date& rD, long nYearDistance )
 {
     Date aRet(rD);
     aRet.SetYear( static_cast<sal_uInt16>(rD.GetYear()+nYearDistance) );
-    while(!aRet.IsValidAndGregorian())
-        aRet--;
+    aRet.Normalize();
     return aRet;
 }