From cf1717097091a5005a57be4a8025ab2cafd25bc7 Mon Sep 17 00:00:00 2001 From: John Bampton Date: Sun, 25 Jan 2026 04:16:54 +1000 Subject: [PATCH] pre-commit whitespace clean up for dtd files Enforced 3 hooks for dtd files: - end-of-file-fixer - mixed-line-ending - trailing-whitespace --- .pre-commit-config.yaml | 6 +++--- main/framework/dtd/accelerator.dtd | 8 ++++---- main/framework/dtd/event.dtd | 8 ++++---- main/framework/dtd/groupuinames.dtd | 11 +++++------ main/framework/dtd/image.dtd | 8 ++++---- main/framework/dtd/menubar.dtd | 8 ++++---- main/framework/dtd/statusbar.dtd | 8 ++++---- main/framework/dtd/toolbar.dtd | 8 ++++---- main/helpauthoring/filter/xmlhelp.dtd | 10 +++++----- main/helpcontent2/helpers/xmlhelp.dtd | 10 +++++----- main/i18npool/source/localedata/data/locale.dtd | 8 ++++---- .../sun/star/tooling/converter/dtd/xliff.dtd | 17 +++++++---------- .../src/resources/analysis.dtd | 10 ++++------ main/officecfg/registry/component-schema.dtd | 8 ++++---- main/officecfg/registry/component-update.dtd | 8 ++++---- main/officecfg/registry/data.dtd | 8 ++++---- main/package/dtd/Manifest.dtd | 15 +++++++-------- main/readlicense_oo/docs/readme.dtd | 8 ++++---- main/stoc/source/module-description.dtd | 12 ++++++------ main/xmerge/java/xmerge/converter.dtd | 15 +++++++-------- .../results/baseline/xml-base/Blocklist.dtd | 10 +++++----- .../results/baseline/xml-base/office.dtd | 8 ++++---- .../palmtests/qa/comparator/dtd/Blocklist.dtd | 10 +++++----- .../palmtests/qa/comparator/dtd/office.dtd | 8 ++++---- main/xmloff/dtd/Blocklist.dtd | 10 +++++----- main/xmlscript/dtd/dialog.dtd | 16 ++++++++-------- main/xmlscript/dtd/libraries.dtd | 15 +++++++-------- main/xmlscript/dtd/library.dtd | 15 +++++++-------- main/xmlscript/dtd/module.dtd | 9 ++++----- 29 files changed, 142 insertions(+), 153 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0ffff867376..d07e465d641 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -56,15 +56,15 @@ repos: description: ensures that links to vcs websites are permalinks - id: end-of-file-fixer description: makes sure files end in a newline and only a newline - files: (m|M)akefile$|\.(asm|asp|bas|bat|c|cl|cmd|common|component|cpp|cxx|dxp|el|h|hrc|hxx|idl|in|ini|java|js|lst|m|m4|map|md|mk|mm|mod|pas|php|pl|pm|pmk|py|rc|rdf|rng|sdi|sh|src|ulf|vbs|xba|xcs|xcu|xdl|xhp|xlb|xmi|xml|xsd|xslt?|ya?ml)$|^ext_libraries/.*$|^test/.*$ + files: (m|M)akefile$|\.(asm|asp|bas|bat|c|cl|cmd|common|component|cpp|cxx|dtd|dxp|el|h|hrc|hxx|idl|in|ini|java|js|lst|m|m4|map|md|mk|mm|mod|pas|php|pl|pm|pmk|py|rc|rdf|rng|sdi|sh|src|ulf|vbs|xba|xcs|xcu|xdl|xhp|xlb|xmi|xml|xsd|xslt?|ya?ml)$|^ext_libraries/.*$|^test/.*$ - id: fix-byte-order-marker description: removes UTF-8 byte order marker - id: mixed-line-ending description: replaces or checks mixed line ending - files: \.(asm|asp|bas|c|cl|cmd|common|component|cpp|cxx|dxp|el|h|hrc|hxx|idl|in|ini|java|js|lst|m|m4|map|md|mk|mm|mod|pas|php|pl|pm|pmk|py|rc|rdf|rng|sdi|sh|src|ulf|vbs|xba|xcs|xcu|xdl|xhp|xlb|xmi|xsd|xslt?|ya?ml)$|^main/accessibility/.*$|^main/afms/.*$|^main/animations/.*$|^main/apache-commons/.*$|^test/testgui/.*$ + files: \.(asm|asp|bas|c|cl|cmd|common|component|cpp|cxx|dtd|dxp|el|h|hrc|hxx|idl|in|ini|java|js|lst|m|m4|map|md|mk|mm|mod|pas|php|pl|pm|pmk|py|rc|rdf|rng|sdi|sh|src|ulf|vbs|xba|xcs|xcu|xdl|xhp|xlb|xmi|xsd|xslt?|ya?ml)$|^main/accessibility/.*$|^main/afms/.*$|^main/animations/.*$|^main/apache-commons/.*$|^test/testgui/.*$ - id: trailing-whitespace description: trims trailing whitespace - files: (m|M)akefile$|\.(asm|asp|bas|bat|c|cl|cmd|common|component|cpp|cxx|dxp|el|h|hrc|hxx|idl|in|ini|java|js|lst|m|m4|map|md|mk|mm|mod|pas|php|pl|pm|pmk|py|rc|rdf|rng|sdi|sh|src|ulf|vbs|xba|xcs|xcu|xdl|xhp|xlb|xmi|xml|xsd|ya?ml)$ + files: (m|M)akefile$|\.(asm|asp|bas|bat|c|cl|cmd|common|component|cpp|cxx|dtd|dxp|el|h|hrc|hxx|idl|in|ini|java|js|lst|m|m4|map|md|mk|mm|mod|pas|php|pl|pm|pmk|py|rc|rdf|rng|sdi|sh|src|ulf|vbs|xba|xcs|xcu|xdl|xhp|xlb|xmi|xml|xsd|ya?ml)$ args: [--markdown-linebreak-ext=md] - repo: https://github.com/codespell-project/codespell rev: v2.4.1 diff --git a/main/framework/dtd/accelerator.dtd b/main/framework/dtd/accelerator.dtd index 35048e43483..b9b7fdd374b 100644 --- a/main/framework/dtd/accelerator.dtd +++ b/main/framework/dtd/accelerator.dtd @@ -1,6 +1,6 @@ diff --git a/main/framework/dtd/event.dtd b/main/framework/dtd/event.dtd index a0d495b77d3..69ab106569d 100644 --- a/main/framework/dtd/event.dtd +++ b/main/framework/dtd/event.dtd @@ -1,6 +1,6 @@ diff --git a/main/framework/dtd/groupuinames.dtd b/main/framework/dtd/groupuinames.dtd index b28c5b841f9..7623989bd11 100644 --- a/main/framework/dtd/groupuinames.dtd +++ b/main/framework/dtd/groupuinames.dtd @@ -1,5 +1,5 @@ - + - diff --git a/main/framework/dtd/image.dtd b/main/framework/dtd/image.dtd index 6a261f11673..43fbd22e782 100644 --- a/main/framework/dtd/image.dtd +++ b/main/framework/dtd/image.dtd @@ -1,6 +1,6 @@ diff --git a/main/framework/dtd/menubar.dtd b/main/framework/dtd/menubar.dtd index cb05b09f745..00972e0e8c5 100644 --- a/main/framework/dtd/menubar.dtd +++ b/main/framework/dtd/menubar.dtd @@ -1,6 +1,6 @@ diff --git a/main/framework/dtd/statusbar.dtd b/main/framework/dtd/statusbar.dtd index 80f274d2c29..ca89227cd48 100644 --- a/main/framework/dtd/statusbar.dtd +++ b/main/framework/dtd/statusbar.dtd @@ -1,6 +1,6 @@ diff --git a/main/framework/dtd/toolbar.dtd b/main/framework/dtd/toolbar.dtd index ef70dc80b12..425d187b6ba 100644 --- a/main/framework/dtd/toolbar.dtd +++ b/main/framework/dtd/toolbar.dtd @@ -1,6 +1,6 @@ diff --git a/main/helpauthoring/filter/xmlhelp.dtd b/main/helpauthoring/filter/xmlhelp.dtd index be5b3b50909..fb006d62be4 100644 --- a/main/helpauthoring/filter/xmlhelp.dtd +++ b/main/helpauthoring/filter/xmlhelp.dtd @@ -1,5 +1,5 @@ - diff --git a/main/helpcontent2/helpers/xmlhelp.dtd b/main/helpcontent2/helpers/xmlhelp.dtd index be5b3b50909..fb006d62be4 100644 --- a/main/helpcontent2/helpers/xmlhelp.dtd +++ b/main/helpcontent2/helpers/xmlhelp.dtd @@ -1,5 +1,5 @@ - diff --git a/main/i18npool/source/localedata/data/locale.dtd b/main/i18npool/source/localedata/data/locale.dtd index 7dfed04d922..4cdcccb9c76 100644 --- a/main/i18npool/source/localedata/data/locale.dtd +++ b/main/i18npool/source/localedata/data/locale.dtd @@ -1,6 +1,6 @@ diff --git a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd index 40e795f7b44..de73c92ce01 100644 --- a/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd +++ b/main/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd @@ -2,7 +2,7 @@ Public Identifier: "-//XLIFF//DTD XLIFF//EN" - + 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 @@ -10,16 +10,16 @@ Public Identifier: "-//XLIFF//DTD XLIFF//EN" 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. - + History of modifications (latest first): @@ -33,7 +33,7 @@ Apr-19-2001 by YS: Enda+JohnR last changes Apr-18-2001 by YS: Removed empty ATTLISTs Apr-12-2001 by YS: Changed target* to target+ in trans-match Apr-11-2001 by YS: Fixed DOCTYPE id -Apr-10-2001 by YS: Synchronize from conference call +Apr-10-2001 by YS: Synchronize from conference call Apr-05-2001 by YS: Synchronize with latest specs Apr-04-2001 by YS: Synchronize with latest specs Apr-03-2001 by YS: Added name in @@ -148,7 +148,7 @@ displayed to the end-user. -Indicates that any element with a context-type set to 'value' should +Indicates that any element with a context-type set to 'value' should be displayed to the end-user. --> @@ -393,7 +393,7 @@ be displayed to the end-user. @@ -406,6 +406,3 @@ be displayed to the end-user. - - - diff --git a/main/migrationanalysis/src/resources/analysis.dtd b/main/migrationanalysis/src/resources/analysis.dtd index 7c16bf8fd7d..706ed2ae5c6 100644 --- a/main/migrationanalysis/src/resources/analysis.dtd +++ b/main/migrationanalysis/src/resources/analysis.dtd @@ -1,5 +1,5 @@ @@ -68,5 +68,3 @@ - - diff --git a/main/officecfg/registry/component-schema.dtd b/main/officecfg/registry/component-schema.dtd index 56ca1110cc1..3e33404021c 100644 --- a/main/officecfg/registry/component-schema.dtd +++ b/main/officecfg/registry/component-schema.dtd @@ -1,6 +1,6 @@ diff --git a/main/officecfg/registry/component-update.dtd b/main/officecfg/registry/component-update.dtd index bd65674aad6..02361e70810 100644 --- a/main/officecfg/registry/component-update.dtd +++ b/main/officecfg/registry/component-update.dtd @@ -1,6 +1,6 @@ diff --git a/main/officecfg/registry/data.dtd b/main/officecfg/registry/data.dtd index ef2912dcfbc..4ef41523473 100644 --- a/main/officecfg/registry/data.dtd +++ b/main/officecfg/registry/data.dtd @@ -1,6 +1,6 @@ diff --git a/main/package/dtd/Manifest.dtd b/main/package/dtd/Manifest.dtd index a3ffcd62f94..e23a481b235 100644 --- a/main/package/dtd/Manifest.dtd +++ b/main/package/dtd/Manifest.dtd @@ -1,5 +1,5 @@ - + @@ -36,7 +36,7 @@ manifest:checksum-type CDATA #REQUIRED manifest:checksum CDATA #REQUIRED > - diff --git a/main/readlicense_oo/docs/readme.dtd b/main/readlicense_oo/docs/readme.dtd index 9b7a3b45877..79d4c8bd2ae 100644 --- a/main/readlicense_oo/docs/readme.dtd +++ b/main/readlicense_oo/docs/readme.dtd @@ -1,5 +1,5 @@ @@ -31,9 +31,9 @@ - diff --git a/main/xmerge/java/xmerge/converter.dtd b/main/xmerge/java/xmerge/converter.dtd index 3e7d669be31..cf70ad79fa6 100644 --- a/main/xmerge/java/xmerge/converter.dtd +++ b/main/xmerge/java/xmerge/converter.dtd @@ -1,5 +1,5 @@ @@ -48,7 +48,7 @@ contains only a "type" element. This "type" element specifies the convert-to mime-type. - + Each converter node may contain these child nodes: converter-description - Descriptive description of the plug-in. converter-vendor - Plug-in vendor name @@ -63,9 +63,9 @@ exist if the xslt plugin implementation is to be used. It is assumed that the plug-in specified via converter-class-impl - will make use of this value. + will make use of this value. --> - + - diff --git a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/Blocklist.dtd b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/Blocklist.dtd index a50495be981..80e5577cac5 100644 --- a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/Blocklist.dtd +++ b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/Blocklist.dtd @@ -1,5 +1,5 @@ @@ -24,7 +24,7 @@ - diff --git a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/office.dtd b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/office.dtd index c5ffbd7c872..2eb8559095c 100644 --- a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/office.dtd +++ b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/office.dtd @@ -1,6 +1,6 @@ diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/Blocklist.dtd b/main/xmerge/source/palmtests/qa/comparator/dtd/Blocklist.dtd index a50495be981..80e5577cac5 100644 --- a/main/xmerge/source/palmtests/qa/comparator/dtd/Blocklist.dtd +++ b/main/xmerge/source/palmtests/qa/comparator/dtd/Blocklist.dtd @@ -1,5 +1,5 @@ @@ -24,7 +24,7 @@ - diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/office.dtd b/main/xmerge/source/palmtests/qa/comparator/dtd/office.dtd index c5ffbd7c872..2eb8559095c 100644 --- a/main/xmerge/source/palmtests/qa/comparator/dtd/office.dtd +++ b/main/xmerge/source/palmtests/qa/comparator/dtd/office.dtd @@ -1,6 +1,6 @@ diff --git a/main/xmloff/dtd/Blocklist.dtd b/main/xmloff/dtd/Blocklist.dtd index a50495be981..80e5577cac5 100644 --- a/main/xmloff/dtd/Blocklist.dtd +++ b/main/xmloff/dtd/Blocklist.dtd @@ -1,5 +1,5 @@ @@ -24,7 +24,7 @@ - diff --git a/main/xmlscript/dtd/dialog.dtd b/main/xmlscript/dtd/dialog.dtd index 414521e7ea4..86a962bde46 100644 --- a/main/xmlscript/dtd/dialog.dtd +++ b/main/xmlscript/dtd/dialog.dtd @@ -1,6 +1,6 @@ @@ -132,7 +132,7 @@ dlg:param CDATA #IMPLIED > - + @@ -358,13 +358,13 @@ dlg:readonly %boolean; #IMPLIED dlg:strict-format %boolean; #IMPLIED dlg:maxlength %numeric; #IMPLIED - dlg:spin %boolean; #IMPLIED + dlg:spin %boolean; #IMPLIED dlg:align (left|center|right) #IMPLIED dlg:text CDATA #IMPLIED dlg:value-default CDATA #IMPLIED dlg:value-max %numeric; #IMPLIED dlg:value-min %numeric; #IMPLIED - dlg:value %numeric; #IMPLIED + dlg:value %numeric; #IMPLIED dlg:format-code CDATA #IMPLIED dlg:format-locale CDATA #IMPLIED dlg:repeat %numeric; #IMPLIED diff --git a/main/xmlscript/dtd/libraries.dtd b/main/xmlscript/dtd/libraries.dtd index 9a23148b424..4fc8aa071c9 100644 --- a/main/xmlscript/dtd/libraries.dtd +++ b/main/xmlscript/dtd/libraries.dtd @@ -1,6 +1,6 @@ @@ -25,17 +25,16 @@ - - - diff --git a/main/xmlscript/dtd/library.dtd b/main/xmlscript/dtd/library.dtd index d97bd9f0742..9edfa7a4b16 100644 --- a/main/xmlscript/dtd/library.dtd +++ b/main/xmlscript/dtd/library.dtd @@ -1,6 +1,6 @@ @@ -25,8 +25,8 @@ - - - diff --git a/main/xmlscript/dtd/module.dtd b/main/xmlscript/dtd/module.dtd index 7f9b6967d4d..4cc6628b315 100644 --- a/main/xmlscript/dtd/module.dtd +++ b/main/xmlscript/dtd/module.dtd @@ -1,6 +1,6 @@ @@ -28,4 +28,3 @@ script:name CDATA #REQUIRED script:language CDATA #REQUIRED > -