This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new be6777fc34 misc: remove trailing whitespace (#465)
be6777fc34 is described below
commit be6777fc34cedce7d07b0d5126906a83db8cf3b1
Author: John Bampton <[email protected]>
AuthorDate: Sun Jan 25 20:38:06 2026 +1000
misc: remove trailing whitespace (#465)
General find and repalce clean up
---
main/LICENSE_category_b | 28 ++++++++++++++--------------
main/bootstrap.1 | 14 +++++++-------
main/nss/readme.txt | 12 ++++++------
main/oowintool | 24 ++++++++++++------------
test/README.md | 2 +-
test/run | 8 ++++----
test/testcommon/readme.txt | 8 ++++----
test/testgui/readme.txt | 8 ++++----
8 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/main/LICENSE_category_b b/main/LICENSE_category_b
index 41eec8ed6c..5603eeb568 100644
--- a/main/LICENSE_category_b
+++ b/main/LICENSE_category_b
@@ -635,7 +635,7 @@ Mozilla Public License Version 2.0
means any form of the work other than Source Code Form.
1.7. "Larger Work"
- means a work that combines Covered Software with other material, in
+ means a work that combines Covered Software with other material, in
a separate file or files, that is not Covered Software.
1.8. "License"
@@ -1019,7 +1019,7 @@ nished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
-Portions of the Software were created using source code and/or APIs
+Portions of the Software were created using source code and/or APIs
governed by the Mozilla Public License (MPL). The MPL is available
at http://www.mozilla.org/MPL/MPL-1.1.html. The MPL permits such
portions to be distributed with code not governed by MPL, as long
@@ -1053,7 +1053,7 @@ Version 1.0
Modifications used by a Contributor, and the Modifications made by
that
particular Contributor.
- 1.3. ``Covered Code'' means the Original Code or Modifications or the
+ 1.3. ``Covered Code'' means the Original Code or Modifications or the
combination of the Original Code and Modifications, in each case
including
portions thereof.
@@ -1077,14 +1077,14 @@ Version 1.0
A. Any addition to or deletion from the contents of a file containing
Original
Code or previous Modifications.
- B. Any new file that contains any part of the Original Code or
previous Modifications.
+ B. Any new file that contains any part of the Original Code or
previous Modifications.
1.10. ``Original Code'' means Source Code of computer software code which
is
described in the Source Code notice required by Exhibit A as
Original Code,
and which, at the time of its release under this License is not
already Covered
Code governed by this License.
- 1.11. ``Source Code'' means the preferred form of the Covered Code for
making
+ 1.11. ``Source Code'' means the preferred form of the Covered Code for
making
modifications to it, including all modules it contains, plus any
associated
interface definition files, scripts used to control compilation and
installation of an Executable, or a list of source code differential
@@ -1101,7 +1101,7 @@ Version 1.0
(a) the power, direct or indirect, to cause the direction or
management
of such entity, whether by contract or otherwise, or (b) ownership of
fifty percent (50%) or more of the outstanding shares or beneficial
- ownership of such entity.
+ ownership of such entity.
2. Source Code License.
@@ -1118,7 +1118,7 @@ Version 1.0
(or portions thereof), but solely to the extent that any such
patent
is reasonably necessary to enable You to Utilize the Original Code
(or portions thereof) and not to any greater extent that may be
necessary
- to Utilize further Modifications or combinations.
+ to Utilize further Modifications or combinations.
2.2. Contributor Grant.
Each Contributor hereby grants You a world-wide, royalty-free,
non-exclusive
@@ -1134,7 +1134,7 @@ Version 1.0
to the extent that any such patent is reasonably necessary to
enable
You to Utilize the Contributor Version (or portions thereof), and
not to any greater extent that may be necessary to Utilize further
- Modifications or combinations.
+ Modifications or combinations.
3. Distribution Obligations.
@@ -1189,7 +1189,7 @@ Version 1.0
(b) Contributor APIs.
If Your Modification is an application programming interface and You
own or control patents which are reasonably necessary to implement that
- API, you must also include this information in the LEGAL file.
+ API, you must also include this information in the LEGAL file.
3.5. Required Notices.
You must duplicate the notice in Exhibit A in each file of the Source Code,
@@ -1233,7 +1233,7 @@ Version 1.0
You may create a Larger Work by combining Covered Code with other code not
governed by the terms of this License and distribute the Larger Work as a
single product. In such a case, You must make sure the requirements of this
- License are fulfilled for the Covered Code.
+ License are fulfilled for the Covered Code.
4. Inability to Comply Due to Statute or Regulation.
@@ -1244,12 +1244,12 @@ Version 1.0
description must be included in the LEGAL file described in Section 3.4 and
must be included with all distributions of the Source Code. Except to the
extent prohibited by statute or regulation, such description must be
sufficiently
- detailed for a recipient of ordinary skill to be able to understand it.
+ detailed for a recipient of ordinary skill to be able to understand it.
5. Application of this License.
This License applies to code to which the Initial Developer has attached
the
- notice in Exhibit A, and to related Covered Code.
+ notice in Exhibit A, and to related Covered Code.
6. Versions of the License.
@@ -1274,11 +1274,11 @@ Version 1.0
that your version of the license contains terms which differ from the
Mozilla
Public License and Netscape Public License. (Filling in the name of the
Initial
Developer, Original Code or Contributor in the notice described in Exhibit
A
- shall not of themselves be deemed to be modifications of this License.)
+ shall not of themselves be deemed to be modifications of this License.)
7. DISCLAIMER OF WARRANTY.
- COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT
+ COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
LIMITATION,
WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR
A
PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
diff --git a/main/bootstrap.1 b/main/bootstrap.1
index 127a703b0f..cdc909ece5 100644
--- a/main/bootstrap.1
+++ b/main/bootstrap.1
@@ -1,5 +1,5 @@
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
if test -z "${SOLARENV}"; then
@@ -37,7 +37,7 @@ unalias nmake
unalias gunzip
# executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x
-# Use spawn instead of fork when building dmake on cygwin.
+# Use spawn instead of fork when building dmake on cygwin.
if test "$GUI" = "WNT"; then
EXEEXT=".exe"
else
@@ -47,7 +47,7 @@ export EXEEXT
mkdir -p "$SOLARENV/$INPATH/bin"
-#make sure build.pl is executable
+#make sure build.pl is executable
chmod +x "$SRC_ROOT/solenv/bin/build.pl"
chmod +x "$SRC_ROOT/solenv/bin/build_client.pl"
@@ -175,7 +175,7 @@ else
echo ""
echo "dmake present in $SOLARENV/$INPATH/bin/dmake$EXEEXT"
fi
-
+
fi
# Download missing extensions.
diff --git a/main/nss/readme.txt b/main/nss/readme.txt
index 24c29e1136..4a34aa5433 100644
--- a/main/nss/readme.txt
+++ b/main/nss/readme.txt
@@ -1,7 +1,7 @@
Relation between nss, moz, moz_prebuilt
---------------------------------------
nss contains the security libraries which are also part of moz. However nss is
-meant to be more current, that is, it to be updated more often. This
+meant to be more current, that is, it to be updated more often. This
should be easier than updating moz.
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
checksums for the cryptographic module are not delivered into solver and will
not be part of the OOo installation sets.
-Signing has been turned off because
+Signing has been turned off because
- we change the rpath (install names) after signing which breaks the signatures
(Mac)
- sqlite conflicts with the system sqlite when signing which breaks the build
@@ -36,7 +36,7 @@ libfreebl3
----------
Porting to other platforms may require to deliver other variants of
libfreebl*. The library name varies according to the platform. Changes need to
-be made to
+be made to
ooo/moz/extractfiles.mk
ooo/moz/zipped/makefile.mk
sun/moz_prebuilt/zipped/makefile.mk
@@ -60,8 +60,8 @@ libsqlite3
The problem described here was found on Mac with OS 10.6
NSS cannot use the system sqlite on Mac because the base line is still MacOS
10.4. That system sqlite is incompatible with the softokn3 in nss which
requires
-a later version of sqlite.
-When we used a more current Mac SDK then we could set
+a later version of sqlite.
+When we used a more current Mac SDK then we could set
NSS_USE_SYSTEM_SQLITE=1
to build using the system sqlite.
@@ -70,5 +70,5 @@ used by tools of the build environment. Using the sqlite from
NSS breaks the
tools if they use system libraries which are linked with the system
sqlite. Therefore we deliver it into lib/sqlite on unix systems.
-See also issue
+See also issue
http://qa.openoffice.org/issues/show_bug.cgi?id=106132
diff --git a/main/oowintool b/main/oowintool
index 72c5eada14..d835ea2e87 100755
--- a/main/oowintool
+++ b/main/oowintool
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
# *************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
# *************************************************************
use File::Copy;
@@ -62,7 +62,7 @@ sub reg_find_key($)
sub print_syntax()
{
print "oowintool [option] ...\n";
- print " encoding options\n";
+ print " encoding options\n";
print " -w - windows form\n";
print " -u - unix form (default)\n";
print " commands:\n";
@@ -90,7 +90,7 @@ sub cygpath($$$)
$path =~ s|\\*\s*$||;
}
- # 'Unterminated quoted string errors' from 'ash' when
+ # 'Unterminated quoted string errors' from 'ash' when
# forking cygpath so - reimplement cygpath in perl [ gack ]
if ($format eq 'u' && $input_format eq 'w') {
$path =~ s|\\|/|g;
@@ -109,7 +109,7 @@ sub print_path($$)
my ($path, $unix) = @_;
$path = cygpath ($path, $unix, $output_format);
-
+
print $path;
}
@@ -275,7 +275,7 @@ sub print_csc_compiler_dir()
sub print_dotnetsdk_dir()
{
- my $dir =
+ my $dir =
reg_get_value
("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv1.1") ||
reg_get_value
("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/sdkInstallRootv2.0");
defined $dir || exit 1;
@@ -332,11 +332,11 @@ sub msvc_find_version($)
{
my $checkpath = shift;
my $ver = find_msvc();
- my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
+ my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
$ver->{$checkpath});
-d $srcdir && return $ver;
$ver = find_msvs();
- $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
+ $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
$ver->{$checkpath});
-d $srcdir && return $ver;
return undef;
@@ -347,7 +347,7 @@ sub msvc_copy_dlls($)
my $dest = shift;
my $ver = msvc_find_version('dll_path');
defined $ver || return;
- my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
+ my $srcdir = (cygpath ($ver->{'product_dir'}, 'w', 'u') . '/' .
$ver->{'dll_path'});
copy_dll ($srcdir, "msvcp" . $ver->{'dll_suffix'} . ".dll",
@@ -370,7 +370,7 @@ my @commands = ();
my $opt;
while (@ARGV) {
$opt = shift @ARGV;
-
+
if ($opt eq '-w' || $opt eq '-u') {
$output_format = substr($opt, 1, 1);
} else {
diff --git a/test/README.md b/test/README.md
index aab72b4e8e..c493ff7b1d 100644
--- a/test/README.md
+++ b/test/README.md
@@ -21,7 +21,7 @@
Apache OpenOffice contains automated test suites that can be ran against the
office. The test framework is written in **Java** and based on **JUnit 4**.
-This **trunk** branch is now the primary test suite for the **AOO41X** and
**AOO42X** branches as well and those branches may not contain the latest tests
or modifications.
+This **trunk** branch is now the primary test suite for the **AOO41X** and
**AOO42X** branches as well and those branches may not contain the latest tests
or modifications.
The test suite in main branches **AOO41X** and **AOO42X** can be ran against a
normal installation of the office or a just built "installed" office.
diff --git a/test/run b/test/run
index ed5bc43d00..595434b1ad 100755
--- a/test/run
+++ b/test/run
@@ -1,6 +1,6 @@
#! /bin/sh
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -8,16 +8,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
. /etc/profile
diff --git a/test/testcommon/readme.txt b/test/testcommon/readme.txt
index e26a661add..4b7891a355 100644
--- a/test/testcommon/readme.txt
+++ b/test/testcommon/readme.txt
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
1. Java utilities to facilitate testing OpenOffice. e.g. file operation,
graphics analysis and so on.
diff --git a/test/testgui/readme.txt b/test/testgui/readme.txt
index 63be5895ed..f5812829f8 100644
--- a/test/testgui/readme.txt
+++ b/test/testgui/readme.txt
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
The module stores GUI testing scripts. It's an eclipse project. Setup the
project with the following steps:
