diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-10 18:44:48 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-02-11 22:34:36 +0100 |
| commit | 76f5ce409fc9c3985d475f9e41d1b38cfd9f1ec2 (patch) | |
| tree | a97ed05c82a571d6b18fd8a3ecf38ac7919f0c1d /vcl | |
| parent | 5d0638afdf59950a64bc1b8a0794b60de87addc4 (diff) | |
more similar handling of InputSequenceChecker as in other places
Change-Id: Ia6efc0eda03dac87c73e720d08f320ce3fc6ce4a
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/edit.cxx | 14 | ||||
| -rw-r--r-- | vcl/source/edit/texteng.cxx | 11 |
2 files changed, 10 insertions, 15 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 1a0d04cd91f1..2e8b3f96bf39 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -834,18 +834,14 @@ uno::Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator() const } // ----------------------------------------------------------------------- -uno::Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenceChecker() const +uno::Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenceChecker() { - //!! since we don't want to become incompatible in the next minor update - //!! where this code will get integrated into, xISC will be a local - //!! variable instead of a class member! - uno::Reference < i18n::XExtendedInputSequenceChecker > xISC; -// if ( !xISC.is() ) + if ( !mxISC.is() ) { - uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - xISC = i18n::InputSequenceChecker::create(xContext); + mxISC = i18n::InputSequenceChecker::create( + ::comphelper::getProcessComponentContext() ); } - return xISC; + return mxISC; } // ----------------------------------------------------------------------- diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index a0e27e800962..7e8037d6bbdc 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -628,15 +628,14 @@ void TextEngine::ImpRemoveParagraph( sal_uLong nPara ) ImpParagraphRemoved( nPara ); } -uno::Reference < i18n::XExtendedInputSequenceChecker > TextEngine::GetInputSequenceChecker() const +uno::Reference < i18n::XExtendedInputSequenceChecker > TextEngine::GetInputSequenceChecker() { - uno::Reference < i18n::XExtendedInputSequenceChecker > xISC; -// if ( !xISC.is() ) + if ( !mxISC.is() ) { - uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); - xISC = i18n::InputSequenceChecker::create(xContext); + mxISC = i18n::InputSequenceChecker::create( + ::comphelper::getProcessComponentContext() ); } - return xISC; + return mxISC; } sal_Bool TextEngine::IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const |