From 91ba527a63f77658ee147515f1699792059aa2e5 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 11 Sep 2014 12:31:25 +0200 Subject: Avoid name clash with generated C++ class corresponding to UNOIDL service Change-Id: I96582bf05787a30479d324ff8deb7cea758bb2c2 --- i18npool/inc/calendar_gregorian.hxx | 2 +- i18npool/inc/nativenumbersupplier.hxx | 6 +++--- .../defaultnumberingprovider.cxx | 2 +- .../source/nativenumber/nativenumbersupplier.cxx | 20 ++++++++++---------- .../transliteration/transliteration_Numeric.cxx | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'i18npool') 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, diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index 6e373b00061f..e7b130912966 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -857,7 +857,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence tableSize && !recycleSymbol) diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index 4d54397e71bd..a8f08badbab4 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -517,7 +517,7 @@ static sal_Int16 SAL_CALL getLanguageNumber( const Locale& rLocale) return -1; } -OUString SAL_CALL NativeNumberSupplier::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale, +OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale, sal_Int16 nNativeNumberMode, Sequence< sal_Int32 >& offset) throw (RuntimeException) { const Number *number = 0; @@ -595,14 +595,14 @@ OUString SAL_CALL NativeNumberSupplier::getNativeNumberString(const OUString& aN return aNumberString; } -OUString SAL_CALL NativeNumberSupplier::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale, +OUString SAL_CALL NativeNumberSupplierService::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale, sal_Int16 nNativeNumberMode) throw (RuntimeException, std::exception) { Sequence< sal_Int32 > offset; return getNativeNumberString(aNumberString, rLocale, nNativeNumberMode, offset); } -sal_Unicode SAL_CALL NativeNumberSupplier::getNativeNumberChar( const sal_Unicode inChar, const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw(com::sun::star::uno::RuntimeException) +sal_Unicode SAL_CALL NativeNumberSupplierService::getNativeNumberChar( const sal_Unicode inChar, const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw(com::sun::star::uno::RuntimeException) { if (nNativeNumberMode == NativeNumberMode::NATNUM0) { // Ascii for (sal_Int16 i = 0; i < NumberChar_Count; i++) @@ -636,7 +636,7 @@ sal_Unicode SAL_CALL NativeNumberSupplier::getNativeNumberChar( const sal_Unicod return inChar; } -sal_Bool SAL_CALL NativeNumberSupplier::isValidNatNum( const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL NativeNumberSupplierService::isValidNatNum( const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw (RuntimeException, std::exception) { sal_Int16 langnum = getLanguageNumber(rLocale); @@ -663,7 +663,7 @@ sal_Bool SAL_CALL NativeNumberSupplier::isValidNatNum( const Locale& rLocale, sa return sal_False; } -NativeNumberXmlAttributes SAL_CALL NativeNumberSupplier::convertToXmlAttributes( const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw (RuntimeException, std::exception) +NativeNumberXmlAttributes SAL_CALL NativeNumberSupplierService::convertToXmlAttributes( const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw (RuntimeException, std::exception) { static const sal_Int16 attShort = 0; static const sal_Int16 attMedium = 1; @@ -739,7 +739,7 @@ static bool natNumIn(sal_Int16 num, const sal_Int16 natnum[], sal_Int16 len) return false; } -sal_Int16 SAL_CALL NativeNumberSupplier::convertFromXmlAttributes( const NativeNumberXmlAttributes& aAttr ) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL NativeNumberSupplierService::convertFromXmlAttributes( const NativeNumberXmlAttributes& aAttr ) throw (RuntimeException, std::exception) { sal_Unicode numberChar[NumberChar_Count]; for (sal_Int16 i = 0; i < NumberChar_Count; i++) @@ -887,19 +887,19 @@ OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, boo static const sal_Char* implementationName = "com.sun.star.i18n.NativeNumberSupplier"; -OUString SAL_CALL NativeNumberSupplier::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL NativeNumberSupplierService::getImplementationName() throw( RuntimeException, std::exception ) { return OUString::createFromAscii( implementationName ); } sal_Bool SAL_CALL -NativeNumberSupplier::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) +NativeNumberSupplierService::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -NativeNumberSupplier::getSupportedServiceNames() throw( RuntimeException, std::exception ) +NativeNumberSupplierService::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii( implementationName ); @@ -913,7 +913,7 @@ com_sun_star_i18n_NativeNumberSupplier_get_implementation( css::uno::XComponentContext *, css::uno::Sequence const &) { - return cppu::acquire(new css::i18n::NativeNumberSupplier()); + return cppu::acquire(new css::i18n::NativeNumberSupplierService()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx index 78d33e3feec8..86de70f765f0 100644 --- a/i18npool/source/transliteration/transliteration_Numeric.cxx +++ b/i18npool/source/transliteration/transliteration_Numeric.cxx @@ -119,7 +119,7 @@ transliteration_Numeric::transliterate( const OUString& inStr, sal_Int32 startPo if (tableSize) return transliterateBullet( inStr, startPos, nCount, offset); else - return NativeNumberSupplier(useOffset).getNativeNumberString( inStr.copy(startPos, nCount), aLocale, nNativeNumberMode, offset ); + return NativeNumberSupplierService(useOffset).getNativeNumberString( inStr.copy(startPos, nCount), aLocale, nNativeNumberMode, offset ); } sal_Unicode SAL_CALL @@ -134,7 +134,7 @@ transliteration_Numeric::transliterateChar2Char( sal_Unicode inChar ) throw(Runt return inChar; } else - return NativeNumberSupplier().getNativeNumberChar( inChar, aLocale, nNativeNumberMode ); + return NativeNumberSupplierService().getNativeNumberChar( inChar, aLocale, nNativeNumberMode ); } } } } } -- cgit