diff options
| author | Steve Yin <steve_y@apache.org> | 2013-11-26 14:25:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-26 15:27:17 +0000 |
| commit | c23ab5eaed57cc3fb5860e26c591c73c5b22687b (patch) | |
| tree | 7a918b328e80763fa334f59c789cff399f207541 /include/editeng/splwrap.hxx | |
| parent | 62fcdfa34aa302aa9051e90e75b94eb442fa1db7 (diff) | |
Integrate branch of IAccessible2
WaE: Reorder initializations to prevent compiler warnings.
(cherry picked from commit c05431aa92fa2c7c7258418a6ecd651b5c26d982)
WaE: unname unused variable to prevent compiler warnings.
(cherry picked from commit 2259256a390c4b6f83cfb5dbe4a65df5032aee47)
Conflicts:
editeng/source/accessibility/AccessibleEditableTextPara.cxx
ad61537527a74670af266feb9e4d26d2d654daf7
66044902b8d94fc15d4c30270e6cc419fb7d3565
Change-Id: I3ec9798f2c7d854824722c0cf44b62128b4f4cb4
Diffstat (limited to 'include/editeng/splwrap.hxx')
| -rw-r--r-- | include/editeng/splwrap.hxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index 29e42ef1a0bb..754c4d0187a2 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace linguistic2 { }}}} class Window; - +class SdrObject; // misc functions --------------------------------------------------------------- void EDITENG_DLLPUBLIC SvxPrepareAutoCorrect( OUString &rOldText, const OUString &rNewText ); @@ -55,6 +55,7 @@ private: ::com::sun::star::linguistic2::XSpellChecker1 > xSpell; ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > xHyph; + SdrObject* mpTextObj; sal_uInt16 nOldLang; // Set Language, only call SetLanguage on changes sal_Bool bOtherCntnt : 1; // set => Check special sections initially sal_Bool bDialog : 1; // Is pWin the Svx...Dialog? @@ -144,6 +145,8 @@ protected: virtual void AutoCorrect( const OUString& rAktStr, const OUString& rNewStr ); virtual void InsertHyphen( const sal_uInt16 nPos ); // Insert hyphen + void SetCurTextObj( SdrObject* pObj ) { mpTextObj = pObj; } + SdrObject* GetCurTextObj() { return mpTextObj; } }; #endif |