diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 12:26:21 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-04-20 12:26:21 +0000 |
| commit | 078c31d9a0988d1561d57b17ef40727217fc169a (patch) | |
| tree | 83503ae5d96c73dee98c7acc4080ddaecae45cc5 /unotools/inc | |
| parent | 492b0a5d96ddfee3f87f7b6d58ef077aa5f8bad1 (diff) | |
INTEGRATION: CWS numbers203 (1.25.34); FILE MERGED
2006/03/03 12:12:38 er 1.25.34.1: #i61657# new ::com::sun::star::i18n::Currency2.LegacyOnly
Diffstat (limited to 'unotools/inc')
| -rw-r--r-- | unotools/inc/unotools/localedatawrapper.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/unotools/inc/unotools/localedatawrapper.hxx b/unotools/inc/unotools/localedatawrapper.hxx index a0df409b8516..4c3cc3459fe1 100644 --- a/unotools/inc/unotools/localedatawrapper.hxx +++ b/unotools/inc/unotools/localedatawrapper.hxx @@ -4,9 +4,9 @@ * * $RCSfile: localedatawrapper.hxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: vg $ $Date: 2006-04-07 16:28:56 $ + * last change: $Author: hr $ $Date: 2006-04-20 13:26:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,7 +41,7 @@ #endif #ifndef _COM_SUN_STAR_I18N_XLOCALEDATA_HPP_ -#include <com/sun/star/i18n/XLocaleData.hpp> +#include <com/sun/star/i18n/XLocaleData2.hpp> #endif #ifndef _COM_SUN_STAR_I18N_LOCALEITEM_HPP_ #include <com/sun/star/i18n/LocaleItem.hpp> @@ -86,7 +86,7 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper static BYTE nLocaleDataChecking; // 0:=dontknow, 1:=yes, 2:=no ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData > xLD; + ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData2 > xLD; ::com::sun::star::lang::Locale aLocale; ::com::sun::star::uno::Reference< ::com::sun::star::i18n::Calendar > xDefaultCalendar; ::com::sun::star::i18n::LocaleDataItem aLocaleDataItem; @@ -165,12 +165,13 @@ public: ::com::sun::star::lang::Locale getLoadedLocale() const; - // Wrapper implementations of class LocaleData + // Wrapper implementations of service LocaleData ::com::sun::star::i18n::LanguageCountryInfo getLanguageCountryInfo() const; ::com::sun::star::i18n::LocaleDataItem getLocaleItem() const; ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Calendar > getAllCalendars() const; - ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency > getAllCurrencies() const; + /// NOTE: this wraps XLocaleData2::getAllCurrencies2() in fact. + ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Currency2 > getAllCurrencies() const; ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::FormatElement > getAllFormats() const; ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::Implementation > getCollatorImplementations() const; ::com::sun::star::uno::Sequence< ::rtl::OUString > getTransliterations() const; |