diff options
| author | Eike Rathke <erack@redhat.com> | 2015-01-23 23:10:41 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2015-01-26 18:12:10 +0100 |
| commit | cd528c3099ffec4f34565820b923d6385478e44b (patch) | |
| tree | 3156470b934873bf63307ed2740f4bf73614887f /i18npool/inc | |
| parent | 15e1c881684c0127c0ca989924bbf2508b4fd780 (diff) | |
implement css::i18n::XCalendar4 and LocaleCalendar2 service, tdf#63230
Implementation only, new local date/time routines not used yet from the
outside in this step.
Diffstat (limited to 'i18npool/inc')
| -rw-r--r-- | i18npool/inc/calendarImpl.hxx | 14 | ||||
| -rw-r--r-- | i18npool/inc/calendar_gregorian.hxx | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx index 7ec10debd5ad..0f67c1eb4eea 100644 --- a/i18npool/inc/calendarImpl.hxx +++ b/i18npool/inc/calendarImpl.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_I18NPOOL_INC_CALENDARIMPL_HXX #define INCLUDED_I18NPOOL_INC_CALENDARIMPL_HXX -#include <com/sun/star/i18n/XCalendar3.hpp> +#include <com/sun/star/i18n/XCalendar4.hpp> #include <com/sun/star/i18n/CalendarDisplayCode.hpp> #include <com/sun/star/i18n/CalendarFieldIndex.hpp> #include <com/sun/star/i18n/CalendarDisplayIndex.hpp> @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace i18n { class CalendarImpl : public cppu::WeakImplHelper2 < - com::sun::star::i18n::XCalendar3, + com::sun::star::i18n::XCalendar4, com::sun::star::lang::XServiceInfo > { @@ -84,6 +84,10 @@ public: virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // XCalendar4 + virtual void SAL_CALL setLocalDateTime(double TimeInDays) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getLocalDateTime() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + //XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -91,14 +95,14 @@ public: private: struct lookupTableItem { - lookupTableItem(const OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar3 >& _xCalendar) : + lookupTableItem(const OUString& _uniqueID, com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar4 >& _xCalendar) : uniqueID(_uniqueID), xCalendar(_xCalendar) {} OUString uniqueID; - com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar3 > xCalendar; + com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar4 > xCalendar; }; std::vector<lookupTableItem*> lookupTable; com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; - com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar3 > xCalendar; + com::sun::star::uno::Reference < com::sun::star::i18n::XCalendar4 > xCalendar; }; } } } } diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index ea06b007bc4f..f270779f7b87 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -85,6 +85,10 @@ public: virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // XCalendar4 + virtual void SAL_CALL setLocalDateTime(double TimeInDays) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getLocalDateTime() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + //XServiceInfo virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; |