diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-11 12:31:25 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-11 12:31:47 +0200 |
| commit | 91ba527a63f77658ee147515f1699792059aa2e5 (patch) | |
| tree | 3912c8b62f23e8809156ec5e2b78302471d79056 /i18npool/inc | |
| parent | ab819ab4f49ec7e0d57dcf8bf77beb8cd323ceb1 (diff) | |
Avoid name clash with generated C++ class corresponding to UNOIDL service
Change-Id: I96582bf05787a30479d324ff8deb7cea758bb2c2
Diffstat (limited to 'i18npool/inc')
| -rw-r--r-- | i18npool/inc/calendar_gregorian.hxx | 2 | ||||
| -rw-r--r-- | i18npool/inc/nativenumbersupplier.hxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index bd99d187b8f3..ea06b007bc4f 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -93,7 +93,7 @@ public: protected: const Era *eraArray; icu::Calendar *body; - NativeNumberSupplier aNatNum; + NativeNumberSupplierService aNatNum; const sal_Char* cCalendar; com::sun::star::lang::Locale aLocale; sal_uInt32 fieldSet; diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx index 750b5095fff5..14d17f6e678a 100644 --- a/i18npool/inc/nativenumbersupplier.hxx +++ b/i18npool/inc/nativenumbersupplier.hxx @@ -28,16 +28,16 @@ namespace com { namespace sun { namespace star { namespace i18n { // ---------------------------------------------------- -// class NativeNumberSupplier +// class NativeNumberSupplierService // ---------------------------------------------------- -class NativeNumberSupplier : public cppu::WeakImplHelper2 +class NativeNumberSupplierService : public cppu::WeakImplHelper2 < com::sun::star::i18n::XNativeNumberSupplier, com::sun::star::lang::XServiceInfo > { public: - NativeNumberSupplier(bool _useOffset = false) : useOffset(_useOffset) {} + NativeNumberSupplierService(bool _useOffset = false) : useOffset(_useOffset) {} // Methods virtual OUString SAL_CALL getNativeNumberString( const OUString& aNumberString, |