i18npool: Constructor feature for few more implementations.

Change-Id: I018bbe39a30582f51cdd620b3bf3240456b7bd65

6 files changed, 46 insertions, 25 deletions

diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 08c067741bfc..e46dedc663d5 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -36,7 +36,6 @@ U_CDECL_END
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
-using namespace ::rtl;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
@@ -462,4 +461,12 @@ BreakIterator_Unicode::getSupportedServiceNames(void) throw( uno::RuntimeExcepti
 
 } } } }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_i18n_BreakIterator_Unicode_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new css::i18n::BreakIterator_Unicode());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index 00fb7793d484..601184d09218 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -30,8 +30,6 @@
 
 #define TRANSLITERATION_ALL
 #include <transliteration_body.hxx>
-#include <transliteration_caseignore.hxx>
-#include <transliteration_Ignore.hxx>
 #include <transliteration_OneToOne.hxx>
 #include <textToPronounce_zh.hxx>
 #include <numtotext_cjk.hxx>
@@ -47,7 +45,6 @@
 #define BREAKITERATOR_ALL
 #include <breakiterator_cjk.hxx>
 #include <breakiterator_th.hxx>
-#include <breakiterator_unicode.hxx>
 
 #include <indexentrysupplier.hxx>
 #include <indexentrysupplier_asian.hxx>
@@ -117,7 +114,6 @@ IMPL_CREATEINSTANCE( Calendar_ROC )
 IMPL_CREATEINSTANCE( Calendar_hijri )
 IMPL_CREATEINSTANCE( Calendar_jewish )
 IMPL_CREATEINSTANCE( Calendar_buddhist )
-IMPL_CREATEINSTANCE( BreakIterator_Unicode )
 IMPL_CREATEINSTANCE( BreakIterator_ja )
 IMPL_CREATEINSTANCE( BreakIterator_zh )
 IMPL_CREATEINSTANCE( BreakIterator_zh_TW )
@@ -138,13 +134,10 @@ IMPL_CREATEINSTANCE( Transliteration_l2u )
 IMPL_CREATEINSTANCE( Transliteration_sentencecase )
 IMPL_CREATEINSTANCE( Transliteration_titlecase )
 IMPL_CREATEINSTANCE( Transliteration_togglecase )
-IMPL_CREATEINSTANCE( Transliteration_caseignore )
 IMPL_CREATEINSTANCE( hiraganaToKatakana )
 IMPL_CREATEINSTANCE( katakanaToHiragana )
-IMPL_CREATEINSTANCE( ignoreKana )
 IMPL_CREATEINSTANCE( fullwidthToHalfwidth )
 IMPL_CREATEINSTANCE( halfwidthToFullwidth )
-IMPL_CREATEINSTANCE( ignoreWidth )
 
 IMPL_CREATEINSTANCE( smallToLarge_ja_JP)
 IMPL_CREATEINSTANCE( largeToSmall_ja_JP)
@@ -309,9 +302,6 @@ static const struct InstancesArray {
     {   "com.sun.star.i18n.Calendar_buddhist",
         "com.sun.star.i18n.Calendar_buddhist",
         &Calendar_buddhist_CreateInstance },
-    {   "com.sun.star.i18n.BreakIterator_Unicode",
-        "com.sun.star.i18n.BreakIterator_Unicode",
-        &BreakIterator_Unicode_CreateInstance },
     {   "com.sun.star.i18n.BreakIterator_ja",
         "com.sun.star.i18n.BreakIterator_ja",
         &BreakIterator_ja_CreateInstance },
@@ -364,31 +354,21 @@ static const struct InstancesArray {
         TRLT_IMPLNAME_PREFIX  "TOGGLE_CASE",
         &Transliteration_togglecase_CreateInstance },
     {   TRLT_SERVICELNAME_L10N,
-        TRLT_IMPLNAME_PREFIX  "IGNORE_CASE",
-        &Transliteration_caseignore_CreateInstance },
-    {   TRLT_SERVICELNAME_L10N,
         TRLT_IMPLNAME_PREFIX  "HIRAGANA_KATAKANA",
         &hiraganaToKatakana_CreateInstance },
     {   TRLT_SERVICELNAME_L10N,
         TRLT_IMPLNAME_PREFIX  "KATAKANA_HIRAGANA",
         &katakanaToHiragana_CreateInstance },
     {   TRLT_SERVICELNAME_L10N,
-        TRLT_IMPLNAME_PREFIX  "IGNORE_KANA",
-        &ignoreKana_CreateInstance },
-    {   TRLT_SERVICELNAME_L10N,
         TRLT_IMPLNAME_PREFIX  "FULLWIDTH_HALFWIDTH",
         &fullwidthToHalfwidth_CreateInstance },
     {   TRLT_SERVICELNAME_L10N,
         TRLT_IMPLNAME_PREFIX  "HALFWIDTH_FULLWIDTH",
         &halfwidthToFullwidth_CreateInstance },
-    {   TRLT_SERVICELNAME_L10N,
-        TRLT_IMPLNAME_PREFIX  "IGNORE_WIDTH",
-        &ignoreWidth_CreateInstance },
     IMPL_TRANSLITERATION_ITEM (smallToLarge_ja_JP),
     IMPL_TRANSLITERATION_ITEM (largeToSmall_ja_JP),
     IMPL_TRANSLITERATION_ITEM (ignoreTraditionalKanji_ja_JP),
     IMPL_TRANSLITERATION_ITEM (ignoreTraditionalKana_ja_JP),
-    IMPL_TRANSLITERATION_ITEM (ignoreKana),
     IMPL_TRANSLITERATION_ITEM (ignoreMinusSign_ja_JP),
     IMPL_TRANSLITERATION_ITEM (ignoreIterationMark_ja_JP),
     IMPL_TRANSLITERATION_ITEM (ignoreSeparator_ja_JP),
diff --git a/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx
index e525f5dcca35..d051c664bf4b 100644
--- a/i18npool/source/transliteration/ignoreKana.cxx
+++ b/i18npool/source/transliteration/ignoreKana.cxx
@@ -21,6 +21,8 @@
 // prevent internal compiler error with MSVC6SP3
 #include <utility>
 
+#include <com/sun/star/uno/XComponentContext.hpp>
+
 #define TRANSLITERATION_Kana
 #include <transliteration_Ignore.hxx>
 #define TRANSLITERATION_hiraganaToKatakana
@@ -60,4 +62,12 @@ ignoreKana::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException,
 
 } } } }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_i18n_Transliteration_IGNORE_KANA_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new css::i18n::ignoreKana());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx
index aa4e87b5d5c3..d0c5c93e1c99 100644
--- a/i18npool/source/transliteration/ignoreWidth.cxx
+++ b/i18npool/source/transliteration/ignoreWidth.cxx
@@ -20,6 +20,8 @@
 // prevent internal compiler error with MSVC6SP3
 #include <utility>
 
+#include <com/sun/star/uno/XComponentContext.hpp>
+
 #define TRANSLITERATION_Width
 #include <transliteration_Ignore.hxx>
 #define TRANSLITERATION_fullwidthToHalfwidth
@@ -59,4 +61,12 @@ ignoreWidth::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException,
 
 } } } }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_i18n_Transliteration_IGNORE_WIDTH_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new css::i18n::ignoreWidth());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx
index d42261bb3380..a26021d39cf2 100644
--- a/i18npool/source/transliteration/transliteration_caseignore.cxx
+++ b/i18npool/source/transliteration/transliteration_caseignore.cxx
@@ -21,6 +21,8 @@
 // prevent internal compiler error with MSVC6SP3
 #include <utility>
 
+#include <com/sun/star/uno/XComponentContext.hpp>
+
 #include <i18nutil/oneToOneMapping.hxx>
 #include <i18nutil/casefolding.hxx>
 #include "transliteration_caseignore.hxx"
@@ -147,4 +149,12 @@ Transliteration_caseignore::compare(
 
 } } } }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_i18n_Transliteration_IGNORE_CASE_get_implementation(
+    css::uno::XComponentContext *,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new css::i18n::Transliteration_caseignore());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/util/i18npool.component b/i18npool/util/i18npool.component
index 198551d23e03..88f72eae2fd1 100644
--- a/i18npool/util/i18npool.component
+++ b/i18npool/util/i18npool.component
@@ -23,7 +23,8 @@
       constructor="com_sun_star_i18n_BreakIterator_get_implementation">
     <service name="com.sun.star.i18n.BreakIterator"/>
   </implementation>
-  <implementation name="com.sun.star.i18n.BreakIterator_Unicode">
+  <implementation name="com.sun.star.i18n.BreakIterator_Unicode"
+      constructor="com_sun_star_i18n_BreakIterator_Unicode_get_implementation">
     <service name="com.sun.star.i18n.BreakIterator_Unicode"/>
   </implementation>
   <implementation name="com.sun.star.i18n.BreakIterator_ja">
@@ -219,13 +220,16 @@
   <implementation name="com.sun.star.i18n.Transliteration.HIRAGANA_KATAKANA">
     <service name="com.sun.star.i18n.Transliteration.l10n"/>
   </implementation>
-  <implementation name="com.sun.star.i18n.Transliteration.IGNORE_CASE">
+  <implementation name="com.sun.star.i18n.Transliteration.IGNORE_CASE"
+      constructor="com_sun_star_i18n_Transliteration_IGNORE_CASE_get_implementation">
     <service name="com.sun.star.i18n.Transliteration.l10n"/>
   </implementation>
-  <implementation name="com.sun.star.i18n.Transliteration.IGNORE_KANA">
+  <implementation name="com.sun.star.i18n.Transliteration.IGNORE_KANA"
+      constructor="com_sun_star_i18n_Transliteration_IGNORE_KANA_get_implementation">
     <service name="com.sun.star.i18n.Transliteration.l10n"/>
   </implementation>
-  <implementation name="com.sun.star.i18n.Transliteration.IGNORE_WIDTH">
+  <implementation name="com.sun.star.i18n.Transliteration.IGNORE_WIDTH"
+      constructor="com_sun_star_i18n_Transliteration_IGNORE_WIDTH_get_implementation">
     <service name="com.sun.star.i18n.Transliteration.l10n"/>
   </implementation>
   <implementation name="com.sun.star.i18n.Transliteration.KATAKANA_HIRAGANA">