office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-08-27 03:30:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Applications/18.08'

Browse source
This commit is contained in:
Albert Astals Cid 2018-07-28 22:41:21 +02:00
parent 1503463958 aed8e5ac28
commit 7c87174dde
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ui/formwidgets.cpp
View file

@ -293,7 +293,6 @@ FormWidgetIface::FormWidgetIface( QWidget * w, Okular::FormField * ff )
FormWidgetIface::~FormWidgetIface()
{
m_ff = nullptr;
}
Okular::NormalizedRect FormWidgetIface::rect() const
@ -588,6 +587,14 @@ TextAreaEdit::TextAreaEdit( Okular::FormFieldText * text, QWidget * parent )
setVisible( text->isVisible() );
}
TextAreaEdit::~TextAreaEdit()
{
// We need this because otherwise on destruction we destruct the syntax highlighter
// that ends up calling text changed but then we go to slotChanged and we're already
// half destructed and all is bad
disconnect( this, &QTextEdit::textChanged, this, &TextAreaEdit::slotChanged );
}
bool TextAreaEdit::event( QEvent* e )
{
if ( e->type() == QEvent::KeyPress )
@ -662,10 +669,6 @@ void TextAreaEdit::slotHandleTextChangedByUndoRedo( int pageNumber,
void TextAreaEdit::slotChanged()
{
// happens on destruction
if (!m_ff)
return;
Okular::FormFieldText *form = static_cast<Okular::FormFieldText *>(m_ff);
QString contents = toPlainText();
int cursorPos = textCursor().position();

1
ui/formwidgets.h
View file

@ -253,6 +253,7 @@ class TextAreaEdit : public KTextEdit, public FormWidgetIface
public:
explicit TextAreaEdit( Okular::FormFieldText * text, QWidget * parent = nullptr );
~TextAreaEdit();
void setFormWidgetsController( FormWidgetsController *controller ) override;
bool event ( QEvent * e ) override;