diff options
| author | Gergo Mocsi <gmocsi91@gmail.com> | 2013-09-02 17:55:59 +0200 |
|---|---|---|
| committer | Gergo Mocsi <gmocsi91@gmail.com> | 2013-09-02 18:17:03 +0200 |
| commit | d3ff876f3c7f441fd72a037ed31fb973f223ca6d (patch) | |
| tree | b987f8e55cfd7301f2796bd02aa9f96543125f2c /vcl | |
| parent | GSOC work, renaming+listbox right side fix (diff) | |
| download | core-d3ff876f3c7f441fd72a037ed31fb973f223ca6d.tar.gz core-d3ff876f3c7f441fd72a037ed31fb973f223ca6d.zip | |
GSOC work, small fixes after
Fixed some errors after the merge.
Change-Id: I8c0360d7fd04425a00dacb37f673d10efffa0ebe
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/quickselectionengine.cxx | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx index f265bf400e9c..00060bde8e9c 100644 --- a/vcl/source/control/quickselectionengine.cxx +++ b/vcl/source/control/quickselectionengine.cxx @@ -114,33 +114,18 @@ namespace vcl { if( bEnabled ) { - m_pData->sCurrentSearchString += OUString(c); - OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: searching for %s", OUStringToOString(m_pData->sCurrentSearchString, RTL_TEXTENCODING_UTF8).getStr() ); - - if ( m_pData->sCurrentSearchString.getLength() == 1 ) - { // first character in the search -> remmeber - m_pData->aSingleSearchChar.reset( c ); - } - else if ( m_pData->sCurrentSearchString.getLength() > 1 ) - { - if ( !!m_pData->aSingleSearchChar && ( *m_pData->aSingleSearchChar != c ) ) - // we already have a "single char", but the current one is different -> reset - m_pData->aSingleSearchChar.reset(); - } - - OUString aSearchTemp( m_pData->sCurrentSearchString ); sal_Unicode c = _keyEvent.GetCharCode(); if ( ( c >= 32 ) && ( c != 127 ) && !_keyEvent.GetKeyCode().IsMod2() ) { - m_pData->sCurrentSearchString += c; + m_pData->sCurrentSearchString += OUString(c); OSL_TRACE( "QuickSelectionEngine::HandleKeyEvent: searching for %s", OUStringToOString(m_pData->sCurrentSearchString, RTL_TEXTENCODING_UTF8).getStr() ); - if ( m_pData->sCurrentSearchString.Len() == 1 ) + if ( m_pData->sCurrentSearchString.getLength() == 1 ) { // first character in the search -> remmeber m_pData->aSingleSearchChar.reset( c ); } - else if ( m_pData->sCurrentSearchString.Len() > 1 ) + else if ( m_pData->sCurrentSearchString.getLength() > 1 ) { if ( !!m_pData->aSingleSearchChar && ( *m_pData->aSingleSearchChar != c ) ) // we already have a "single char", but the current one is different -> reset |