From 2529c52e7da22bc50c5c98db9d2c597b0fcb18ff Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Mon, 30 Jun 2003 14:55:02 +0000
Subject: INTEGRATION: CWS aig04 (1.3.48); FILE MERGED 2003/06/26 07:29:31 os
 1.3.48.1: #108791# List item edit field inserts on RETURN key

---
 sw/source/ui/cctrl/actctrl.cxx | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'sw/source/ui/cctrl/actctrl.cxx')

diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx
index 319b3317d0f3..9eb0f1b7af4e 100644
--- a/sw/source/ui/cctrl/actctrl.cxx
+++ b/sw/source/ui/cctrl/actctrl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: actctrl.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: vg $ $Date: 2003-04-17 15:14:14 $
+ *  last change: $Author: hr $ $Date: 2003-06-30 15:55:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -137,6 +137,27 @@ void NoSpaceEdit::Modify()
     if(GetModifyHdl().IsSet())
         GetModifyHdl().Call(this);
 }
+/* -----------------25.06.2003 15:57-----------------
 
+ --------------------------------------------------*/
+ReturnActionEdit::~ReturnActionEdit()
+{
+}
+/* -----------------25.06.2003 15:58-----------------
+
+ --------------------------------------------------*/
+void ReturnActionEdit::KeyInput( const KeyEvent& rEvt)
+{
+    const KeyCode aKeyCode = rEvt.GetKeyCode();
+    const USHORT nModifier = aKeyCode.GetModifier();
+    if( aKeyCode.GetCode() == KEY_RETURN &&
+            !nModifier)
+    {
+        if(aReturnActionLink.IsSet())
+            aReturnActionLink.Call(this);
+    }
+    else
+        Edit::KeyInput(rEvt);
+}
 
 
-- 
cgit