[Libreoffice-commits] core.git: i18npool/inc i18npool/source

[Stephan Bergmann]

 i18npool/inc/ordinalsuffix.hxx                  |    6 +++---
 i18npool/source/ordinalsuffix/ordinalsuffix.cxx |   14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit a6104092925a6fe9f96ca239c0292bd1539d5746
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Thu Sep 11 12:34:19 2014 +0200

    Avoid name clash with generated C++ class corresponding to UNOIDL service
    
    Change-Id: Ie76cab45f5fd609457b11cb3b9732cba2da3b023

diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index 127d1f1..36a6d18 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.hxx
@@ -28,15 +28,15 @@
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
-class OrdinalSuffix : public cppu::WeakImplHelper2
+class OrdinalSuffixService : public cppu::WeakImplHelper2
 <
     XOrdinalSuffix,
     com::sun::star::lang::XServiceInfo
 >
 {
     public:
-        OrdinalSuffix();
-        virtual ~OrdinalSuffix();
+        OrdinalSuffixService();
+        virtual ~OrdinalSuffixService();
 
         // XOrdinalSuffix
         virtual com::sun::star::uno::Sequence< OUString > SAL_CALL 
getOrdinalSuffix( sal_Int32 nNumber, const com::sun::star::lang::Locale 
&rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) 
SAL_OVERRIDE;
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx 
b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index dafc783..53cea5f 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
@@ -35,11 +35,11 @@ using namespace ::com::sun::star;
 namespace com { namespace sun { namespace star { namespace i18n {
 
 
-OrdinalSuffix::OrdinalSuffix()
+OrdinalSuffixService::OrdinalSuffixService()
 {
 }
 
-OrdinalSuffix::~OrdinalSuffix()
+OrdinalSuffixService::~OrdinalSuffixService()
 {
 }
 
@@ -65,7 +65,7 @@ namespace
  * For this method to properly return the ordinal suffix for other locales
  * than english ones, ICU 4.2+ has to be used.
  */
-uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 
nNumber,
+uno::Sequence< OUString > SAL_CALL OrdinalSuffixService::getOrdinalSuffix( 
sal_Int32 nNumber,
         const lang::Locale &rLocale ) throw( RuntimeException, std::exception )
 {
     uno::Sequence< OUString > retValue;
@@ -135,17 +135,17 @@ uno::Sequence< OUString > SAL_CALL 
OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN
 
 const sal_Char cOrdinalSuffix[] = "com.sun.star.i18n.OrdinalSuffix";
 
-OUString SAL_CALL OrdinalSuffix::getImplementationName(void) throw( 
RuntimeException, std::exception )
+OUString SAL_CALL OrdinalSuffixService::getImplementationName(void) throw( 
RuntimeException, std::exception )
 {
     return OUString::createFromAscii(cOrdinalSuffix);
 }
 
-sal_Bool SAL_CALL OrdinalSuffix::supportsService( const OUString& 
rServiceName) throw( RuntimeException, std::exception )
+sal_Bool SAL_CALL OrdinalSuffixService::supportsService( const OUString& 
rServiceName) throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-Sequence< OUString > SAL_CALL OrdinalSuffix::getSupportedServiceNames(void) 
throw( RuntimeException, std::exception )
+Sequence< OUString > SAL_CALL 
OrdinalSuffixService::getSupportedServiceNames(void) throw( RuntimeException, 
std::exception )
 {
     Sequence< OUString > aRet(1);
     aRet[0] = OUString::createFromAscii(cOrdinalSuffix);
@@ -159,7 +159,7 @@ com_sun_star_i18n_OrdinalSuffix_get_implementation(
     css::uno::XComponentContext *,
     css::uno::Sequence<css::uno::Any> const &)
 {
-    return cppu::acquire(new css::i18n::OrdinalSuffix());
+    return cppu::acquire(new css::i18n::OrdinalSuffixService());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits