3 files changed, 11 insertions, 9 deletions
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index 4dea3d63c189..496c06cc68d0 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.cxx
@@ -22,17 +22,15 @@
 #include <com/sun/star/i18n/UnicodeType.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <i18nutil/unicode.hxx>
-#include <rtl/ustrbuf.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using namespace ::rtl;
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
 InputSequenceCheckerImpl::InputSequenceCheckerImpl( const Reference < XComponentContext >& rxContext ) : m_xContext( rxContext )
 {
-    serviceName = "com.sun.star.i18n.InputSequenceCheckerImpl";
+    serviceName = "com.sun.star.i18n.InputSequenceChecker";
     cachedItem = NULL;
 }
 
@@ -157,4 +155,12 @@ InputSequenceCheckerImpl::getSupportedServiceNames(void) throw( RuntimeException
 
 } } } }
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_i18n_InputSequenceChecker_get_implementation(
+    css::uno::XComponentContext *context,
+    css::uno::Sequence<css::uno::Any> const &)
+{
+    return cppu::acquire(new css::i18n::InputSequenceCheckerImpl(context));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index 601184d09218..d0e576f2c654 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -55,7 +55,6 @@
 #include <chaptercollator.hxx>
 #include <collator_unicode.hxx>
 
-#include <inputsequencechecker.hxx>
 #include <inputsequencechecker_th.hxx>
 #include <inputsequencechecker_hi.hxx>
 
@@ -122,7 +121,6 @@ IMPL_CREATEINSTANCE( BreakIterator_th )
 IMPL_CREATEINSTANCE_CTX( ChapterCollator )
 IMPL_CREATEINSTANCE( Collator_Unicode )
 
-IMPL_CREATEINSTANCE_CTX( InputSequenceCheckerImpl )
 IMPL_CREATEINSTANCE( InputSequenceChecker_th )
 IMPL_CREATEINSTANCE( InputSequenceChecker_hi )
 
@@ -323,9 +321,6 @@ static const struct InstancesArray {
     {   "com.sun.star.i18n.Collator_Unicode",
         "com.sun.star.i18n.Collator_Unicode",
         &Collator_Unicode_CreateInstance },
-    {   "com.sun.star.i18n.InputSequenceChecker",
-        "com.sun.star.i18n.InputSequenceChecker",
-        &InputSequenceCheckerImpl_CreateInstance },
     {   "com.sun.star.i18n.InputSequenceChecker_th",
         "com.sun.star.i18n.InputSequenceChecker_th",
         &InputSequenceChecker_th_CreateInstance },
diff --git a/i18npool/util/i18npool.component b/i18npool/util/i18npool.component
index 88f72eae2fd1..9873934226c4 100644
--- a/i18npool/util/i18npool.component
+++ b/i18npool/util/i18npool.component
@@ -114,7 +114,8 @@
   <implementation name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric last) (grouped by syllable)">
     <service name="com.sun.star.i18n.IndexEntrySupplier_ja_phonetic (alphanumeric last) (grouped by syllable)"/>
   </implementation>
-  <implementation name="com.sun.star.i18n.InputSequenceChecker">
+  <implementation name="com.sun.star.i18n.InputSequenceChecker"
+      constructor="com_sun_star_i18n_InputSequenceChecker_get_implementation">
     <service name="com.sun.star.i18n.InputSequenceChecker"/>
   </implementation>
   <implementation name="com.sun.star.i18n.InputSequenceChecker_hi">