[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Caolán McNamara]

 sw/source/ui/fldui/javaedit.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 224c65a22b580c6acd09aced71483177d2a9fbd7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 4 17:11:14 2015 +0000

    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 at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index b3c1bae..55066dd 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();