diff options
| -rw-r--r-- | basic/source/comp/token.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/control/quickselectionengine.cxx | 21 |
2 files changed, 5 insertions, 20 deletions
diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx index a2df363308f6..beff37d7f6c3 100644 --- a/basic/source/comp/token.cxx +++ b/basic/source/comp/token.cxx @@ -552,11 +552,11 @@ OUString SbiTokenizer::GetKeywordCase( const OUString& sKeyword ) { if( !nToken ) { - TokenTable *tp; + const TokenTable *tp; for( nToken = 0, tp = pTokTable; tp->t; nToken++, tp++ ) {} } - TokenTable* tp = pTokTable; + const TokenTable* tp = pTokTable; for( short i = 0; i < nToken; i++, tp++ ) { OUString sStr = OStringToOUString(tp->s, RTL_TEXTENCODING_ASCII_US); 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 |