This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4d268d612587f5b3e744922de70644d7ca4cb658 Author: Matthias Seidel <[email protected]> AuthorDate: Sat Feb 8 20:18:25 2025 +0100 Merge pull request #273 from jbampton/end-of-file-fixer-more pre-commit(end-of-file-fixer): auto fix `py` and `sh` files (cherry picked from commit 171e5814387d41277889e23e5ac7e281a488da29) --- main/desktop/scripts/unopkg.sh | 1 - main/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh | 1 - main/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh | 1 - main/odk/pack/copying/addsym-macosx.sh | 1 - main/pyuno/demo/swriter.py | 1 - main/sal/qa/helper/gcov/gcov_run.sh | 1 - main/setup_native/scripts/install_solaris.sh | 1 - main/setup_native/scripts/stclient_wrapper.sh | 1 - main/solenv/bin/addsym-macosx.sh | 1 - main/solenv/bin/addsym-mingw.sh | 1 - main/solenv/bin/checkdll.sh | 1 - main/solenv/inc/lldb4aoo.py | 1 - main/source_soenv.sh | 1 - main/sysui/desktop/share/create_tree.sh | 1 - main/testtools/source/bridgetest/pyuno/importer.py | 1 - main/testtools/source/bridgetest/pyuno/samplecomponent.py | 1 - main/testtools/source/bridgetest/pyuno/testcomp.py | 3 --- main/toolkit/workben/layout/un-test.sh | 1 - 18 files changed, 20 deletions(-) diff --git a/main/desktop/scripts/unopkg.sh b/main/desktop/scripts/unopkg.sh index 7ae3de332b..b9d24b8e3c 100644 --- a/main/desktop/scripts/unopkg.sh +++ b/main/desktop/scripts/unopkg.sh @@ -77,4 +77,3 @@ unset XENVIRONMENT # execute binary exec "$sd_prog/unopkg.bin" "$@" "$JVMFWKPARAMS" \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc" - diff --git a/main/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh b/main/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh index 66c9f92caa..288ce589cb 100644 --- a/main/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh +++ b/main/instsetoo_native/inc_openoffice/unix/find-requires-gnome.sh @@ -24,4 +24,3 @@ cat > /dev/null [[ "${OUTPATH}" == unxlngx* ]] && mark64="()(64bit)" echo "libgnomevfs-2.so.0${mark64}" echo "libgconf-2.so.4${mark64}" - diff --git a/main/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh b/main/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh index baaed00cd0..852899cda7 100644 --- a/main/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh +++ b/main/instsetoo_native/inc_openoffice/unix/find-requires-x11.sh @@ -23,4 +23,3 @@ cat > /dev/null [[ "${OUTPATH}" == unxlngx* ]] && mark64="()(64bit)" echo "libfreetype.so.6${mark64}" - diff --git a/main/odk/pack/copying/addsym-macosx.sh b/main/odk/pack/copying/addsym-macosx.sh index 3ae851e0dc..b8b537e47b 100755 --- a/main/odk/pack/copying/addsym-macosx.sh +++ b/main/odk/pack/copying/addsym-macosx.sh @@ -28,4 +28,3 @@ # symbols will erroneously be added to the generated export symbols list file. awk -v SYMBOLSREGEXP="^__ZTI.*$|^__ZTS.*$" ' match ($6,SYMBOLSREGEXP) > 0 && $6 !~ /_GLOBAL_/ { if (($2 != 1) && ( $2 != "1f" ) ) print $6 }' - diff --git a/main/pyuno/demo/swriter.py b/main/pyuno/demo/swriter.py index a4f5520da8..5632e96867 100644 --- a/main/pyuno/demo/swriter.py +++ b/main/pyuno/demo/swriter.py @@ -123,4 +123,3 @@ cursor.setPropertyValue( "CharColor", 65536 ) cursor.setPropertyValue( "CharShadowed", uno.Bool(0) ) text.insertString( cursor, " That's all for now!" , 0 ) - diff --git a/main/sal/qa/helper/gcov/gcov_run.sh b/main/sal/qa/helper/gcov/gcov_run.sh index abad72079b..cd9429ea7d 100755 --- a/main/sal/qa/helper/gcov/gcov_run.sh +++ b/main/sal/qa/helper/gcov/gcov_run.sh @@ -81,4 +81,3 @@ statistics # the gcov_resultcompare.pl use two of these files to give out a compare. # usage: gcov_resultcompare.pl -o realallchecked.txt -c <other>/realallchecked.txt - diff --git a/main/setup_native/scripts/install_solaris.sh b/main/setup_native/scripts/install_solaris.sh index e3782dbaa2..6f0b1c08dd 100644 --- a/main/setup_native/scripts/install_solaris.sh +++ b/main/setup_native/scripts/install_solaris.sh @@ -381,4 +381,3 @@ fi echo echo "Installation done ..." exit 0 - diff --git a/main/setup_native/scripts/stclient_wrapper.sh b/main/setup_native/scripts/stclient_wrapper.sh index 1f60e5c50a..15692874ef 100644 --- a/main/setup_native/scripts/stclient_wrapper.sh +++ b/main/setup_native/scripts/stclient_wrapper.sh @@ -79,4 +79,3 @@ output=`"${STCLIENT}" -a -p "${PRODUCT_NAME}" -e "${PRODUCT_VERSION}" -t ${TARGE [ "${INSTANCE_URN}" = "" -a ${EXITCODE} -eq 226 ] && exit 0 exit ${EXITCODE} - diff --git a/main/solenv/bin/addsym-macosx.sh b/main/solenv/bin/addsym-macosx.sh index 6c0c792b51..2d120ad114 100755 --- a/main/solenv/bin/addsym-macosx.sh +++ b/main/solenv/bin/addsym-macosx.sh @@ -46,4 +46,3 @@ s#$#$#' | tr '\n' '|' | sed "s#|\$##" >$2 # symbols will erroneously be added to the generated export symbols list file. awk -v SYMBOLSREGEXP="`cat $2`" ' match ($6,SYMBOLSREGEXP) > 0 && $6 !~ /_GLOBAL_/ { if (($2 != 1) && ( $2 != "1f" ) ) print $6 }' - diff --git a/main/solenv/bin/addsym-mingw.sh b/main/solenv/bin/addsym-mingw.sh index 375c98a6cd..48b32ee08d 100644 --- a/main/solenv/bin/addsym-mingw.sh +++ b/main/solenv/bin/addsym-mingw.sh @@ -51,4 +51,3 @@ s#$#$#' | tr '\n' '|' | sed "s#|\$##" >$2 awk -v SYMBOLSREGEXP="`cat $2`" ' match (substr ($1,2) ,SYMBOLSREGEXP) > 0 { print substr ($1,2) ";" }' fi - diff --git a/main/solenv/bin/checkdll.sh b/main/solenv/bin/checkdll.sh index 97693ece5b..438440969a 100755 --- a/main/solenv/bin/checkdll.sh +++ b/main/solenv/bin/checkdll.sh @@ -74,4 +74,3 @@ else fi exit 0 - diff --git a/main/solenv/inc/lldb4aoo.py b/main/solenv/inc/lldb4aoo.py index a9bc3fc998..7507bd73d1 100644 --- a/main/solenv/inc/lldb4aoo.py +++ b/main/solenv/inc/lldb4aoo.py @@ -119,4 +119,3 @@ def getinfo_for__ByteStringData( valobj, dict): def getinfo_for__UniStringData( valobj, dict): return ret_strdata_info( valobj, 'mnRefCount', 'mnLen', 'maStr') - diff --git a/main/source_soenv.sh b/main/source_soenv.sh index 891a10ce80..3e40972e53 100644 --- a/main/source_soenv.sh +++ b/main/source_soenv.sh @@ -124,4 +124,3 @@ if test -z "${SOLARENV}"; then echo "$me: error: No environment set!" exit 1 fi - diff --git a/main/sysui/desktop/share/create_tree.sh b/main/sysui/desktop/share/create_tree.sh index d63a5157c0..0c4a715673 100644 --- a/main/sysui/desktop/share/create_tree.sh +++ b/main/sysui/desktop/share/create_tree.sh @@ -128,4 +128,3 @@ mkdir -p ${DESTDIR}/usr/share/applications for i in `cat launcherlist`; do ln -sf ${office_root}/share/xdg/$i ${DESTDIR}/usr/share/applications/${PREFIX}-$i done - diff --git a/main/testtools/source/bridgetest/pyuno/importer.py b/main/testtools/source/bridgetest/pyuno/importer.py index 15bb488806..14c6e4683b 100644 --- a/main/testtools/source/bridgetest/pyuno/importer.py +++ b/main/testtools/source/bridgetest/pyuno/importer.py @@ -69,4 +69,3 @@ def suite( ctx ): suite.addTest(ImporterTestCase("testStandard",ctx)) suite.addTest(ImporterTestCase("testDynamicComponentRegistration",ctx)) return suite - diff --git a/main/testtools/source/bridgetest/pyuno/samplecomponent.py b/main/testtools/source/bridgetest/pyuno/samplecomponent.py index 308febcabf..906f53159b 100644 --- a/main/testtools/source/bridgetest/pyuno/samplecomponent.py +++ b/main/testtools/source/bridgetest/pyuno/samplecomponent.py @@ -145,4 +145,3 @@ g_ImplementationHelper.addImplementation( \ # ("com.sun.star.test.bridge.PythonTestObject",), \ # SampleUnoComponent) \ # , - diff --git a/main/testtools/source/bridgetest/pyuno/testcomp.py b/main/testtools/source/bridgetest/pyuno/testcomp.py index 5e85199787..fa33e31aae 100644 --- a/main/testtools/source/bridgetest/pyuno/testcomp.py +++ b/main/testtools/source/bridgetest/pyuno/testcomp.py @@ -29,6 +29,3 @@ ctx.ServiceManager.insert( comp) bridgetest = ctx.ServiceManager.createInstanceWithContext( "com.sun.star.test.bridge.BridgeTest", ctx ) #bridgetest.run( "com.sun.star.test.bridge.PythonTestObject" ) - - - diff --git a/main/toolkit/workben/layout/un-test.sh b/main/toolkit/workben/layout/un-test.sh index dcc2569492..b7f1d56044 100644 --- a/main/toolkit/workben/layout/un-test.sh +++ b/main/toolkit/workben/layout/un-test.sh @@ -31,4 +31,3 @@ sed -e 's!^#!@!' < $1\ | sed -e 's! /\*\$\*/!!' \ -e 's!^@!#!' \ -e 's!#define 1 1!#define NON_LAYOUT_COMPILE_FIXES 1!' -
