summaryrefslogtreecommitdiff
path: root/sw/source/ui/fldui
diff options
context:
space:
mode:
authorOliver Specht <os@openoffice.org>2002-11-06 09:34:02 +0000
committerOliver Specht <os@openoffice.org>2002-11-06 09:34:02 +0000
commit3b857fd894246eddac5ca7d1845ab0d4abab09e8 (patch)
tree2aa6433cefaaf2b7b6ddc72a3662e12a83916b52 /sw/source/ui/fldui
parent0ccb81809d23f76a52ff07f784b63a22a6214802 (diff)
#104769# prevent changes of InputField content
Diffstat (limited to 'sw/source/ui/fldui')
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 3173ab6cefdf..bfa2ac8c801f 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: fldfunc.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: jp $ $Date: 2001-09-20 12:49:58 $
+ * last change: $Author: os $ $Date: 2002-11-06 10:34:02 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -600,6 +600,10 @@ BOOL SwFldFuncPage::FillItemSet(SfxItemSet& rSet)
{
case TYP_INPUTFLD:
nSubType = INP_TXT;
+ // to prevent removal of CR/LF restore old content
+ if(!aNameED.IsModified() && IsFldEdit())
+ aName = GetCurField()->GetPar1();
+
break;
case TYP_MACROFLD:
@@ -717,6 +721,9 @@ IMPL_LINK( SwFldFuncPage, ModifyHdl, Edit *, EMPTYARG )
/*------------------------------------------------------------------------
$Log: not supported by cvs2svn $
+ Revision 1.6 2001/09/20 12:49:58 jp
+ Bug #89582#: handle field dialog activation correct
+
Revision 1.5 2001/07/17 08:48:51 tbe
#87307# remove external basctl dependencies