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 /include | |
| parent | 5d0638afdf59950a64bc1b8a0794b60de87addc4 (diff) | |
more similar handling of InputSequenceChecker as in other places
Change-Id: Ia6efc0eda03dac87c73e720d08f320ce3fc6ce4a
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/edit.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/texteng.hxx | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 471e5d3e5ff9..4d6566acdf1f 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -86,6 +86,8 @@ private: Link maUpdateDataHdl; Link maAutocompleteHdl; + css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC; + DECL_DLLPRIVATE_LINK( ImplUpdateDataHdl, void* ); SAL_DLLPRIVATE bool ImplTruncateToMaxLen( OUString&, sal_Int32 nSelectionLen ) const; @@ -112,7 +114,7 @@ private: SAL_DLLPRIVATE void ImplCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard ); SAL_DLLPRIVATE void ImplPaste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard ); SAL_DLLPRIVATE long ImplGetTextYPosition() const; - SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > ImplGetInputSequenceChecker() const; + SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > ImplGetInputSequenceChecker(); SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > ImplGetBreakIterator() const; protected: diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 163d62c4a886..fd6afcf13cb6 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -104,6 +104,7 @@ private: ::com::sun::star::lang::Locale maLocale; ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > mxBreakIterator; + css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC; Rectangle maInvalidRect; Range maInvalidRange; @@ -159,7 +160,7 @@ protected: // gets not exported. First and seconf parameter swapped to have a different signatur. SAL_DLLPRIVATE TextPaM ImpInsertText( sal_Unicode c, const TextSelection& rSel, sal_Bool bOverwrite = sal_False, sal_Bool bIsUserInput = sal_False ); // some other new functions needed that must not be exported to remain compatible - SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > GetInputSequenceChecker() const; + SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > GetInputSequenceChecker(); SAL_DLLPRIVATE sal_Bool IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const; // broadcast or adjust selections |