[Libreoffice-commits] core.git: sw/source

[Armin Le Grand]

 sw/source/ui/shells/textfld.cxx |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit d98279dbb9a1857561914f60e58a23dcd116be83
Author: Armin Le Grand <alg at apache.org>
Date:   Tue Jul 2 11:30:06 2013 +0000

    Related: #i120513# Remove autocompletion suggestion...
    
    when inserting comment via menu/shortcut
    
    Author: orw, alg
    (cherry picked from commit bfeefdb5affc187c4ae04d82915ac65ea3fc73e4)
    
    Conflicts:
    	sw/source/ui/shells/textfld.cxx
    
    Change-Id: I42dbfb46f784262d941f1c9b3e0b4a0b623067d9

diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 87a66e5..1d5cd63 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -33,7 +33,6 @@
 #include <sfx2/request.hxx>
 #include <svx/postattr.hxx>
 #include <svx/hlnkitem.hxx>
-
 #include <svx/svxdlg.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -54,19 +53,16 @@
 #include <expfld.hxx>
 #include <fldmgr.hxx>
 #include <uitool.hxx>
-
 #include <cmdid.h>
 #include <shells.hrc>
-
 #include <sfx2/app.hxx>
 #include <svx/dialogs.hrc>
 #include "swabstdlg.hxx"
 #include "dialog.hrc"
 #include <fldui.hrc>
 #include <doc.hxx>
-
 #include <app.hrc>
-
+#include <edtwin.hxx>
 #include <PostItMgr.hxx>
 #include <switerator.hxx>
 
@@ -355,6 +351,11 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                         rSh.KillPams();
                         rSh.ClearMark();
                     }
+
+                    // #i120513# Inserting a comment into an autocompletion crashes
+                    // --> suggestion has to be removed before
+                    GetView().GetEditWin().StopQuickHelp();
+
                     SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, aEmptyStr, 0);
                     aFldMgr.InsertFld(aData, &aSaved);