Commit 1c543b18 authored by David Faure's avatar David Faure
Browse files

Forwardport fix for #54878 crash and for "Insert Page Break" (#128126)

svn path=/trunk/koffice/; revision=546205
parent cc5b2f27
......@@ -206,7 +206,6 @@ void KoFindReplace::connectFind( KFind* find )
KoFindReplace::~KoFindReplace()
{
removeHighlight();
emitUndoRedo();
//kDebug(32500) << "KoFindReplace::~KoFindReplace" << endl;
delete m_find;
delete m_replace;
......@@ -220,6 +219,7 @@ void KoFindReplace::optionsChanged()
void KoFindReplace::dialogClosed()
{
removeHighlight();
emitUndoRedo();
// we have to stop the match counting when closing the dialog,
// because Shift-F3 (find previous) would keep increasing that count, wrongly.
m_doCounting = false;
......
......@@ -1651,7 +1651,7 @@ KCommand * KoTextObject::insertParagraphCommand( KoTextCursor *cursor )
{
if ( protectContent() )
return 0L;
return replaceSelectionCommand( cursor, "\n", QString::null );
return replaceSelectionCommand( cursor, "\n", QString::null, KoTextDocument::Standard, CheckNewLine );
}
void KoTextObject::highlightPortion( KoTextParag * parag, int index, int length, bool repaint )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment