diff -r d39add9822e2 -r 5bfc169077b2 webengine/osswebengine/WebKit/s60/webview/WebTextFormatMask.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebTextFormatMask.cpp Tue Feb 02 00:56:45 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/WebTextFormatMask.cpp Fri Mar 19 09:52:28 2010 +0200 @@ -192,15 +192,9 @@ m_currentMask = m_currentMask->nextMask(); } - // this check doesn't seem to be proper as the check is done for - // the partial text.Because the checkText() is called for every character input by user, - // there are remaining masks after complete text length has been checked, - // that is valid case and it should not return false. - // If text length is bigger than mask length then that case is handled within for loop - //before this condition check. So it is redundant in current implementation - // did we use up all the masks? - /* if(m_currentMask && m_currentMask->multitude() != kInfinite) - return false;*/ + // did we use up all the masks? + if(m_currentMask && m_currentMask->multitude() != kInfinite) + return false; return (eb.m_start == -1); } @@ -282,11 +276,6 @@ return true; } -bool WebTextFormatMask::acceptAll() - { - return m_acceptAll; - } - MaskComposite::MaskComposite(TInputFormatMaskType t, int mul) : MaskSingle(t), m_offset(0), m_length(mul) {