openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1498881 - /openoffice/trunk/main/sw/source/ui/shells/textfld.cxx
Date Tue, 02 Jul 2013 11:30:06 GMT
Author: alg
Date: Tue Jul  2 11:30:06 2013
New Revision: 1498881

URL: http://svn.apache.org/r1498881
Log:
i120513 Remove autocompletion suggestion when inserting comment via menu/shortcut
Author: orw, alg

Modified:
    openoffice/trunk/main/sw/source/ui/shells/textfld.cxx

Modified: openoffice/trunk/main/sw/source/ui/shells/textfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/textfld.cxx?rev=1498881&r1=1498880&r2=1498881&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/textfld.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/textfld.cxx Tue Jul  2 11:30:06 2013
@@ -19,14 +19,11 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
 #include <crsskip.hxx>
 #include <hintids.hxx>	//_immer_ vor den solar-Items
-
 #include <sfx2/lnkbase.hxx>
 #include <fmtfld.hxx>
 #include <tools/urlobj.hxx>
@@ -40,7 +37,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>
@@ -62,10 +58,8 @@
 #include <expfld.hxx>
 #include <fldmgr.hxx>
 #include <uitool.hxx>
-
 #include <cmdid.h>
 #include <shells.hrc>
-
 #include <sfx2/app.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
@@ -73,15 +67,13 @@
 #include "dialog.hrc"
 #include <fldui.hrc>
 #include <doc.hxx>
-
 #include <app.hrc>
-
+#include <edtwin.hxx>
 #include <PostItMgr.hxx>
 #include <switerator.hxx>
 
 using namespace nsSwDocInfoSubType;
 
-
 extern sal_Bool bNoInterrupt;		// in mainwn.cxx
 
 String& lcl_AppendRedlineStr( String& rStr, sal_uInt16 nRedlId )
@@ -363,6 +355,11 @@ void SwTextShell::ExecField(SfxRequest &
 						rSh.KillPams();
 						rSh.ClearMark();
 					}
+					
+					// #120513# 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);
 					rSh.Push();



Mime
View raw message