diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-01-12 10:26:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-12 20:09:31 +0000 |
| commit | 40a8208e678b2c00b7be63ac53cb76550819abc5 (patch) | |
| tree | 01ff8c30a355f14d89ebddcaaf651db37a404a0c /include | |
| parent | c253a64e5597ca2273000a7d4023e4765d203fe2 (diff) | |
longparas: raise 16bit cursor pos limit to 32bit
Change-Id: I08e4e954d4f07800d23b50d3fc933b1d2984eca0
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/cmdevt.hxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/include/vcl/cmdevt.hxx b/include/vcl/cmdevt.hxx index e67a2a99e611..8f680200f47c 100644 --- a/include/vcl/cmdevt.hxx +++ b/include/vcl/cmdevt.hxx @@ -46,38 +46,38 @@ class VCL_DLLPUBLIC CommandExtTextInputData { private: OUString maText; - sal_uInt16* mpTextAttr; - xub_StrLen mnCursorPos; - sal_uInt16 mnCursorFlags; - sal_Bool mbOnlyCursor; + sal_uInt16* mpTextAttr; + sal_Int32 mnCursorPos; + sal_uInt16 mnCursorFlags; + bool mbOnlyCursor; public: CommandExtTextInputData( const OUString& rText, const sal_uInt16* pTextAttr, sal_Int32 nCursorPos, sal_uInt16 nCursorFlags, - sal_Bool bOnlyCursor ); + bool bOnlyCursor ); CommandExtTextInputData( const CommandExtTextInputData& rData ); ~CommandExtTextInputData(); const OUString& GetText() const { return maText; } - const sal_uInt16* GetTextAttr() const { return mpTextAttr; } - sal_uInt16 GetCharTextAttr( sal_uInt16 nIndex ) const; - xub_StrLen GetCursorPos() const { return mnCursorPos; } - sal_Bool IsCursorVisible() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_INVISIBLE) == 0; } - sal_Bool IsCursorOverwrite() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_OVERWRITE) != 0; } - sal_uInt16 GetCursorFlags() const { return mnCursorFlags; } - sal_Bool IsOnlyCursorChanged() const { return mbOnlyCursor; } + const sal_uInt16* GetTextAttr() const { return mpTextAttr; } + sal_uInt16 GetCharTextAttr(sal_Int32 nIndex) const + { + assert(nIndex >= 0); + if (mpTextAttr && nIndex < maText.getLength() && nIndex >=0) + return mpTextAttr[nIndex]; + else + return 0; + } + + sal_Int32 GetCursorPos() const { return mnCursorPos; } + bool IsCursorVisible() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_INVISIBLE) == 0; } + bool IsCursorOverwrite() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_OVERWRITE) != 0; } + sal_uInt16 GetCursorFlags() const { return mnCursorFlags; } + bool IsOnlyCursorChanged() const { return mbOnlyCursor; } }; -inline sal_uInt16 CommandExtTextInputData::GetCharTextAttr( sal_uInt16 nIndex ) const -{ - if ( mpTextAttr && (nIndex < maText.getLength()) ) - return mpTextAttr[nIndex]; - else - return 0; -} - // --------------------------- // - CommandInputContextData - // --------------------------- |