diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-25 17:18:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-29 17:32:57 +0100 |
| commit | 8fff6bf6bdab6b7addcbbf472a226706edda1edb (patch) | |
| tree | a27347a5b8e0bef5c00757a56a0e9a217fcb2f59 /offapi | |
| parent | d29818290376f10f318ba805a79643384b34986e (diff) | |
fdo#46808, Adapt i18n::LocaleCalendar UNO service to new style
Did not need to create a new interface, because XCalendar3
already covers the whole service interface.
Change-Id: Iaf094014c16e872d2003ca6e8e7588abd081d882
Diffstat (limited to 'offapi')
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 2 | ||||
| -rw-r--r-- | offapi/com/sun/star/i18n/LocaleCalendar.idl | 10 | ||||
| -rw-r--r-- | offapi/type_reference/types.rdb | bin | 7655424 -> 7655424 bytes |
3 files changed, 2 insertions, 10 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 7de5d775a93d..b1b5e2da2a9f 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -153,6 +153,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/i18n,\ BreakIterator \ + LocaleCalendar \ LocaleData \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\ @@ -861,7 +862,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\ Collator \ IndexEntrySupplier \ InputSequenceChecker \ - LocaleCalendar \ NativeNumberSupplier \ NumberFormatMapper \ OrdinalSuffix \ diff --git a/offapi/com/sun/star/i18n/LocaleCalendar.idl b/offapi/com/sun/star/i18n/LocaleCalendar.idl index 8ab37fc5b315..db4c3545ae40 100644 --- a/offapi/com/sun/star/i18n/LocaleCalendar.idl +++ b/offapi/com/sun/star/i18n/LocaleCalendar.idl @@ -20,8 +20,6 @@ #ifndef __com_sun_star_i18n_LocaleCalendar_idl__ #define __com_sun_star_i18n_LocaleCalendar_idl__ -#include <com/sun/star/i18n/XCalendar.idl> -#include <com/sun/star/i18n/XExtendedCalendar.idl> #include <com/sun/star/i18n/XCalendar3.idl> @@ -29,13 +27,7 @@ module com { module sun { module star { module i18n { /// Access a locale specific calendar. -published service LocaleCalendar -{ - interface com::sun::star::i18n::XCalendar; - - [optional] interface com::sun::star::i18n::XExtendedCalendar; - [optional] interface com::sun::star::i18n::XCalendar3; -}; +published service LocaleCalendar : XCalendar3; }; }; }; }; diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb Binary files differindex da0750a56458..8a3c658466ab 100644 --- a/offapi/type_reference/types.rdb +++ b/offapi/type_reference/types.rdb |