Skip to content

C
core
Kaydet (Commit) 297b109e authored tarafından Matteo Casalin's avatar Matteo Casalin
Dosyalara gözat
Seçenekler

sal_uInt16 to sal_Int32, constify and simplify 

Change-Id: If97d75dbfb683191f4a30d796ca132cedec6c92e
üst 288f4944
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
vcl/source/control/edit.cxx
Dosyayı görüntüle @ 297b109e
...@@ -2131,22 +2131,20 @@ void Edit::Command( const CommandEvent& rCEvt ) ...@@ -2131,22 +2131,20 @@ void Edit::Command( const CommandEvent& rCEvt )
maText.insert( mpIMEInfos->nPos, pData->GetText() ); maText.insert( mpIMEInfos->nPos, pData->GetText() );
if ( mpIMEInfos->bWasCursorOverwrite ) if ( mpIMEInfos->bWasCursorOverwrite )
{ {
sal_Int32 nOldIMETextLen = mpIMEInfos->nLen; const sal_Int32 nOldIMETextLen = mpIMEInfos->nLen;
sal_Int32 nNewIMETextLen = pData->GetText().getLength(); const sal_Int32 nNewIMETextLen = pData->GetText().getLength();
if ( ( nOldIMETextLen > nNewIMETextLen ) && if ( ( nOldIMETextLen > nNewIMETextLen ) &&
( nNewIMETextLen < mpIMEInfos->aOldTextAfterStartPos.getLength() ) ) ( nNewIMETextLen < mpIMEInfos->aOldTextAfterStartPos.getLength() ) )
{ {
// restore old characters // restore old characters
sal_Int32 nRestore = nOldIMETextLen - nNewIMETextLen; const sal_Int32 nRestore = nOldIMETextLen - nNewIMETextLen;
maText.insert( mpIMEInfos->nPos + nNewIMETextLen, mpIMEInfos->aOldTextAfterStartPos.copy( nNewIMETextLen, nRestore ) ); maText.insert( mpIMEInfos->nPos + nNewIMETextLen, mpIMEInfos->aOldTextAfterStartPos.copy( nNewIMETextLen, nRestore ) );
} }
else if ( ( nOldIMETextLen < nNewIMETextLen ) && else if ( ( nOldIMETextLen < nNewIMETextLen ) &&
( nOldIMETextLen < mpIMEInfos->aOldTextAfterStartPos.getLength() ) ) ( nOldIMETextLen < mpIMEInfos->aOldTextAfterStartPos.getLength() ) )
{ {
// overwrite const sal_Int32 nOverwrite = ( nNewIMETextLen > mpIMEInfos->aOldTextAfterStartPos.getLength()
sal_uInt16 nOverwrite = nNewIMETextLen - nOldIMETextLen; ? mpIMEInfos->aOldTextAfterStartPos.getLength() : nNewIMETextLen ) - nOldIMETextLen;
if ( ( nOldIMETextLen + nOverwrite ) > mpIMEInfos->aOldTextAfterStartPos.getLength() )
nOverwrite = mpIMEInfos->aOldTextAfterStartPos.getLength() - nOldIMETextLen;
maText.remove( mpIMEInfos->nPos + nNewIMETextLen, nOverwrite ); maText.remove( mpIMEInfos->nPos + nNewIMETextLen, nOverwrite );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment