diff options
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/global.hxx | 1 | ||||
| -rw-r--r-- | sc/qa/unit/ucalc.cxx | 16 | ||||
| -rw-r--r-- | sc/source/core/data/table4.cxx | 23 |
3 files changed, 36 insertions, 4 deletions
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 3a1429acb0bc..50041b37b323 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -344,6 +344,7 @@ enum FillDateCmd FILL_DAY, FILL_WEEKDAY, FILL_MONTH, + FILL_END_OF_MONTH, FILL_YEAR }; diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx index ec599ad7a42d..ec424f97f1d9 100644 --- a/sc/qa/unit/ucalc.cxx +++ b/sc/qa/unit/ucalc.cxx @@ -4963,6 +4963,22 @@ void Test::testAutoFill() CPPUNIT_ASSERT_EQUAL( OUString("2012-10-31"), m_pDoc->GetString( 0, 104, 0 ) ); // Clear column A for a new test. + clearRange(m_pDoc, ScRange(0, 0, 0, 0, MAXROW, 0)); + m_pDoc->SetRowHidden(0, MAXROW, 0, false); // Show all rows. + + m_pDoc->SetString(0, 100, 0, "2019-10-31"); + m_pDoc->SetString(0, 101, 0, "2019-11-30"); + m_pDoc->SetString(0, 102, 0, "2019-12-31"); + m_pDoc->Fill(0, 100, 0, 102, nullptr, aMarkData, 3, FILL_TO_BOTTOM, FILL_AUTO); + + // tdf#58745, Without the fix in place, this test would have failed with + // - Expected: 2020-01-31 + // - Actual : 2019-01-11 + CPPUNIT_ASSERT_EQUAL(OUString("2020-01-31"), m_pDoc->GetString(0, 103, 0)); + CPPUNIT_ASSERT_EQUAL(OUString("2020-02-29"), m_pDoc->GetString(0, 104, 0)); + CPPUNIT_ASSERT_EQUAL(OUString("2020-03-31"), m_pDoc->GetString(0, 105, 0)); + + // Clear column A for a new test. clearRange(m_pDoc, ScRange(0,0,0,0,MAXROW,0)); m_pDoc->SetRowHidden(0, MAXROW, 0, false); // Show all rows. diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index 02e6c1c31d83..e6c29a5a00e7 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -535,7 +535,12 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, tools::Long nDDiff = aDate2.GetDay() - static_cast<tools::Long>(aDate1.GetDay()); tools::Long nMDiff = aDate2.GetMonth() - static_cast<tools::Long>(aDate1.GetMonth()); tools::Long nYDiff = aDate2.GetYear() - static_cast<tools::Long>(aDate1.GetYear()); - if ( nDDiff ) + if (nMDiff && aDate1.IsEndOfMonth() && aDate2.IsEndOfMonth()) + { + eType = FILL_END_OF_MONTH; + nCmpInc = nMDiff + 12 * nYDiff; + } + else if (nDDiff) { eType = FILL_DAY; nCmpInc = aDate2 - aDate1; @@ -566,7 +571,8 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, nDDiff = aDate2.GetDay() - static_cast<tools::Long>(aDate1.GetDay()); nMDiff = aDate2.GetMonth() - static_cast<tools::Long>(aDate1.GetMonth()); nYDiff = aDate2.GetYear() - static_cast<tools::Long>(aDate1.GetYear()); - if (nDDiff || ( nMDiff + 12 * nYDiff != nCmpInc )) + if ((nDDiff && !aDate1.IsEndOfMonth() && !aDate2.IsEndOfMonth()) + || (nMDiff + 12 * nYDiff != nCmpInc)) bVal = false; } aDate1 = aDate2; @@ -578,7 +584,8 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } if (bVal) { - if ( eType == FILL_MONTH && ( nCmpInc % 12 == 0 ) ) + if ((eType == FILL_MONTH || eType == FILL_END_OF_MONTH) + && (nCmpInc % 12 == 0)) { eType = FILL_YEAR; nCmpInc /= 12; @@ -1514,6 +1521,7 @@ void ScTable::IncDate(double& rVal, sal_uInt16& nDayOfMonth, double nStep, FillD } break; case FILL_MONTH: + case FILL_END_OF_MONTH: { if ( nDayOfMonth == 0 ) nDayOfMonth = aDate.GetDay(); // init @@ -1549,7 +1557,14 @@ void ScTable::IncDate(double& rVal, sal_uInt16& nDayOfMonth, double nStep, FillD { aDate.SetMonth(static_cast<sal_uInt16>(nMonth)); aDate.SetYear(static_cast<sal_uInt16>(nYear)); - aDate.SetDay( std::min( Date::GetDaysInMonth( nMonth, nYear), nDayOfMonth ) ); + if (eCmd == FILL_END_OF_MONTH) + { + aDate.SetDay(Date::GetDaysInMonth(nMonth, nYear)); + } + else + { + aDate.SetDay(std::min(Date::GetDaysInMonth(nMonth, nYear), nDayOfMonth)); + } } } break; |