diff options
| author | Eike Rathke <erack@redhat.com> | 2013-02-28 18:34:41 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-02-28 18:48:05 +0100 |
| commit | be16dba682b8ab1c244f8d24f1bab3a539096962 (patch) | |
| tree | 8369bb883fabbd4a4289b0ddb71eedff1cc2313b /i18npool/inc | |
| parent | Updated core (diff) | |
| download | core-be16dba682b8ab1c244f8d24f1bab3a539096962.tar.gz core-be16dba682b8ab1c244f8d24f1bab3a539096962.zip | |
resolved fdo#60915 force long year only for ROC calendar
Long year was forced unconditionally for all non-Gregorian calendars, do
this only for ROC calendar.
Change-Id: I39d6eb269b3d38046d32dcf0f66edd5617581b9d
Diffstat (limited to 'i18npool/inc')
| -rw-r--r-- | i18npool/inc/calendar_gregorian.hxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index 2a8ac14ecc60..929f759b2a6b 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -30,10 +30,13 @@ namespace com { namespace sun { namespace star { namespace i18n { +const sal_uInt8 kDisplayEraForcedLongYear = 0x01; + struct Era { sal_Int32 year; sal_Int32 month; sal_Int32 day; + sal_uInt8 flags; }; const sal_Int16 FIELD_INDEX_COUNT = CalendarFieldIndex::FIELD_COUNT2; @@ -101,6 +104,8 @@ protected: virtual void mapFromGregorian() throw(com::sun::star::uno::RuntimeException); void getValue() throw(com::sun::star::uno::RuntimeException); + rtl::OUString getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode ) throw (com::sun::star::uno::RuntimeException); + private: Calendar2 aCalendar; |