diff options
author | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:06:45 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-11 11:06:45 +0000 |
commit | 4b3df269f81184c4951457daa5181df2bcc5d259 (patch) | |
tree | 9abee74c54841f2cb7adc925c2752917f1446373 /xmloff/source/text | |
parent | 71d589cb3594204243ec711fcd462c7ae0b73e6c (diff) |
INTEGRATION: CWS sb19 (1.57.38); FILE MERGED
2004/12/08 10:53:58 sb 1.57.38.2: RESYNC: (1.57-1.59); FILE MERGED
2004/10/21 12:14:56 fs 1.57.38.1: #i32429# ExplodeFieldMasterName should not try to copy non-existent string parts
Diffstat (limited to 'xmloff/source/text')
-rw-r--r-- | xmloff/source/text/txtflde.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index c4cf37167f4d..1f95ebbc1cf8 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -2,9 +2,9 @@ * * $RCSfile: txtflde.cxx,v $ * - * $Revision: 1.59 $ + * $Revision: 1.60 $ * - * last change: $Author: hr $ $Date: 2004-11-09 12:19:36 $ + * last change: $Author: rt $ $Date: 2005-01-11 12:06:45 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2951,9 +2951,11 @@ sal_Bool XMLTextFieldExport::ExplodeFieldMasterName( DBG_WARNING("no field var name!"); bReturn = sal_False; } - - sFieldType = sMasterName.copy(nLength, nSeparator-nLength); - sVarName = sMasterName.copy(nSeparator+1); + else + { + sFieldType = sMasterName.copy(nLength, nSeparator-nLength); + sVarName = sMasterName.copy(nSeparator+1); + } return bReturn; } |