strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS sysui26 (1.11.52); FILE MERGED

Browse source 
2008/06/25 09:56:52 dv 1.11.52.1: Split lines with semicolon for better macro support
This commit is contained in:
Ivo Hinkelmann 2008-07-16 15:05:32 +00:00
parent ddbaffe4ca
commit ee1db2ea6c
1 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
solenv/bin/modules/pre2par/work.pm
View file

@ -8,7 +8,7 @@
#
# $RCSfile: work.pm,v $
#
# $Revision: 1.12 $
# $Revision: 1.13 $
#
# This file is part of OpenOffice.org.
#
@ -56,6 +56,12 @@ sub split_line
pre2par::remover::remove_leading_and_ending_whitespaces(\$oneline);
$oneline = $oneline . "\n";
push(@{$parfile}, $oneline);
if ( $line =~ /^\s*End\s+(\w+.*$)/i )
{
$line = $1;
push(@{$parfile}, "End\n\n");
}
}
# the last line
@ -67,6 +73,32 @@ sub split_line
if ( $line =~ /^\s*End\s*$/i ) { push(@{$parfile}, "\n"); }
}
###################################################################
# Preprocessing the pre file to split all lines with semicolon
###################################################################
sub preprocess_macros
{
my ($prefile) = @_;
my @newprefile = ();
for ( my $i = 0; $i <= $#{$prefile}; $i++ )
{
my $oneline = ${$prefile}[$i];
if ( $oneline =~ /\;\s*\w+/ )
{
split_line($oneline, \@newprefile);
}
else
{
push(@newprefile, $oneline);
}
}
return \@newprefile;
}
############################################
# main working procedure
############################################
@ -81,6 +113,9 @@ sub convert
my $ismultiliner = 0;
my $globalline = "";
# Preprocessing the pre file to split all lines with semicolon
$prefile = preprocess_macros($prefile);
for ( my $i = 0; $i <= $#{$prefile}; $i++ )
{
my $oneline = ${$prefile}[$i];