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

[Stephan Bergmann]

 i18npool/inc/textconversion.hxx                      |   12 ++++++------
 i18npool/source/textconversion/textconversion.cxx    |   12 ++++++------
 i18npool/source/textconversion/textconversion_ko.cxx |    2 +-
 i18npool/source/textconversion/textconversion_zh.cxx |    2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 63bc11b81f8af188564a385c1e501fd7334c343d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 11 12:37:10 2014 +0200

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

diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index d068c0e..6a41d92 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -31,17 +31,17 @@
 namespace com { namespace sun { namespace star { namespace i18n {
 
 
-//  class TextConversion
+//  class TextConversionService
 
-class TextConversion: public cppu::WeakImplHelper2
+class TextConversionService: public cppu::WeakImplHelper2
 <
     com::sun::star::i18n::XExtendedTextConversion,
     com::sun::star::lang::XServiceInfo
 >
 {
 public:
-        TextConversion(const char* pImplName);
-        virtual ~TextConversion();
+        TextConversionService(const char* pImplName);
+        virtual ~TextConversionService();
         // Methods
         virtual com::sun::star::i18n::TextConversionResult SAL_CALL
         getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
@@ -100,7 +100,7 @@ typedef struct {
 
 //  class TextConversion_ko
 
-class TextConversion_ko : public TextConversion
+class TextConversion_ko : public TextConversionService
 {
 public:
     TextConversion_ko( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
@@ -156,7 +156,7 @@ typedef struct {
     sal_Int16 count;
 } STC_WordIndex;
 
-class TextConversion_zh : public TextConversion
+class TextConversion_zh : public TextConversionService
 {
 public:
     TextConversion_zh( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rxContext );
diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index aec186e..7ef257d 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -31,7 +31,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 
 #endif
 
-TextConversion::TextConversion(const char *pImplName)
+TextConversionService::TextConversionService(const char *pImplName)
     : implementationName(pImplName)
 {
 #ifndef DISABLE_DYNLOADING
@@ -45,7 +45,7 @@ TextConversion::TextConversion(const char *pImplName)
 #endif
 }
 
-TextConversion::~TextConversion()
+TextConversionService::~TextConversionService()
 {
 #ifndef DISABLE_DYNLOADING
     if (hModule) osl_unloadModule(hModule);
@@ -60,7 +60,7 @@ static void* nullFunc()
 }
 
 oslGenericFunction SAL_CALL
-TextConversion::getFunctionBySymbol(const sal_Char* func)
+TextConversionService::getFunctionBySymbol(const sal_Char* func)
 {
     if (hModule)
         return osl_getFunctionSymbol(hModule, OUString::createFromAscii(func).pData);
@@ -71,19 +71,19 @@ TextConversion::getFunctionBySymbol(const sal_Char* func)
 #endif
 
 OUString SAL_CALL
-TextConversion::getImplementationName() throw( RuntimeException, std::exception )
+TextConversionService::getImplementationName() throw( RuntimeException, std::exception )
 {
     return OUString::createFromAscii(implementationName);
 }
 
 sal_Bool SAL_CALL
-TextConversion::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
+TextConversionService::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-TextConversion::getSupportedServiceNames() throw( RuntimeException, std::exception )
+TextConversionService::getSupportedServiceNames() throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(1);
     aRet[0] = OUString::createFromAscii(implementationName);
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index 2423180..02dc72e 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
 #define SCRIPT_HANGUL   2
 
 TextConversion_ko::TextConversion_ko( const Reference < XComponentContext >& xContext )
-    : TextConversion("com.sun.star.i18n.TextConversion_ko")
+    : TextConversionService("com.sun.star.i18n.TextConversion_ko")
 {
     Reference < XInterface > xI;
 
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index 74ecb19..89f652c 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.cxx
@@ -37,7 +37,7 @@ using namespace com::sun::star::uno;
 namespace com { namespace sun { namespace star { namespace i18n {
 
 TextConversion_zh::TextConversion_zh( const Reference < XComponentContext >& xContext )
-    : TextConversion("com.sun.star.i18n.TextConversion_zh")
+    : TextConversionService("com.sun.star.i18n.TextConversion_zh")
 {
     xCDL = ConversionDictionaryList::create(xContext);
 }