mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GSOC work, small fixes after

Browse Source 
Fixed some errors after the merge.

Change-Id: I8c0360d7fd04425a00dacb37f673d10efffa0ebe
This commit is contained in:
Gergo Mocsi
2013-09-02 17:55:59 +02:00
parent d9e81b8540
commit d3ff876f3c
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
basic/source/comp/token.cxx
View File

@@ -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);

21
vcl/source/control/quickselectionengine.cxx
View File

@@ -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