diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-12-15 19:53:26 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-12-17 23:57:21 +0100 |
| commit | 6e4348d0f60f2b6b3ad71eaa8777ef8f98694298 (patch) | |
| tree | 70e88670b11293da53e1d5141448d0ca60b8f0bd /sc | |
| parent | a923084f872b8ce13f6213827fe5b1c711e6b15f (diff) | |
checking for the month is wrong, related fdo#58340
Change-Id: I9920e8ad84da58f32a61a4bd864ea80b011ad746
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/conditio.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index a684e63ec8a6..e02f89e22fb2 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -1684,21 +1684,21 @@ bool ScCondDateFormatEntry::IsValid( const ScAddress& rPos ) const return true; break; case condformat::LASTWEEK: - if( rActDate.GetYear() == aCellDate.GetYear() && rActDate.GetMonth() == aCellDate.GetMonth() ) + if( rActDate.GetYear() == aCellDate.GetYear() ) { if( rActDate.GetWeekOfYear( SUNDAY ) == aCellDate.GetWeekOfYear( SUNDAY ) + 1 ) return true; } break; case condformat::THISWEEK: - if( rActDate.GetYear() == aCellDate.GetYear() && rActDate.GetMonth() == aCellDate.GetMonth() ) + if( rActDate.GetYear() == aCellDate.GetYear() ) { if( rActDate.GetWeekOfYear( SUNDAY ) == aCellDate.GetWeekOfYear( SUNDAY ) ) return true; } break; case condformat::NEXTWEEK: - if( rActDate.GetYear() == aCellDate.GetYear() && rActDate.GetMonth() == aCellDate.GetMonth() ) + if( rActDate.GetYear() == aCellDate.GetYear() ) { if( rActDate.GetWeekOfYear( SUNDAY ) == aCellDate.GetWeekOfYear( SUNDAY ) - 1 ) return true; |