diff options
| author | Noel Grandin <noel@peralex.com> | 2012-09-13 12:47:11 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-17 14:28:21 +0200 |
| commit | 369e3fdcdafdb112a6963fb86fa4d4d0edb29c00 (patch) | |
| tree | 9b7b52b0524feee2c6cfcaf5e5fb440816520fde /offapi | |
| parent | 9486e6c45f5e15e07f4717fdbaaf30afe6ed86b9 (diff) | |
fdo#46808, Adapt i18n::LocaleData UNO service to new style
The implementation of the LocaleData implements the optional XLocaleData4,
so rather than creating a new interface for the new-style service, we simply
make the service implement XLocaleData4, which in turn implements
XLocaleData3, XLocaleData2, XLocaleData.
Change-Id: I3e9a48b031be6b2aa5e04b376b3940b942add85a
Diffstat (limited to 'offapi')
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 2 | ||||
| -rw-r--r-- | offapi/com/sun/star/i18n/LocaleData.idl | 9 | ||||
| -rw-r--r-- | offapi/type_reference/types.rdb | bin | 7655424 -> 7655424 bytes |
3 files changed, 2 insertions, 9 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 558747878479..e5606da48aa5 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -150,6 +150,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 \ + LocaleData \ )) $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/linguistic2,\ LanguageGuessing \ @@ -847,7 +848,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\ IndexEntrySupplier \ InputSequenceChecker \ LocaleCalendar \ - LocaleData \ NativeNumberSupplier \ NumberFormatMapper \ OrdinalSuffix \ diff --git a/offapi/com/sun/star/i18n/LocaleData.idl b/offapi/com/sun/star/i18n/LocaleData.idl index fd951688305f..93d7962bf779 100644 --- a/offapi/com/sun/star/i18n/LocaleData.idl +++ b/offapi/com/sun/star/i18n/LocaleData.idl @@ -36,14 +36,7 @@ module com { module sun { module star { module i18n { /// Access locale specific data. -published service LocaleData -{ - interface com::sun::star::i18n::XLocaleData; - - [optional] interface com::sun::star::i18n::XLocaleData2; - [optional] interface com::sun::star::i18n::XLocaleData3; - [optional] interface com::sun::star::i18n::XLocaleData4; -}; +published service LocaleData : com::sun::star::i18n::XLocaleData4; }; }; }; }; diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb Binary files differindex 674109c7195f..8f2fe3bdb063 100644 --- a/offapi/type_reference/types.rdb +++ b/offapi/type_reference/types.rdb |