diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 15:26:55 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 15:26:55 +0000 |
commit | 5fbdd0f583430187b8c702f00452806390d77f82 (patch) | |
tree | 36e2d38aa1619912c921a9edea686686e5dd9479 /i18npool/inc/calendar_gregorian.hxx | |
parent | 3c046b5da9e653d8db4c0e576b75168077de2f56 (diff) |
INTEGRATION: CWS dr59_SRC680 (1.14.68); FILE MERGED
2007/10/19 17:43:36 er 1.14.68.1: #i76623# It seems that ICU between 2.6 and 3.6 changed ZONE/DST handling, part of the workaround introduced for i17222 isn't necessary anymore but actually made things fail instead. Reworked.
Diffstat (limited to 'i18npool/inc/calendar_gregorian.hxx')
-rw-r--r-- | i18npool/inc/calendar_gregorian.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index 3c10e194c4de..240a3b0be2ac 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -4,9 +4,9 @@ * * $RCSfile: calendar_gregorian.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: kz $ $Date: 2006-12-12 16:12:00 $ + * last change: $Author: hr $ $Date: 2007-11-01 16:26:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -107,7 +107,9 @@ protected: virtual void SAL_CALL mapFromGregorian() throw(com::sun::star::uno::RuntimeException); void SAL_CALL getValue() throw(com::sun::star::uno::RuntimeException); private: - // submit fieldValue array according to fieldSet, plus YMDhms if >=0 + // submit fieldSetValue array according to fieldSet + void SAL_CALL submitFields() throw(com::sun::star::uno::RuntimeException); + // submit fieldSetValue array according to fieldSet, plus YMDhms if >=0 void SAL_CALL submitValues( sal_Int32 nYear, sal_Int32 nMonth, sal_Int32 nDay, sal_Int32 nHour, sal_Int32 nMinute, sal_Int32 nSecond, sal_Int32 nMilliSecond) throw(com::sun::star::uno::RuntimeException); void SAL_CALL setValue() throw(com::sun::star::uno::RuntimeException); Calendar aCalendar; |