diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:06:11 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:06:11 +0000 |
| commit | dc85d8690ef2217d71cb082c99bdc34e86b05d2f (patch) | |
| tree | 2dd34d65f932e2dd4afdceca2b3b259a6d35ec08 /solenv/bin/modules/pre2par | |
| parent | 309b814d1aea078786a1bc73c6fb9fea161c95d6 (diff) | |
INTEGRATION: CWS sb83 (1.9.566); FILE MERGED
2007/12/19 15:18:34 sb 1.9.566.2: #i84200# make sure there is an even number of double quotes before the two string literals to concatenate
2007/12/03 13:41:53 sb 1.9.566.1: #i84200# Allow for adjacent string literals in scp files that are automatically merged into single string literals.
Diffstat (limited to 'solenv/bin/modules/pre2par')
| -rw-r--r-- | solenv/bin/modules/pre2par/work.pm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/solenv/bin/modules/pre2par/work.pm b/solenv/bin/modules/pre2par/work.pm index dfab718f91f3..c114c146e8a8 100644 --- a/solenv/bin/modules/pre2par/work.pm +++ b/solenv/bin/modules/pre2par/work.pm @@ -4,9 +4,9 @@ # # $RCSfile: work.pm,v $ # -# $Revision: 1.9 $ +# $Revision: 1.10 $ # -# last change: $Author: kz $ $Date: 2006-07-05 21:13:48 $ +# last change: $Author: vg $ $Date: 2008-03-18 13:06:11 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -179,6 +179,18 @@ sub convert $oneline =~ s/\s*\=\s*/ \= /; # nice, to have only one whitespace around equal signs + # Concatenate adjacent string literals: + while ($oneline =~ + s/^((?:[^"]* + \"(?:[^\\"]|\\.)*\" + (?:[^"]*[^[:blank:]"][^"]*\"(?:[^\\"]|\\.)*\")*)* + [^"]* + \"(?:[^\\"]|\\.)*) + \"[[:blank:]]*\" + ((?:[^\\"]|\\.)*\") + /\1\2/x) + {} + push(@parfile, $oneline); if ($insertemptyline) { push(@parfile, "\n"); } |