Blame SOURCES/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
|
 |
106311 |
--- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.preedit 2006-06-28 17:18:08.000000000 +0200
|
|
|
106311 |
+++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp 2006-06-28 17:20:09.000000000 +0200
|
|
|
106311 |
@@ -1906,9 +1906,6 @@
|
|
|
106311 |
|
|
|
106311 |
void QTextEdit::removeSelectedText( int selNum )
|
|
|
106311 |
{
|
|
|
106311 |
- if(selNum != 0)
|
|
|
106311 |
- resetInputContext();
|
|
|
106311 |
-
|
|
|
106311 |
QTextCursor c1 = doc->selectionStartCursor( selNum );
|
|
|
106311 |
c1.restoreState();
|
|
|
106311 |
QTextCursor c2 = doc->selectionEndCursor( selNum );
|
|
|
106311 |
@@ -3171,7 +3168,6 @@
|
|
|
106311 |
return;
|
|
|
106311 |
}
|
|
|
106311 |
#endif
|
|
|
106311 |
- resetInputContext();
|
|
|
106311 |
QTextParagraph *p = doc->paragAt( para );
|
|
|
106311 |
if ( !p )
|
|
|
106311 |
return;
|
|
|
106311 |
@@ -3198,7 +3194,6 @@
|
|
|
106311 |
return;
|
|
|
106311 |
}
|
|
|
106311 |
#endif
|
|
|
106311 |
- resetInputContext();
|
|
|
106311 |
for ( int i = 0; i < (int)doc->numSelections(); ++i )
|
|
|
106311 |
doc->removeSelection( i );
|
|
|
106311 |
|
|
|
106311 |
@@ -3240,7 +3235,6 @@
|
|
|
106311 |
if ( d->optimMode )
|
|
|
106311 |
return;
|
|
|
106311 |
#endif
|
|
|
106311 |
- resetInputContext();
|
|
|
106311 |
QTextParagraph *p = doc->paragAt( para );
|
|
|
106311 |
if ( !p )
|
|
|
106311 |
return;
|
|
|
106311 |
@@ -3285,7 +3279,6 @@
|
|
|
106311 |
if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled )
|
|
|
106311 |
return;
|
|
|
106311 |
|
|
|
106311 |
- resetInputContext();
|
|
|
106311 |
for ( int i = 0; i < (int)doc->numSelections(); ++i )
|
|
|
106311 |
doc->removeSelection( i );
|
|
|
106311 |
|
|
|
106311 |
@@ -3336,7 +3329,6 @@
|
|
|
106311 |
if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled )
|
|
|
106311 |
return;
|
|
|
106311 |
|
|
|
106311 |
- resetInputContext();
|
|
|
106311 |
for ( int i = 0; i < (int)doc->numSelections(); ++i )
|
|
|
106311 |
doc->removeSelection( i );
|
|
|
106311 |
|
|
|
106311 |
@@ -3450,7 +3442,6 @@
|
|
|
106311 |
{
|
|
|
106311 |
if ( isReadOnly() )
|
|
|
106311 |
return;
|
|
|
106311 |
- resetInputContext();
|
|
|
106311 |
normalCopy();
|
|
|
106311 |
removeSelectedText();
|
|
|
106311 |
updateMicroFocusHint();
|
|
|
106311 |
@@ -3938,7 +3929,6 @@
|
|
|
106311 |
return;
|
|
|
106311 |
}
|
|
|
106311 |
#endif
|
|
|
106311 |
- resetInputContext();
|
|
|
106311 |
if ( !isModified() && isReadOnly() &&
|
|
|
106311 |
this->context() == context && this->text() == text )
|
|
|
106311 |
return;
|
|
|
106311 |
@@ -4112,7 +4102,6 @@
|
|
|
106311 |
if ( !p )
|
|
|
106311 |
return;
|
|
|
106311 |
|
|
|
106311 |
- resetInputContext();
|
|
|
106311 |
if ( index > p->length() - 1 )
|
|
|
106311 |
index = p->length() - 1;
|
|
|
106311 |
|
|
|
106311 |
@@ -4169,7 +4158,6 @@
|
|
|
106311 |
return;
|
|
|
106311 |
}
|
|
|
106311 |
#endif
|
|
|
106311 |
- resetInputContext();
|
|
|
106311 |
if ( doc->hasSelection( selNum ) ) {
|
|
|
106311 |
doc->removeSelection( selNum );
|
|
|
106311 |
repaintChanged();
|
|
|
106311 |
@@ -5072,7 +5060,6 @@
|
|
|
106311 |
{
|
|
|
106311 |
if ( dc == doc )
|
|
|
106311 |
return;
|
|
|
106311 |
- resetInputContext();
|
|
|
106311 |
doc = dc;
|
|
|
106311 |
delete cursor;
|
|
|
106311 |
cursor = new QTextCursor( doc );
|