diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 09:22:21 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-04-15 09:22:21 +0000 |
| commit | 92b58a7818893d5d087520fa7a576d2fa07a9297 (patch) | |
| tree | ead571b35a962f6b2a3c53a3c24ca249ef71ab6b | |
| parent | 4e2285c2ce438898a2abafdbf802539378c67b73 (diff) | |
INTEGRATION: CWS reglater3_DEV300 (1.5.378.1.4); FILE MERGED
2008/04/02 18:15:31 pb 1.5.378.1.4.1: fix: #155679# consider ReminderDate == 'Patch'
| -rw-r--r-- | svtools/source/config/regoptions.cxx | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/svtools/source/config/regoptions.cxx b/svtools/source/config/regoptions.cxx index dfb9a1503fea..98c4bb7ae2d5 100644 --- a/svtools/source/config/regoptions.cxx +++ b/svtools/source/config/regoptions.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: regoptions.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -147,6 +147,7 @@ namespace svt DECLARE_STATIC_LAZY_USTRING( ReminderDate ); DECLARE_STATIC_LAZY_USTRING( RequestDialog ); DECLARE_STATIC_LAZY_USTRING( ShowMenuItem ); + DECLARE_STATIC_LAZY_USTRING( Patch ); //==================================================================== //= RegOptionsImpl @@ -279,14 +280,15 @@ namespace svt sal_Int32 nIntDate = 0; sStringValue = ::rtl::OUString(); m_aRegistrationNode.getNodeValue( lcl_getReminderDateName() ) >>= sStringValue; - if ( sStringValue.getLength() ) + bool bIsPatchDate = ( sStringValue.equals( lcl_getPatchName() ) != sal_False ); + if ( !bIsPatchDate && sStringValue.getLength() ) { nIntDate = lcl_convertString2Date( sStringValue ); OSL_ENSURE( nIntDate, "RegOptionsImpl::RegOptionsImpl: incorrect value found for the reminder date!" ); } m_aReminderDate.SetDate( nIntDate ); - OSL_ENSURE( !sStringValue.getLength() || m_aReminderDate.IsValid(), - "RegOptionsImpl::RegOptionsImpl: inavlid reminder date value!" ); + OSL_ENSURE( bIsPatchDate || !sStringValue.getLength() || m_aReminderDate.IsValid(), + "RegOptionsImpl::RegOptionsImpl: inavlid reminder date value!" ); } //-------------------------------------------------------------------- @@ -377,12 +379,17 @@ namespace svt m_aRegistrationNode.getNodeValue( lcl_getReminderDateName() ) >>= sDate; if ( sDate.getLength() ) { - nDate = lcl_convertString2Date( sDate ); - if ( nDate > 0 ) + if ( sDate.equals( lcl_getPatchName() ) ) + bRet = true; + else { - Date aReminderDate; - aReminderDate.SetDate( nDate ); - bRet = aReminderDate <= Date(); + nDate = lcl_convertString2Date( sDate ); + if ( nDate > 0 ) + { + Date aReminderDate; + aReminderDate.SetDate( nDate ); + bRet = aReminderDate <= Date(); + } } } return bRet; |