Skip to content

Commit fe499f1

Browse files
jbamptonPilot-Pirx
authored andcommitted
misc: remove trailing whitespace (#465)
General find and repalce clean up (cherry picked from commit be6777f)
1 parent c1fc95f commit fe499f1

7 files changed

Lines changed: 51 additions & 51 deletions

File tree

main/LICENSE_category_b

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ Mozilla Public License Version 2.0
635635
means any form of the work other than Source Code Form.
636636

637637
1.7. "Larger Work"
638-
means a work that combines Covered Software with other material, in
638+
means a work that combines Covered Software with other material, in
639639
a separate file or files, that is not Covered Software.
640640

641641
1.8. "License"
@@ -1019,7 +1019,7 @@ nished to do so, subject to the following conditions:
10191019
The above copyright notice and this permission notice shall be included in
10201020
all copies or substantial portions of the Software.
10211021

1022-
Portions of the Software were created using source code and/or APIs
1022+
Portions of the Software were created using source code and/or APIs
10231023
governed by the Mozilla Public License (MPL). The MPL is available
10241024
at http://www.mozilla.org/MPL/MPL-1.1.html. The MPL permits such
10251025
portions to be distributed with code not governed by MPL, as long
@@ -1053,7 +1053,7 @@ Version 1.0
10531053
Modifications used by a Contributor, and the Modifications made by that
10541054
particular Contributor.
10551055

1056-
1.3. ``Covered Code'' means the Original Code or Modifications or the
1056+
1.3. ``Covered Code'' means the Original Code or Modifications or the
10571057
combination of the Original Code and Modifications, in each case including
10581058
portions thereof.
10591059

@@ -1077,14 +1077,14 @@ Version 1.0
10771077
A. Any addition to or deletion from the contents of a file containing Original
10781078
Code or previous Modifications.
10791079

1080-
B. Any new file that contains any part of the Original Code or previous Modifications.
1080+
B. Any new file that contains any part of the Original Code or previous Modifications.
10811081

10821082
1.10. ``Original Code'' means Source Code of computer software code which is
10831083
described in the Source Code notice required by Exhibit A as Original Code,
10841084
and which, at the time of its release under this License is not already Covered
10851085
Code governed by this License.
10861086

1087-
1.11. ``Source Code'' means the preferred form of the Covered Code for making
1087+
1.11. ``Source Code'' means the preferred form of the Covered Code for making
10881088
modifications to it, including all modules it contains, plus any associated
10891089
interface definition files, scripts used to control compilation and
10901090
installation of an Executable, or a list of source code differential
@@ -1101,7 +1101,7 @@ Version 1.0
11011101
(a) the power, direct or indirect, to cause the direction or management
11021102
of such entity, whether by contract or otherwise, or (b) ownership of
11031103
fifty percent (50%) or more of the outstanding shares or beneficial
1104-
ownership of such entity.
1104+
ownership of such entity.
11051105

11061106
2. Source Code License.
11071107

@@ -1118,7 +1118,7 @@ Version 1.0
11181118
(or portions thereof), but solely to the extent that any such patent
11191119
is reasonably necessary to enable You to Utilize the Original Code
11201120
(or portions thereof) and not to any greater extent that may be necessary
1121-
to Utilize further Modifications or combinations.
1121+
to Utilize further Modifications or combinations.
11221122

11231123
2.2. Contributor Grant.
11241124
Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive
@@ -1134,7 +1134,7 @@ Version 1.0
11341134
to the extent that any such patent is reasonably necessary to enable
11351135
You to Utilize the Contributor Version (or portions thereof), and
11361136
not to any greater extent that may be necessary to Utilize further
1137-
Modifications or combinations.
1137+
Modifications or combinations.
11381138

11391139
3. Distribution Obligations.
11401140

@@ -1189,7 +1189,7 @@ Version 1.0
11891189
(b) Contributor APIs.
11901190
If Your Modification is an application programming interface and You
11911191
own or control patents which are reasonably necessary to implement that
1192-
API, you must also include this information in the LEGAL file.
1192+
API, you must also include this information in the LEGAL file.
11931193

11941194
3.5. Required Notices.
11951195
You must duplicate the notice in Exhibit A in each file of the Source Code,
@@ -1233,7 +1233,7 @@ Version 1.0
12331233
You may create a Larger Work by combining Covered Code with other code not
12341234
governed by the terms of this License and distribute the Larger Work as a
12351235
single product. In such a case, You must make sure the requirements of this
1236-
License are fulfilled for the Covered Code.
1236+
License are fulfilled for the Covered Code.
12371237

12381238
4. Inability to Comply Due to Statute or Regulation.
12391239

@@ -1244,12 +1244,12 @@ Version 1.0
12441244
description must be included in the LEGAL file described in Section 3.4 and
12451245
must be included with all distributions of the Source Code. Except to the
12461246
extent prohibited by statute or regulation, such description must be sufficiently
1247-
detailed for a recipient of ordinary skill to be able to understand it.
1247+
detailed for a recipient of ordinary skill to be able to understand it.
12481248

12491249
5. Application of this License.
12501250

12511251
This License applies to code to which the Initial Developer has attached the
1252-
notice in Exhibit A, and to related Covered Code.
1252+
notice in Exhibit A, and to related Covered Code.
12531253

12541254
6. Versions of the License.
12551255

@@ -1274,11 +1274,11 @@ Version 1.0
12741274
that your version of the license contains terms which differ from the Mozilla
12751275
Public License and Netscape Public License. (Filling in the name of the Initial
12761276
Developer, Original Code or Contributor in the notice described in Exhibit A
1277-
shall not of themselves be deemed to be modifications of this License.)
1277+
shall not of themselves be deemed to be modifications of this License.)
12781278

12791279
7. DISCLAIMER OF WARRANTY.
12801280

1281-
COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT
1281+
COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT
12821282
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
12831283
WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A
12841284
PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND

main/bootstrap.1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
# *************************************************************
2-
#
2+
#
33
# Licensed to the Apache Software Foundation (ASF) under one
44
# or more contributor license agreements. See the NOTICE file
55
# distributed with this work for additional information
66
# regarding copyright ownership. The ASF licenses this file
77
# to you under the Apache License, Version 2.0 (the
88
# "License"); you may not use this file except in compliance
99
# with the License. You may obtain a copy of the License at
10-
#
10+
#
1111
# http://www.apache.org/licenses/LICENSE-2.0
12-
#
12+
#
1313
# Unless required by applicable law or agreed to in writing,
1414
# software distributed under the License is distributed on an
1515
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1616
# KIND, either express or implied. See the License for the
1717
# specific language governing permissions and limitations
1818
# under the License.
19-
#
19+
#
2020
# *************************************************************
2121

2222
if test -z "${SOLARENV}"; then
@@ -37,7 +37,7 @@ unalias nmake
3737
unalias gunzip
3838

3939
# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
40-
# Use spawn instead of fork when building dmake on cygwin.
40+
# Use spawn instead of fork when building dmake on cygwin.
4141
if test "$GUI" = "WNT"; then
4242
EXEEXT=".exe"
4343
else
@@ -47,7 +47,7 @@ export EXEEXT
4747

4848
mkdir -p "$SOLARENV/$INPATH/bin"
4949

50-
#make sure build.pl is executable
50+
#make sure build.pl is executable
5151

5252
chmod +x "$SRC_ROOT/solenv/bin/build.pl"
5353
chmod +x "$SRC_ROOT/solenv/bin/build_client.pl"
@@ -175,7 +175,7 @@ else
175175
echo ""
176176
echo "dmake present in $SOLARENV/$INPATH/bin/dmake$EXEEXT"
177177
fi
178-
178+
179179
fi
180180

181181
# Download missing extensions.

main/nss/readme.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Relation between nss, moz, moz_prebuilt
22
---------------------------------------
33
nss contains the security libraries which are also part of moz. However nss is
4-
meant to be more current, that is, it to be updated more often. This
4+
meant to be more current, that is, it to be updated more often. This
55
should be easier than updating moz.
66

77
When nss is build, it depends on an environment variable (ENABLE_NSS_MODULE)
@@ -26,7 +26,7 @@ Fips 140 mode is not supported. That is, the *.chk files containing the
2626
checksums for the cryptographic module are not delivered into solver and will
2727
not be part of the OOo installation sets.
2828

29-
Signing has been turned off because
29+
Signing has been turned off because
3030
- we change the rpath (install names) after signing which breaks the signatures
3131
(Mac)
3232
- sqlite conflicts with the system sqlite when signing which breaks the build
@@ -36,7 +36,7 @@ libfreebl3
3636
----------
3737
Porting to other platforms may require to deliver other variants of
3838
libfreebl*. The library name varies according to the platform. Changes need to
39-
be made to
39+
be made to
4040
ooo/moz/extractfiles.mk
4141
ooo/moz/zipped/makefile.mk
4242
sun/moz_prebuilt/zipped/makefile.mk
@@ -60,8 +60,8 @@ libsqlite3
6060
The problem described here was found on Mac with OS 10.6
6161
NSS cannot use the system sqlite on Mac because the base line is still MacOS
6262
10.4. That system sqlite is incompatible with the softokn3 in nss which requires
63-
a later version of sqlite.
64-
When we used a more current Mac SDK then we could set
63+
a later version of sqlite.
64+
When we used a more current Mac SDK then we could set
6565
NSS_USE_SYSTEM_SQLITE=1
6666
to build using the system sqlite.
6767

@@ -70,5 +70,5 @@ used by tools of the build environment. Using the sqlite from NSS breaks the
7070
tools if they use system libraries which are linked with the system
7171
sqlite. Therefore we deliver it into lib/sqlite on unix systems.
7272

73-
See also issue
73+
See also issue
7474
http://qa.openoffice.org/issues/show_bug.cgi?id=106132

main/oowintool

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
#!/usr/bin/perl -w
22
# *************************************************************
3-
#
3+
#
44
# Licensed to the Apache Software Foundation (ASF) under one
55
# or more contributor license agreements. See the NOTICE file
66
# distributed with this work for additional information
77
# regarding copyright ownership. The ASF licenses this file
88
# to you under the Apache License, Version 2.0 (the
99
# "License"); you may not use this file except in compliance
1010
# with the License. You may obtain a copy of the License at
11-
#
11+
#
1212
# http://www.apache.org/licenses/LICENSE-2.0
13-
#
13+
#
1414
# Unless required by applicable law or agreed to in writing,
1515
# software distributed under the License is distributed on an
1616
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1717
# KIND, either express or implied. See the License for the
1818
# specific language governing permissions and limitations
1919
# under the License.
20-
#
20+
#
2121
# *************************************************************
2222

2323
use File::Copy;
@@ -62,7 +62,7 @@ sub reg_find_key($)
6262
sub print_syntax()
6363
{
6464
print "oowintool [option] ...\n";
65-
print " encoding options\n";
65+
print " encoding options\n";
6666
print " -w - windows form\n";
6767
print " -u - unix form (default)\n";
6868
print " commands:\n";
@@ -90,7 +90,7 @@ sub cygpath($$$)
9090
$path =~ s|\\*\s*$||;
9191
}
9292

93-
# 'Unterminated quoted string errors' from 'ash' when
93+
# 'Unterminated quoted string errors' from 'ash' when
9494
# forking cygpath so - reimplement cygpath in perl [ gack ]
9595
if ($format eq 'u' && $input_format eq 'w') {
9696
$path =~ s|\\|/|g;
@@ -109,7 +109,7 @@ sub print_path($$)
109109
my ($path, $unix) = @_;
110110

111111
$path = cygpath ($path, $unix, $output_format);
112-
112+
113113
print $path;
114114
}
115115

@@ -275,7 +275,7 @@ sub print_csc_compiler_dir()
275275

276276
sub print_dotnetsdk_dir()
277277
{
278-
my $dir =
278+
my $dir =
279279
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1") ||
280280
reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0");
281281
defined $dir || exit 1;
@@ -332,11 +332,11 @@ sub msvc_find_version($)
332332
{
333333
my $checkpath = shift;
334334
my $ver = find_msvc();
335-
my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
335+
my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
336336
$ver->{$checkpath});
337337
-d $srcdir && return $ver;
338338
$ver = find_msvs();
339-
$srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
339+
$srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
340340
$ver->{$checkpath});
341341
-d $srcdir && return $ver;
342342
return undef;
@@ -347,7 +347,7 @@ sub msvc_copy_dlls($)
347347
my $dest = shift;
348348
my $ver = msvc_find_version('dll_path');
349349
defined $ver || return;
350-
my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
350+
my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
351351
$ver->{'dll_path'});
352352

353353
copy_dll ($srcdir, "msvcp" . $ver->{'dll_suffix'} . ".dll",
@@ -370,7 +370,7 @@ my @commands = ();
370370
my $opt;
371371
while (@ARGV) {
372372
$opt = shift @ARGV;
373-
373+
374374
if ($opt eq '-w' || $opt eq '-u') {
375375
$output_format = substr($opt, 1, 1);
376376
} else {

test/run

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
#! /bin/sh
22
#**************************************************************
3-
#
3+
#
44
# Licensed to the Apache Software Foundation (ASF) under one
55
# or more contributor license agreements. See the NOTICE file
66
# distributed with this work for additional information
77
# regarding copyright ownership. The ASF licenses this file
88
# to you under the Apache License, Version 2.0 (the
99
# "License"); you may not use this file except in compliance
1010
# with the License. You may obtain a copy of the License at
11-
#
11+
#
1212
# http://www.apache.org/licenses/LICENSE-2.0
13-
#
13+
#
1414
# Unless required by applicable law or agreed to in writing,
1515
# software distributed under the License is distributed on an
1616
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1717
# KIND, either express or implied. See the License for the
1818
# specific language governing permissions and limitations
1919
# under the License.
20-
#
20+
#
2121
#**************************************************************
2222

2323
. /etc/profile

test/testcommon/readme.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#**************************************************************
2-
#
2+
#
33
# Licensed to the Apache Software Foundation (ASF) under one
44
# or more contributor license agreements. See the NOTICE file
55
# distributed with this work for additional information
66
# regarding copyright ownership. The ASF licenses this file
77
# to you under the Apache License, Version 2.0 (the
88
# "License"); you may not use this file except in compliance
99
# with the License. You may obtain a copy of the License at
10-
#
10+
#
1111
# http://www.apache.org/licenses/LICENSE-2.0
12-
#
12+
#
1313
# Unless required by applicable law or agreed to in writing,
1414
# software distributed under the License is distributed on an
1515
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1616
# KIND, either express or implied. See the License for the
1717
# specific language governing permissions and limitations
1818
# under the License.
19-
#
19+
#
2020
#**************************************************************
2121

2222
1. Java utilities to facilitate testing OpenOffice. e.g. file operation, graphics analysis and so on.

test/testgui/readme.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#**************************************************************
2-
#
2+
#
33
# Licensed to the Apache Software Foundation (ASF) under one
44
# or more contributor license agreements. See the NOTICE file
55
# distributed with this work for additional information
66
# regarding copyright ownership. The ASF licenses this file
77
# to you under the Apache License, Version 2.0 (the
88
# "License"); you may not use this file except in compliance
99
# with the License. You may obtain a copy of the License at
10-
#
10+
#
1111
# http://www.apache.org/licenses/LICENSE-2.0
12-
#
12+
#
1313
# Unless required by applicable law or agreed to in writing,
1414
# software distributed under the License is distributed on an
1515
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1616
# KIND, either express or implied. See the License for the
1717
# specific language governing permissions and limitations
1818
# under the License.
19-
#
19+
#
2020
#**************************************************************
2121

2222
The module stores GUI testing scripts. It's an eclipse project. Setup the project with the following steps:

0 commit comments

Comments
 (0)