fdo#46808, convert i18n::InputSequenceChecker to new-style

Change-Id: I29678d74ae3c6dc38d3d09e2cf4a0d4f28f789a1

8 files changed, 15 insertions, 42 deletions

diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 810877072e56..75b18b372e74 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -63,6 +63,7 @@
 #include <vcl/metric.hxx>
 #include <com/sun/star/i18n/BreakIterator.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/InputSequenceChecker.hpp>
 #include <com/sun/star/text/CharacterCompressionType.hpp>
 #include <vcl/pdfextoutdevdata.hxx>
 #include <i18npool/mslangid.hxx>
@@ -4344,13 +4345,8 @@ Reference < i18n::XExtendedInputSequenceChecker > ImpEditEngine::ImplGetInputSeq
 {
     if ( !xISC.is() )
     {
-        Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        Reference < XInterface > xI = xMSF->createInstance( OUString( "com.sun.star.i18n.InputSequenceChecker" ) );
-        if ( xI.is() )
-        {
-            Any x = xI->queryInterface( ::getCppuType((const Reference< i18n::XExtendedInputSequenceChecker >*)0) );
-            x >>= xISC;
-        }
+        Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
+        xISC = i18n::InputSequenceChecker::create( xContext );
     }
     return xISC;
 }
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index 061a4c5e4e19..159663edc3fc 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.cxx
@@ -123,8 +123,7 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (Ru
                         m_xContext);
 
             if ( xI.is() ) {
-                Reference< XExtendedInputSequenceChecker > xISC;
-                xI->queryInterface( getCppuType((const Reference< XExtendedInputSequenceChecker>*)0) ) >>= xISC;
+                Reference< XExtendedInputSequenceChecker > xISC( xI, uno::UNO_QUERY );
                 if (xISC.is()) {
                     lookupTable.push_back(cachedItem = new lookupTableItem(rLanguage, xISC));
                     return cachedItem->xISC;
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 96877642bbab..bd583e6654ea 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -170,6 +170,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/i18n,\
 	BreakIterator \
 	CharacterClassification \
 	Collator \
+	InputSequenceChecker \
 	LocaleCalendar \
 	LocaleData \
 	NativeNumberSupplier \
@@ -893,7 +894,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\
 	ChapterCollator \
 	IndexEntrySupplier \
-	InputSequenceChecker \
 	OrdinalSuffix \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/image,\
diff --git a/offapi/com/sun/star/i18n/InputSequenceChecker.idl b/offapi/com/sun/star/i18n/InputSequenceChecker.idl
index acb859d30c3c..cb46e1624d98 100644
--- a/offapi/com/sun/star/i18n/InputSequenceChecker.idl
+++ b/offapi/com/sun/star/i18n/InputSequenceChecker.idl
@@ -30,12 +30,7 @@ module com { module sun { module star { module i18n {
 
      @since OOo 1.1.2
 */
-published service InputSequenceChecker
-{
-    interface com::sun::star::i18n::XInputSequenceChecker;
-
-    [optional] interface com::sun::star::i18n::XExtendedInputSequenceChecker;
-};
+published service InputSequenceChecker : XExtendedInputSequenceChecker;
 
 }; }; }; };
 
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 95b71c216219..527015291d91 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb
diff --git a/sw/source/core/bastyp/checkit.cxx b/sw/source/core/bastyp/checkit.cxx
index a51fa15043dd..69066ff5cbac 100644
--- a/sw/source/core/bastyp/checkit.cxx
+++ b/sw/source/core/bastyp/checkit.cxx
@@ -19,22 +19,15 @@
 
 #include <checkit.hxx>
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/i18n/InputSequenceChecker.hpp>
 
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::i18n;
 
 SwCheckIt::SwCheckIt()
 {
-    Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-    Reference < XInterface > xI = xMSF->createInstance(
-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.InputSequenceChecker")) );
-    if ( xI.is() )
-    {
-        Any x = xI->queryInterface( ::getCppuType((const Reference< XExtendedInputSequenceChecker >*)0) );
-        x >>= xCheck;
-    }
+    Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
+    xCheck = InputSequenceChecker::create(xContext);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 69ac949a3864..590f1a2188a5 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 
-#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
+#include <com/sun/star/i18n/InputSequenceChecker.hpp>
 #include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -854,13 +854,8 @@ uno::Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenc
     uno::Reference < i18n::XExtendedInputSequenceChecker > xISC;
 //    if ( !xISC.is() )
     {
-        uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        uno::Reference < XInterface > xI = xMSF->createInstance( OUString("com.sun.star.i18n.InputSequenceChecker") );
-        if ( xI.is() )
-        {
-            Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XExtendedInputSequenceChecker >*)0) );
-            x >>= xISC;
-        }
+        uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
+        xISC = i18n::InputSequenceChecker::create(xContext);
     }
     return xISC;
 }
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 2bd7234ab926..1ee609c38bd8 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -38,7 +38,7 @@
 
 #include <com/sun/star/i18n/WordType.hpp>
 
-#include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
+#include <com/sun/star/i18n/InputSequenceChecker.hpp>
 #include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 
@@ -637,13 +637,8 @@ uno::Reference < i18n::XExtendedInputSequenceChecker > TextEngine::GetInputSeque
     uno::Reference < i18n::XExtendedInputSequenceChecker > xISC;
 //    if ( !xISC.is() )
     {
-        uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
-        uno::Reference< uno::XInterface > xI = xMSF->createInstance( OUString( "com.sun.star.i18n.InputSequenceChecker" ) );
-        if ( xI.is() )
-        {
-            Any x = xI->queryInterface( ::getCppuType((const uno::Reference< i18n::XExtendedInputSequenceChecker >*)0) );
-            x >>= xISC;
-        }
+        uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
+        xISC = i18n::InputSequenceChecker::create(xContext);
     }
     return xISC;
 }