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 a16a95f039 pre-commit clean up for ASP and PHP files (#340)
a16a95f039 is described below
commit a16a95f0391cc5722d2339c1ed8f453b4d418cdd
Author: John Bampton <[email protected]>
AuthorDate: Sun Mar 30 22:46:14 2025 +1000
pre-commit clean up for ASP and PHP files (#340)
Enforce 3 hooks:
- end-of-file-fixer
- mixed-line-ending
- trailing-whitespace
---
.pre-commit-config.yaml | 6 +++---
.../industrial/res/commandimagelist/frobnicate-icons.php | 12 ++++++------
main/sd/res/webview/edit.asp | 8 ++++----
main/sd/res/webview/editpic.asp | 8 ++++----
main/sd/res/webview/poll.asp | 8 ++++----
main/sd/res/webview/savepic.asp | 8 ++++----
main/sd/res/webview/show.asp | 8 ++++----
main/sd/res/webview/webview.asp | 8 ++++----
8 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5c5d5badc3..fea1da0c22 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -33,12 +33,12 @@ repos:
- id: check-merge-conflict
- id: check-vcs-permalinks
- id: end-of-file-fixer
- files:
(m|M)akefile$|\.(bat|c|cxx|dxp|h|hrc|hxx|idl|in|ini|java|md|mk|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xsd|xslt?|ya?ml)$|^ext_libraries/.*$|^test/.*$
+ files:
(m|M)akefile$|\.(asp|bat|c|cxx|dxp|h|hrc|hxx|idl|in|ini|java|md|mk|php|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xsd|xslt?|ya?ml)$|^ext_libraries/.*$|^test/.*$
- id: fix-byte-order-marker
- id: mixed-line-ending
- files:
^main/.*\.(c|h)xx$|^main/.*\.java$|\.(c|dxp|h|hrc|idl|in|ini|md|mk|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xsd|xslt?|ya?ml)$|^main/accessibility/.*$|^main/afms/.*$|^main/animations/.*$|^main/apache-commons/.*$
+ files:
^main/.*\.(c|h)xx$|^main/.*\.java$|\.(asp|c|dxp|h|hrc|idl|in|ini|md|mk|php|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xsd|xslt?|ya?ml)$|^main/accessibility/.*$|^main/afms/.*$|^main/animations/.*$|^main/apache-commons/.*$
- id: trailing-whitespace
- files: \.(bat|ini|pl|rc|sh|xcs|xdl|xmi|xsd|ya?ml)$
+ files: \.(asp|bat|ini|php|pl|rc|sh|xcs|xdl|xmi|xsd|ya?ml)$
- repo: https://github.com/codespell-project/codespell
rev: v2.4.1
hooks:
diff --git
a/main/ooo_custom_images/industrial/res/commandimagelist/frobnicate-icons.php
b/main/ooo_custom_images/industrial/res/commandimagelist/frobnicate-icons.php
index 95b22b7aad..94c141c4d7 100755
---
a/main/ooo_custom_images/industrial/res/commandimagelist/frobnicate-icons.php
+++
b/main/ooo_custom_images/industrial/res/commandimagelist/frobnicate-icons.php
@@ -1,7 +1,7 @@
-#!/usr/bin/php4
+#!/usr/bin/php4
<?php
/**************************************************************
- *
+ *
* 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
@@ -9,16 +9,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.
- *
+ *
*************************************************************/
#$renderer = "rsvg";
$renderer = "inkscape";
@@ -39,7 +39,7 @@ echo "* rendering PNGs\n\n";
foreach ($svgs as $line) {
if ($line) {
$file = eregi_replace("^./lc_(.*)\.svg","\\1",$line);
- //echo "\n" . $file . "\n\n";
+ //echo "\n" . $file . "\n\n";
foreach ($render_sizes as $size => $prefix) {
$SVG = "lc_$file.svg";
$PNG = "$prefix$file.png";
diff --git a/main/sd/res/webview/edit.asp b/main/sd/res/webview/edit.asp
index 9ef1021019..d7c2331450 100755
--- a/main/sd/res/webview/edit.asp
+++ b/main/sd/res/webview/edit.asp
@@ -1,6 +1,6 @@
<HTML>
<!--***********************************************************
- *
+ *
* 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.
- *
+ *
***********************************************************-->
<HEAD>
<TITLE>$$1</TITLE>
diff --git a/main/sd/res/webview/editpic.asp b/main/sd/res/webview/editpic.asp
index e0fefd35e7..c00fa83298 100755
--- a/main/sd/res/webview/editpic.asp
+++ b/main/sd/res/webview/editpic.asp
@@ -4,7 +4,7 @@
Response.Buffer = True
%>
<!--***********************************************************
- *
+ *
* 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
@@ -12,16 +12,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.
- *
+ *
***********************************************************-->
<!-- #include file = "common.inc" -->
diff --git a/main/sd/res/webview/poll.asp b/main/sd/res/webview/poll.asp
index ded4e989df..220d55c132 100755
--- a/main/sd/res/webview/poll.asp
+++ b/main/sd/res/webview/poll.asp
@@ -3,7 +3,7 @@
Response.Expires = 0
%>
<!--***********************************************************
- *
+ *
* 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
@@ -11,16 +11,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.
- *
+ *
***********************************************************-->
<!-- #include file = "common.inc" -->
diff --git a/main/sd/res/webview/savepic.asp b/main/sd/res/webview/savepic.asp
index 6a04e62ca9..670ff58bae 100755
--- a/main/sd/res/webview/savepic.asp
+++ b/main/sd/res/webview/savepic.asp
@@ -4,7 +4,7 @@
Response.Buffer = True
%>
<!--***********************************************************
- *
+ *
* 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
@@ -12,16 +12,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.
- *
+ *
***********************************************************-->
<!-- #include file = "common.inc" -->
diff --git a/main/sd/res/webview/show.asp b/main/sd/res/webview/show.asp
index 4ca7528b30..ec72f28deb 100755
--- a/main/sd/res/webview/show.asp
+++ b/main/sd/res/webview/show.asp
@@ -3,7 +3,7 @@
Response.Expires = 0
%>
<!--***********************************************************
- *
+ *
* 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
@@ -11,16 +11,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.
- *
+ *
***********************************************************-->
<!-- #include file = "common.inc" -->
diff --git a/main/sd/res/webview/webview.asp b/main/sd/res/webview/webview.asp
index f0b3b70596..7d9286e827 100755
--- a/main/sd/res/webview/webview.asp
+++ b/main/sd/res/webview/webview.asp
@@ -3,7 +3,7 @@
Response.Expires = 0
%>
<!--***********************************************************
- *
+ *
* 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
@@ -11,16 +11,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.
- *
+ *
***********************************************************-->
<!-- #include file = "common.inc" -->
