diff options
| author | Noel Grandin <noel@peralex.com> | 2013-02-11 09:21:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-02-12 10:14:41 +0200 |
| commit | e2ab5539a4a68f443cf7f77784a820e280fc969f (patch) | |
| tree | 89efe0c4a3a55b9a99c94dccb901eb94861d8674 /vcl | |
| parent | 98fa4be44290ceefd7f08ef167f0278743ade1c5 (diff) | |
fdo#46808, convert i18n::InputSequenceChecker to new-style
Change-Id: I29678d74ae3c6dc38d3d09e2cf4a0d4f28f789a1
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/edit.cxx | 11 | ||||
| -rw-r--r-- | vcl/source/edit/texteng.cxx | 11 |
2 files changed, 6 insertions, 16 deletions
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; } |