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 /vcl | |
| parent | c253a64e5597ca2273000a7d4023e4765d203fe2 (diff) | |
longparas: raise 16bit cursor pos limit to 32bit
Change-Id: I08e4e954d4f07800d23b50d3fc933b1d2984eca0
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/edit.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/cmdevt.cxx | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index aa579e70107b..52bbedf91306 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2257,7 +2257,7 @@ void Edit::Command( const CommandEvent& rCEvt ) } ImplAlignAndPaint(); - xub_StrLen nCursorPos = mpIMEInfos->nPos + pData->GetCursorPos(); + sal_Int32 nCursorPos = mpIMEInfos->nPos + pData->GetCursorPos(); SetSelection( Selection( nCursorPos, nCursorPos ) ); SetInsertMode( !pData->IsCursorOverwrite() ); diff --git a/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx index 6326defdc137..9f1b4677403a 100644 --- a/vcl/source/window/cmdevt.cxx +++ b/vcl/source/window/cmdevt.cxx @@ -23,11 +23,9 @@ #include <vcl/cmdevt.hxx> CommandExtTextInputData::CommandExtTextInputData( const OUString& rText, - const sal_uInt16* pTextAttr, - sal_Int32 nCursorPos, - sal_uInt16 nCursorFlags, - sal_Bool bOnlyCursor ) : - maText( rText ) + const sal_uInt16* pTextAttr, sal_Int32 nCursorPos, sal_uInt16 nCursorFlags, + bool bOnlyCursor) + : maText(rText) { if ( pTextAttr && !maText.isEmpty() ) { @@ -62,8 +60,7 @@ CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData& CommandExtTextInputData::~CommandExtTextInputData() { - if ( mpTextAttr ) - delete [] mpTextAttr; + delete [] mpTextAttr; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |