diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-04 17:11:14 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-02-06 13:50:15 +0000 |
| commit | 224c65a22b580c6acd09aced71483177d2a9fbd7 (patch) | |
| tree | ed78fe6a4126cd843e04b23562da69733149ae1d | |
| parent | e9bac857d7e3e783878422618ac03ff42d68fc27 (diff) | |
Resolves: tdf#68137 crash in traversing script fields
use the same guards as the SwFldEditDlg does
(cherry picked from commit 38a65f76bc944ea730ebac7640dc135248ec3da0)
Conflicts:
sw/source/ui/fldui/javaedit.cxx
Change-Id: I7d135cf969d9925cec57a90ef0fba8fe40f664eb
Reviewed-on: https://gerrit.libreoffice.org/14323
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | sw/source/ui/fldui/javaedit.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index b3c1bae39a4d..55066dd18a2e 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -88,6 +88,7 @@ SwJavaEditDialog::SwJavaEditDialog(vcl::Window* pParent, SwWrtShell* pWrtSh) : SwJavaEditDialog::~SwJavaEditDialog() { + pSh->EnterStdMode(); delete pMgr; delete pFileDlg; Application::SetDefDialogParent( pOldDefDlgParent ); @@ -95,6 +96,8 @@ SwJavaEditDialog::~SwJavaEditDialog() IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, PrevHdl) { + pSh->EnterStdMode(); + SetFld(); pMgr->GoPrev(); pFld = (SwScriptField*)pMgr->GetCurFld(); @@ -107,6 +110,8 @@ IMPL_LINK_NOARG_INLINE_END(SwJavaEditDialog, PrevHdl) IMPL_LINK_NOARG_INLINE_START(SwJavaEditDialog, NextHdl) { + pSh->EnterStdMode(); + SetFld(); pMgr->GoNext(); pFld = (SwScriptField*)pMgr->GetCurFld(); |