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 7d1ba2b9ec pre-commit(end-of-file-fixer): auto fix rc files (#289)
7d1ba2b9ec is described below
commit 7d1ba2b9ecc16aaf3cd7daabf79046514f061e8d
Author: John Bampton <[email protected]>
AuthorDate: Mon Feb 17 01:04:02 2025 +1000
pre-commit(end-of-file-fixer): auto fix rc files (#289)
---
.pre-commit-config.yaml | 2 +-
main/desktop/util/ooverinfo.rc | 1 -
main/desktop/util/ooverinfo2.rc | 1 -
main/desktop/win32/source/QuickStart/OOQuickStart.rc | 1 -
main/desktop/win32/source/QuickStart/so/QuickStart.rc | 1 -
main/extensions/source/activex/main/so_activex.rc | 1 -
main/extensions/test/ole/AxTestComponents/AxTestComponents.rc | 1 -
.../test/ole/EventListenerSample/EventListener/EventListener.rc | 1 -
main/extensions/test/ole/MfcControl/MfcControl.rc | 1 -
main/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc | 2 --
main/fpicker/source/win32/filepicker/Fps.rc | 1 -
main/makefile.rc | 1 -
main/odk/examples/OLE/activex/so_activex.rc | 1 -
main/sal/workben/clipboardwben/testcopy/cbcpytest.rc | 1 -
main/sal/workben/clipboardwben/testpaste/cbptest.rc | 1 -
main/sal/workben/clipboardwben/testviewer/cbvtest.rc | 1 -
main/setup_native/source/win32/stwrapper/resource.rc | 1 -
main/vcl/os2/source/src/salsrc.rc | 1 -
main/vcl/win/source/src/salsrc.rc | 1 -
main/winaccessibility/source/UAccCOM/UAccCOM.rc | 1 -
main/xmerge/source/activesync/XMergeSync.rc | 1 -
21 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f0ac5f3a3a..8dd3c093b6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -33,7 +33,7 @@ repos:
- id: check-merge-conflict
- id: check-vcs-permalinks
- id: end-of-file-fixer
- files: \.(bat|c|h|hrc|hxx|idl|java|md|mk|pl|pm|py|sh|ya?ml)$|^test/.*$
+ files:
\.(bat|c|h|hrc|hxx|idl|java|md|mk|pl|pm|py|rc|sh|ya?ml)$|^test/.*$
- id: mixed-line-ending
files: ^main/.*\.(c|h)xx$
- id: trailing-whitespace
diff --git a/main/desktop/util/ooverinfo.rc b/main/desktop/util/ooverinfo.rc
index 756896baad..b6a6f420a4 100644
--- a/main/desktop/util/ooverinfo.rc
+++ b/main/desktop/util/ooverinfo.rc
@@ -131,4 +131,3 @@ VS_VERSION_INFO versioninfo
38 ICON "icons\\database.ico"
39 ICON "icons\\formula.ico"
40 ICON "icons\\oxt-extension.ico"
-
diff --git a/main/desktop/util/ooverinfo2.rc b/main/desktop/util/ooverinfo2.rc
index d8a25e7c41..5ac559e67b 100644
--- a/main/desktop/util/ooverinfo2.rc
+++ b/main/desktop/util/ooverinfo2.rc
@@ -59,4 +59,3 @@ ICON 36 "icons/ooo11-master-doc.ico"
ICON 37 "icons/ooo11-chart-doc.ico"
ICON 38 "icons/ooo11-base-doc.ico"
ICON 39 "icons/ooo11-math-doc.ico"
-
diff --git a/main/desktop/win32/source/QuickStart/OOQuickStart.rc
b/main/desktop/win32/source/QuickStart/OOQuickStart.rc
index 0fd896dcea..21dc357c4e 100644
--- a/main/desktop/win32/source/QuickStart/OOQuickStart.rc
+++ b/main/desktop/win32/source/QuickStart/OOQuickStart.rc
@@ -148,4 +148,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/main/desktop/win32/source/QuickStart/so/QuickStart.rc
b/main/desktop/win32/source/QuickStart/so/QuickStart.rc
index aafd15f2e0..afcde7e53f 100644
--- a/main/desktop/win32/source/QuickStart/so/QuickStart.rc
+++ b/main/desktop/win32/source/QuickStart/so/QuickStart.rc
@@ -148,4 +148,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/main/extensions/source/activex/main/so_activex.rc
b/main/extensions/source/activex/main/so_activex.rc
index e31aedd231..0df942baa5 100644
--- a/main/extensions/source/activex/main/so_activex.rc
+++ b/main/extensions/source/activex/main/so_activex.rc
@@ -131,4 +131,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/main/extensions/test/ole/AxTestComponents/AxTestComponents.rc
b/main/extensions/test/ole/AxTestComponents/AxTestComponents.rc
index 2752680a42..073e25206d 100644
--- a/main/extensions/test/ole/AxTestComponents/AxTestComponents.rc
+++ b/main/extensions/test/ole/AxTestComponents/AxTestComponents.rc
@@ -157,4 +157,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git
a/main/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc
b/main/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc
index fb69c8ad38..f8f4787933 100644
---
a/main/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc
+++
b/main/extensions/test/ole/EventListenerSample/EventListener/EventListener.rc
@@ -154,4 +154,3 @@ IDR_EVTLISTENER REGISTRY DISCARDABLE
"EvtListener.rgs"
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/main/extensions/test/ole/MfcControl/MfcControl.rc
b/main/extensions/test/ole/MfcControl/MfcControl.rc
index 96cf3fe937..41bafd92f3 100644
--- a/main/extensions/test/ole/MfcControl/MfcControl.rc
+++ b/main/extensions/test/ole/MfcControl/MfcControl.rc
@@ -163,4 +163,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git
a/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc
b/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc
index a33c9871a9..cc06cef2d6 100644
--- a/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc
+++ b/main/extensions/test/ole/unoTocomCalls/XCallback_Impl/XCallback_Impl.rc
@@ -155,5 +155,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
-
diff --git a/main/fpicker/source/win32/filepicker/Fps.rc
b/main/fpicker/source/win32/filepicker/Fps.rc
index d4d0852b06..8dd76400ab 100644
--- a/main/fpicker/source/win32/filepicker/Fps.rc
+++ b/main/fpicker/source/win32/filepicker/Fps.rc
@@ -456,4 +456,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/main/makefile.rc b/main/makefile.rc
index ac9ff9bb97..0b7a439953 100644
--- a/main/makefile.rc
+++ b/main/makefile.rc
@@ -99,4 +99,3 @@ install .PHONY :
$(PERL) $(SOLARENV)/bin/make_installer.pl -f openoffice.lst -l
$(WITH_LANG:f:t",") -p OpenOffice -buildid 0 -simple $(DESTDIR)$(prefix)
#*************************************************************************
-
diff --git a/main/odk/examples/OLE/activex/so_activex.rc
b/main/odk/examples/OLE/activex/so_activex.rc
index 8493c33e43..7f1d2730ae 100644
--- a/main/odk/examples/OLE/activex/so_activex.rc
+++ b/main/odk/examples/OLE/activex/so_activex.rc
@@ -122,4 +122,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/main/sal/workben/clipboardwben/testcopy/cbcpytest.rc
b/main/sal/workben/clipboardwben/testcopy/cbcpytest.rc
index 96b767e711..f41e65ae8c 100644
--- a/main/sal/workben/clipboardwben/testcopy/cbcpytest.rc
+++ b/main/sal/workben/clipboardwben/testcopy/cbcpytest.rc
@@ -140,4 +140,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/main/sal/workben/clipboardwben/testpaste/cbptest.rc
b/main/sal/workben/clipboardwben/testpaste/cbptest.rc
index cb21eadeb8..32bb5cb9c2 100644
--- a/main/sal/workben/clipboardwben/testpaste/cbptest.rc
+++ b/main/sal/workben/clipboardwben/testpaste/cbptest.rc
@@ -138,4 +138,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/main/sal/workben/clipboardwben/testviewer/cbvtest.rc
b/main/sal/workben/clipboardwben/testviewer/cbvtest.rc
index 55eb6855e9..bed756b34b 100644
--- a/main/sal/workben/clipboardwben/testviewer/cbvtest.rc
+++ b/main/sal/workben/clipboardwben/testviewer/cbvtest.rc
@@ -145,4 +145,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/main/setup_native/source/win32/stwrapper/resource.rc
b/main/setup_native/source/win32/stwrapper/resource.rc
index 35f63f2e94..dc811d1cc0 100644
--- a/main/setup_native/source/win32/stwrapper/resource.rc
+++ b/main/setup_native/source/win32/stwrapper/resource.rc
@@ -143,4 +143,3 @@ VS_VERSION_INFO rcdata
// Manifest section
//
1 24 stwrapper.manifest
-
diff --git a/main/vcl/os2/source/src/salsrc.rc
b/main/vcl/os2/source/src/salsrc.rc
index 8665a3bd5f..71c55c1199 100644
--- a/main/vcl/os2/source/src/salsrc.rc
+++ b/main/vcl/os2/source/src/salsrc.rc
@@ -101,4 +101,3 @@ POINTER SAL_RESID_POINTER_TAB_SELECT_SW
TBLSELSW.PTR
POINTER SAL_RESID_POINTER_PAINTBRUSH PNTBRSH.PTR
ICON SAL_RESID_ICON_DEFAULT
SD.ICO
-
diff --git a/main/vcl/win/source/src/salsrc.rc
b/main/vcl/win/source/src/salsrc.rc
index dc05cb78ee..7b88a9f4b8 100644
--- a/main/vcl/win/source/src/salsrc.rc
+++ b/main/vcl/win/source/src/salsrc.rc
@@ -115,4 +115,3 @@ SAL_RESID_POINTER_PAINTBRUSH CURSOR
PNTBRSH.CUR
SAL_RESID_BITMAP_50 BITMAP 50.BMP
SAL_RESID_ICON_DEFAULT ICON SD.ICO
-
diff --git a/main/winaccessibility/source/UAccCOM/UAccCOM.rc
b/main/winaccessibility/source/UAccCOM/UAccCOM.rc
index bab7d46462..f3248012ba 100644
--- a/main/winaccessibility/source/UAccCOM/UAccCOM.rc
+++ b/main/winaccessibility/source/UAccCOM/UAccCOM.rc
@@ -146,4 +146,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/main/xmerge/source/activesync/XMergeSync.rc
b/main/xmerge/source/activesync/XMergeSync.rc
index 677e7c6317..ad2caca0ae 100644
--- a/main/xmerge/source/activesync/XMergeSync.rc
+++ b/main/xmerge/source/activesync/XMergeSync.rc
@@ -98,4 +98,3 @@ END
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
