.git-hooks/pre-commit | 33 +++----- solenv/clang-format/excludelist | 102 ------------------------- solenv/clang-format/generate-style-excludelist | 31 ------- solenv/clang-format/reformat-formatted-files | 28 +----- 4 files changed, 21 insertions(+), 173 deletions(-)
New commits: commit 2ab69c32cf6545bd41e4a395d2c5cf1e4eeca203 Author: Pierre <[email protected]> AuthorDate: Thu Oct 23 13:57:51 2025 +0200 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Wed Feb 4 14:36:58 2026 +0100 tdf#169010 obsolete generate-style-excludelist and cleanup excludelist perlify .git-hooks/pre-commit; for readability, should clarify git calls perlify reformat-formatted-files; Change-Id: I947848738e0f80b992ed1852caa3f81ea201bbc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192913 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <[email protected]> diff --git a/.git-hooks/pre-commit b/.git-hooks/pre-commit index c9657a7207d5..ce3ad074c202 100755 --- a/.git-hooks/pre-commit +++ b/.git-hooks/pre-commit @@ -6,17 +6,15 @@ # if it wants to stop the commit. use strict; -use lib "solenv/clang-format"; -#use File::Copy; -#use Cwd; +use lib 'solenv/clang-format'; -$ENV{LC_ALL} = "C"; +$ENV{LC_ALL} = 'C'; sub check_whitespaces($) { - my ($h) = @_; + my $h = shift; my $src_limited = "bas|c|cpp|cxx|h|hrc|hxx|idl|inl|java|swift|map|MK|mm|pmk|pl|pm|sdi|sh|src|tab|ui|vb|xcu|xml|xsl|py"; - my $src_full = "bas|c|cpp|cxx|h|hrc|hxx|idl|inl|java|swift|map|mk|MK|mm|pmk|pl|pm|sdi|sh|src|tab|ui|vb|xcu|xml|xsl|py"; + my $src_full = $src_limited . "|mk"; my %modules = (basctl=>'basctl', chart2=>'chart', cui=>'cui', dbaccess=>'dba', desktop=>'dkt', editeng=>'editeng', extensions=>'pcr', filter=>'flt', formula=>'for', fpicker=>'fps', framework=>'fwk', reportdesign=>'rpt', @@ -27,6 +25,7 @@ sub check_whitespaces($) my $filename; my $reported_filename = ""; my $lineno; + sub bad_line { my ($why, $line, $file_filter) = @_; @@ -176,32 +175,26 @@ sub check_author() sub check_style($) { - if (! -e "solenv/clang-format/ClangFormat.pm") + eval { require ClangFormat }; # see use lib on top of the file + if ($@) # exception { # Commit happens in a submodule. return; } - require ClangFormat; - ClangFormat->import(); - - my ($h) = @_; + my $h = shift; my $src = ClangFormat::get_extension_regex(); my @bad_names = (); my @bad_renames = (); my $clang_format = ClangFormat::find(); - ## Check if ClangFormat has get_excludelist or the old - ## get_blacklist - my $excluded_list_names; - eval { ClangFormat::get_excludelist() }; - if ($@) { $excluded_list_names = ClangFormat::get_blacklist(); } - else { $excluded_list_names = ClangFormat::get_excludelist(); } + ## Check if ClangFormat has get_excludelist + my $excluded_list_names = ClangFormat::get_excludelist(); # Get a list of renamed files. my %renames; # key is target pathname, value is source pathname open (IN, "git diff-index --cached --find-renames --diff-filter=R --name-status $h |") - || die "Cannot run git diff."; + or die "Cannot run git diff."; while (my $line = <IN>) { chomp $line; @@ -210,7 +203,7 @@ sub check_style($) } # Get a list of non-deleted changed files. - open (FILES, "git diff-index --cached --diff-filter=AM --name-only $h |") || die "Cannot run git diff."; + open (FILES, "git diff-index --cached --diff-filter=AM --name-only $h |") or die "Cannot run git diff."; while (my $filename = <FILES>) { chomp $filename; @@ -317,7 +310,7 @@ sub check_style($) sub check_submodules($) { - my ($h) = @_; + my $h = shift; my $toplevel = `git rev-parse --show-toplevel`; chomp $toplevel; diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index de6b1027e60a..9349838a3490 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -255,27 +255,20 @@ basic/source/runtime/stdobj1.cxx basic/source/sbx/sbxarray.cxx basic/source/sbx/sbxbase.cxx basic/source/sbx/sbxbool.cxx -basic/source/sbx/sbxbyte.cxx -basic/source/sbx/sbxchar.cxx basic/source/sbx/sbxcoll.cxx basic/source/sbx/sbxconv.hxx basic/source/sbx/sbxcurr.cxx basic/source/sbx/sbxdate.cxx -basic/source/sbx/sbxdbl.cxx basic/source/sbx/sbxdec.cxx basic/source/sbx/sbxdec.hxx basic/source/sbx/sbxexec.cxx basic/source/sbx/sbxform.cxx basic/source/sbx/sbxint.cxx -basic/source/sbx/sbxlng.cxx basic/source/sbx/sbxobj.cxx basic/source/sbx/sbxres.cxx basic/source/sbx/sbxres.hxx basic/source/sbx/sbxscan.cxx -basic/source/sbx/sbxsng.cxx basic/source/sbx/sbxstr.cxx -basic/source/sbx/sbxuint.cxx -basic/source/sbx/sbxulng.cxx basic/source/sbx/sbxvalue.cxx basic/source/sbx/sbxvar.cxx basic/source/uno/dlgcont.cxx @@ -772,7 +765,6 @@ chart2/source/controller/inc/RegressionCurveItemConverter.hxx chart2/source/controller/inc/RegressionEquationItemConverter.hxx chart2/source/controller/inc/SelectionHelper.hxx chart2/source/controller/inc/SeriesOptionsItemConverter.hxx -chart2/source/controller/inc/ShapeController.h chart2/source/controller/inc/StatisticsItemConverter.hxx chart2/source/controller/inc/TextLabelItemConverter.hxx chart2/source/controller/inc/TitleDialogData.hxx @@ -823,7 +815,6 @@ chart2/source/controller/main/ChartTransferable.hxx chart2/source/controller/main/ChartWindow.cxx chart2/source/controller/main/CommandDispatch.cxx chart2/source/controller/main/CommandDispatchContainer.cxx -chart2/source/controller/main/ConfigurationAccess.cxx chart2/source/controller/main/ControllerCommandDispatch.cxx chart2/source/controller/main/DragMethod_Base.cxx chart2/source/controller/main/DragMethod_Base.hxx @@ -832,7 +823,6 @@ chart2/source/controller/main/DragMethod_PieSegment.hxx chart2/source/controller/main/DragMethod_RotateDiagram.cxx chart2/source/controller/main/DragMethod_RotateDiagram.hxx chart2/source/controller/main/DrawCommandDispatch.cxx -chart2/source/controller/main/DrawCommandDispatch.h chart2/source/controller/main/DrawCommandDispatch.hxx chart2/source/controller/main/ElementSelector.cxx chart2/source/controller/main/ElementSelector.hxx @@ -946,7 +936,6 @@ chart2/source/inc/XMLRangeHelper.hxx chart2/source/inc/chartview/ChartSfxItemIds.hxx chart2/source/inc/chartview/DataPointSymbolSupplier.hxx chart2/source/inc/chartview/DrawModelWrapper.hxx -chart2/source/inc/chartview/ExplicitValueProvider.hxx chart2/source/inc/servicenames_coosystems.hxx chart2/source/model/filter/XMLFilter.cxx chart2/source/model/inc/StockBar.hxx @@ -1770,9 +1759,7 @@ connectivity/source/drivers/odbc/OConnection.cxx connectivity/source/drivers/odbc/ODatabaseMetaData.cxx connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx connectivity/source/drivers/odbc/ODriver.cxx -connectivity/source/drivers/odbc/OFunctions.cxx connectivity/source/drivers/odbc/OPreparedStatement.cxx -connectivity/source/drivers/odbc/ORealDriver.cxx connectivity/source/drivers/odbc/OResultSet.cxx connectivity/source/drivers/odbc/OResultSetMetaData.cxx connectivity/source/drivers/odbc/OStatement.cxx @@ -2278,8 +2265,6 @@ cui/source/options/optbasic.cxx cui/source/options/optbasic.hxx cui/source/options/optchart.cxx cui/source/options/optchart.hxx -cui/source/options/optcolor.cxx -cui/source/options/optcolor.hxx cui/source/options/optctl.cxx cui/source/options/optctl.hxx cui/source/options/optdict.cxx @@ -4383,8 +4368,6 @@ hwpfilter/source/hwpreader.hxx hwpfilter/source/ksc5601.h hwpfilter/source/lexer.cxx hwpfilter/source/mapping.h -hwpfilter/source/mzstring.cxx -hwpfilter/source/mzstring.h hwpfilter/source/nodes.h hwpfilter/source/solver.cxx i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -4436,7 +4419,6 @@ i18npool/inc/transliteration_caseignore.hxx i18npool/inc/transliteration_commonclass.hxx i18npool/inc/unoscripttypedetector.hxx i18npool/inc/wtt.h -i18npool/inc/xdictionary.hxx i18npool/qa/cppunit/test_breakiterator.cxx i18npool/qa/cppunit/test_characterclassification.cxx i18npool/qa/cppunit/test_ordinalsuffix.cxx @@ -5114,7 +5096,6 @@ include/o3tl/lazy_update.hxx include/o3tl/numeric.hxx include/o3tl/safeint.hxx include/o3tl/sorted_vector.hxx -include/span include/o3tl/strong_int.hxx include/o3tl/typed_flags_set.hxx include/o3tl/vector_pool.hxx @@ -5420,7 +5401,6 @@ include/store/types.h include/svl/PasswordHelper.hxx include/svl/SfxBroadcaster.hxx include/svl/adrparse.hxx -include/svl/aeitem.hxx include/svl/asiancfg.hxx include/svl/broadcast.hxx include/svl/cenumitm.hxx @@ -5711,7 +5691,6 @@ include/svx/sdtfsitm.hxx include/svx/sdynitm.hxx include/svx/searchcharmap.hxx include/svx/selectioncontroller.hxx -include/svx/shapepropertynotifier.hxx include/svx/sidebar/AreaPropertyPanelBase.hxx include/svx/sidebar/ContextChangeEventMultiplexer.hxx include/svx/sidebar/SelectionAnalyzer.hxx @@ -5934,7 +5913,6 @@ include/typelib/typedescription.hxx include/ucbhelper/authenticationfallback.hxx include/ucbhelper/cancelcommandexecution.hxx include/ucbhelper/contenthelper.hxx -include/ucbhelper/fd_inputstream.hxx include/ucbhelper/interactionrequest.hxx include/ucbhelper/interceptedinteraction.hxx include/ucbhelper/macros.hxx @@ -6245,7 +6223,6 @@ include/xmloff/XMLTextShapeImportHelper.hxx include/xmloff/XMLTextShapeStyleContext.hxx include/xmloff/XMLTextTableContext.hxx include/xmloff/animationexport.hxx -include/xmloff/attrlist.hxx include/xmloff/autolayout.hxx include/xmloff/contextid.hxx include/xmloff/controlpropertyhdl.hxx @@ -6635,7 +6612,6 @@ o3tl/qa/cow_wrapper_clients.hxx o3tl/qa/test-cow_wrapper.cxx o3tl/qa/test-enumarray.cxx o3tl/qa/test-sorted_vector.cxx -o3tl/qa/test-span.cxx o3tl/qa/test-typed_flags.cxx o3tl/qa/test-vector_pool.cxx odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx @@ -7040,7 +7016,6 @@ package/source/zipapi/ByteChucker.cxx package/source/zipapi/ByteGrabber.cxx package/source/zipapi/CRC32.cxx package/source/zipapi/Deflater.cxx -package/source/zipapi/Inflater.cxx package/source/zipapi/MemoryByteGrabber.hxx package/source/zipapi/XBufferedThreadedStream.cxx package/source/zipapi/XBufferedThreadedStream.hxx @@ -7349,7 +7324,6 @@ sal/osl/w32/file_url.hxx sal/osl/w32/memory.cxx sal/osl/w32/module.cxx sal/osl/w32/nlsupport.cxx -sal/osl/w32/path_helper.cxx sal/osl/w32/path_helper.hxx sal/osl/w32/pipe.cxx sal/osl/w32/process.cxx @@ -7379,7 +7353,6 @@ sal/qa/osl/pipe/osl_Pipe.cxx sal/qa/osl/process/osl_Thread.cxx sal/qa/osl/process/osl_process.cxx sal/qa/osl/process/osl_process_child.cxx -sal/qa/osl/security/TODO.h sal/qa/osl/security/osl_Security.cxx sal/qa/osl/setthreadname/test-setthreadname.cxx sal/qa/osl/thread/test_thread.cxx @@ -7749,8 +7722,6 @@ sc/qa/unit/helper/csv_handler.hxx sc/qa/unit/helper/qahelper.cxx sc/qa/unit/helper/qahelper.hxx sc/qa/unit/helper/sorthelper.hxx -sc/qa/unit/helper/xpath.cxx -sc/qa/unit/helper/xpath.hxx sc/qa/unit/mark_test.cxx sc/qa/unit/opencl-test-1.cxx sc/qa/unit/opencl-test-2.cxx @@ -7909,7 +7880,6 @@ sc/source/core/tool/calcconfig.cxx sc/source/core/tool/callform.cxx sc/source/core/tool/cellform.cxx sc/source/core/tool/cellkeytranslator.cxx -sc/source/core/tool/cellkeywords.inl sc/source/core/tool/chartarr.cxx sc/source/core/tool/charthelper.cxx sc/source/core/tool/chartlis.cxx @@ -9204,7 +9174,6 @@ sd/source/console/PresenterGeometryHelper.cxx sd/source/console/PresenterGeometryHelper.hxx sd/source/console/PresenterHelpView.cxx sd/source/console/PresenterHelpView.hxx -sd/source/console/PresenterHelper.cxx sd/source/console/PresenterNotesView.cxx sd/source/console/PresenterNotesView.hxx sd/source/console/PresenterPaintManager.cxx @@ -9254,7 +9223,6 @@ sd/source/core/PageListWatcher.hxx sd/source/core/TransitionPreset.cxx sd/source/core/anminfo.cxx sd/source/core/annotations/Annotation.cxx -sd/source/core/annotations/AnnotationEnumeration.cxx sd/source/core/cusshow.cxx sd/source/core/drawdoc.cxx sd/source/core/drawdoc2.cxx @@ -9293,9 +9261,6 @@ sd/source/filter/eppt/pptx-stylesheet.cxx sd/source/filter/eppt/pptx-text.cxx sd/source/filter/eppt/text.hxx sd/source/filter/grf/sdgrffilter.cxx -sd/source/filter/html/buttonset.cxx -sd/source/filter/html/htmlattr.cxx -sd/source/filter/html/htmlattr.hxx sd/source/filter/html/htmlex.cxx sd/source/filter/html/htmlex.hxx sd/source/filter/ppt/ppt97animations.cxx @@ -9331,8 +9296,6 @@ sd/source/ui/animations/motionpathtag.cxx sd/source/ui/animations/motionpathtag.hxx sd/source/ui/annotations/annotationmanager.cxx sd/source/ui/annotations/annotationmanagerimpl.hxx -sd/source/ui/annotations/annotationtag.cxx -sd/source/ui/annotations/annotationtag.hxx sd/source/ui/annotations/annotationwindow.cxx sd/source/ui/annotations/annotationwindow.hxx sd/source/ui/app/optsitem.cxx @@ -9357,7 +9320,6 @@ sd/source/ui/dlg/RemoteDialogClientBox.hxx sd/source/ui/dlg/SpellDialogChildWindow.cxx sd/source/ui/dlg/TemplateScanner.cxx sd/source/ui/dlg/animobjs.cxx -sd/source/ui/dlg/assclass.cxx sd/source/ui/dlg/brkdlg.cxx sd/source/ui/dlg/copydlg.cxx sd/source/ui/dlg/custsdlg.cxx @@ -9532,7 +9494,6 @@ sd/source/ui/inc/ViewShell.hxx sd/source/ui/inc/ViewShellBase.hxx sd/source/ui/inc/ViewTabBar.hxx sd/source/ui/inc/animobjs.hxx -sd/source/ui/inc/assclass.hxx sd/source/ui/inc/custsdlg.hxx sd/source/ui/inc/dlgfield.hxx sd/source/ui/inc/dlgpage.hxx @@ -9616,7 +9577,6 @@ sd/source/ui/inc/tmplctrl.hxx sd/source/ui/inc/titledockwin.hxx sd/source/ui/inc/tools/ConfigurationAccess.hxx sd/source/ui/inc/tools/IdleDetection.hxx -sd/source/ui/inc/tools/PropertySet.hxx sd/source/ui/inc/tools/SlotStateListener.hxx sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx sd/source/ui/inc/tpaction.hxx @@ -9638,8 +9598,6 @@ sd/source/ui/presenter/PresenterCanvas.cxx sd/source/ui/presenter/PresenterCanvas.hxx sd/source/ui/presenter/PresenterHelper.cxx sd/source/ui/presenter/PresenterPreviewCache.cxx -sd/source/ui/presenter/PresenterTextView.cxx -sd/source/ui/presenter/PresenterTextView.hxx sd/source/ui/presenter/SlideRenderer.cxx sd/source/ui/remotecontrol/AvahiNetworkService.cxx sd/source/ui/remotecontrol/AvahiNetworkService.hxx @@ -9755,8 +9713,6 @@ sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx sd/source/ui/slidesorter/shell/SlideSorter.cxx -sd/source/ui/slidesorter/shell/SlideSorterService.cxx -sd/source/ui/slidesorter/shell/SlideSorterService.hxx sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx sd/source/ui/slidesorter/view/SlideSorterView.cxx sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -9779,7 +9735,6 @@ sd/source/ui/tools/ConfigurationAccess.cxx sd/source/ui/tools/EventMultiplexer.cxx sd/source/ui/tools/IdleDetection.cxx sd/source/ui/tools/PreviewRenderer.cxx -sd/source/ui/tools/PropertySet.cxx sd/source/ui/tools/SdGlobalResourceContainer.cxx sd/source/ui/tools/SlotStateListener.cxx sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -9889,8 +9844,6 @@ sdext/source/minimizer/pagecollector.hxx sdext/source/minimizer/pppoptimizerdialog.cxx sdext/source/minimizer/pppoptimizerdialog.hxx sdext/source/minimizer/pppoptimizertoken.cxx -sdext/source/minimizer/unodialog.cxx -sdext/source/minimizer/unodialog.hxx sdext/source/pdfimport/filterdet.cxx sdext/source/pdfimport/filterdet.hxx sdext/source/pdfimport/inc/contentsink.hxx @@ -10788,7 +10741,6 @@ svl/source/fsstor/ostreamcontainer.cxx svl/source/fsstor/ostreamcontainer.hxx svl/source/inc/fsfactory.hxx svl/source/items/IndexedStyleSheets.cxx -svl/source/items/aeitem.cxx svl/source/items/cenumitm.cxx svl/source/items/cintitem.cxx svl/source/items/flagitem.cxx @@ -10863,13 +10815,11 @@ svtools/source/brwbox/brwbox1.cxx svtools/source/brwbox/brwbox2.cxx svtools/source/brwbox/brwbox3.cxx svtools/source/brwbox/brwhead.cxx -svtools/source/brwbox/brwimpl.hxx svtools/source/brwbox/datwin.cxx svtools/source/brwbox/datwin.hxx svtools/source/brwbox/ebbcontrols.cxx svtools/source/brwbox/editbrowsebox.cxx svtools/source/brwbox/editbrowsebox2.cxx -svtools/source/brwbox/editbrowseboximpl.hxx svtools/source/config/accessibilityoptions.cxx svtools/source/config/apearcfg.cxx svtools/source/config/colorcfg.cxx @@ -10966,7 +10916,6 @@ svx/inc/XPropertyTable.hxx svx/inc/colrctrl.hxx svx/inc/dragmt3d.hxx svx/inc/extrud3d.hxx -svx/inc/galbrws2.hxx svx/inc/galobj.hxx svx/inc/helpids.h svx/inc/legacyitem.hxx @@ -11239,8 +11188,6 @@ svx/source/form/xfm_addcondition.cxx svx/source/gallery2/GalleryControl.cxx svx/source/gallery2/codec.cxx svx/source/gallery2/galbrws1.cxx -svx/source/gallery2/galbrws1.hxx -svx/source/gallery2/galbrws2.cxx svx/source/gallery2/galctrl.cxx svx/source/gallery2/galexpl.cxx svx/source/gallery2/galini.cxx @@ -11619,7 +11566,6 @@ svx/source/unodraw/XPropertyTable.cxx svx/source/unodraw/gluepts.cxx svx/source/unodraw/recoveryui.cxx svx/source/unodraw/shapeimpl.hxx -svx/source/unodraw/shapepropertynotifier.cxx svx/source/unodraw/tableshape.cxx svx/source/unodraw/unobrushitemhelper.cxx svx/source/unodraw/unobtabl.cxx @@ -11764,7 +11710,6 @@ sw/inc/frmfmt.hxx sw/inc/ftnidx.hxx sw/inc/ftninfo.hxx sw/inc/globdoc.hxx -sw/inc/gotodlg.hxx sw/inc/grfatr.hxx sw/inc/helpids.h sw/inc/hfspacingitem.hxx @@ -12937,7 +12882,6 @@ sw/source/uibase/inc/SwXFilterOptions.hxx sw/source/uibase/inc/annotsh.hxx sw/source/uibase/inc/basesh.hxx sw/source/uibase/inc/bmpwin.hxx -sw/source/uibase/inc/bookmark.hxx sw/source/uibase/inc/caption.hxx sw/source/uibase/inc/cfgitems.hxx sw/source/uibase/inc/changedb.hxx @@ -13017,7 +12961,6 @@ sw/source/uibase/inc/pggrid.hxx sw/source/uibase/inc/prcntfld.hxx sw/source/uibase/inc/pview.hxx sw/source/uibase/inc/redlndlg.hxx -sw/source/uibase/inc/regionsw.hxx sw/source/uibase/inc/scroll.hxx sw/source/uibase/inc/selglos.hxx sw/source/uibase/inc/shdwcrsr.hxx @@ -13170,7 +13113,6 @@ sw/source/uibase/uno/unotxdoc.cxx sw/source/uibase/uno/unotxvw.cxx sw/source/uibase/utlui/attrdesc.cxx sw/source/uibase/utlui/bookctrl.cxx -sw/source/uibase/utlui/condedit.cxx sw/source/uibase/utlui/content.cxx sw/source/uibase/utlui/glbltree.cxx sw/source/uibase/utlui/gloslst.cxx @@ -13359,7 +13301,6 @@ toolkit/inc/controls/tabpagecontainer.hxx toolkit/inc/controls/tabpagemodel.hxx toolkit/inc/controls/tkscrollbar.hxx toolkit/inc/controls/treecontrolpeer.hxx -toolkit/inc/helper/accessibilityclient.hxx toolkit/inc/helper/btndlg.hxx toolkit/inc/helper/imagealign.hxx toolkit/inc/helper/property.hxx @@ -13450,7 +13391,6 @@ toolkit/source/hatchwindow/hatchwindow.hxx toolkit/source/hatchwindow/hatchwindowfactory.cxx toolkit/source/hatchwindow/ipwin.cxx toolkit/source/hatchwindow/ipwin.hxx -toolkit/source/helper/accessibilityclient.cxx toolkit/source/helper/btndlg.cxx toolkit/source/helper/imagealign.cxx toolkit/source/helper/listenermultiplexer.cxx @@ -13533,8 +13473,6 @@ ucb/source/sorter/sortresult.cxx ucb/source/sorter/sortresult.hxx ucb/source/ucp/cmis/auth_provider.cxx ucb/source/ucp/cmis/auth_provider.hxx -ucb/source/ucp/cmis/certvalidation_handler.cxx -ucb/source/ucp/cmis/certvalidation_handler.hxx ucb/source/ucp/cmis/children_provider.hxx ucb/source/ucp/cmis/cmis_content.cxx ucb/source/ucp/cmis/cmis_content.hxx @@ -13698,7 +13636,6 @@ ucbhelper/source/provider/contenthelper.cxx ucbhelper/source/provider/contentidentifier.cxx ucbhelper/source/provider/contentinfo.cxx ucbhelper/source/provider/contentinfo.hxx -ucbhelper/source/provider/fd_inputstream.cxx ucbhelper/source/provider/interactionrequest.cxx ucbhelper/source/provider/propertyvalueset.cxx ucbhelper/source/provider/providerhelper.cxx @@ -13753,7 +13690,6 @@ unotools/source/config/defaultoptions.cxx unotools/source/config/docinfohelper.cxx unotools/source/config/dynamicmenuoptions.cxx unotools/source/config/eventcfg.cxx -unotools/source/config/fltrcfg.cxx unotools/source/config/fontcfg.cxx unotools/source/config/historyoptions.cxx unotools/source/config/itemholder1.cxx @@ -14074,7 +14010,6 @@ vcl/inc/canvasbitmap.hxx vcl/inc/debugevent.hxx vcl/inc/displayconnectiondispatch.hxx vcl/inc/dndeventdispatcher.hxx -vcl/inc/factory.hxx vcl/inc/fltcall.hxx vcl/inc/font/FontSelectPattern.hxx vcl/inc/font/PhysicalFontCollection.hxx @@ -14186,9 +14121,6 @@ vcl/inc/unx/i18n_cb.hxx vcl/inc/unx/i18n_ic.hxx vcl/inc/unx/i18n_im.hxx vcl/inc/unx/i18n_xkb.hxx -vcl/inc/unx/printergfx.hxx -vcl/inc/unx/printerjob.hxx -vcl/inc/unx/salbmp.h vcl/inc/unx/saldata.hxx vcl/inc/unx/saldisp.hxx vcl/inc/unx/salframe.h @@ -14449,7 +14381,6 @@ vcl/source/bitmap/BitmapTools.cxx vcl/source/bitmap/alpha.cxx vcl/source/bitmap/bitmap.cxx vcl/source/bitmap/bmpfast.cxx -vcl/source/bitmap/checksum.cxx vcl/source/bitmap/dibtools.cxx vcl/source/bitmap/floyd.hxx vcl/source/bitmap/salbmp.cxx @@ -14459,7 +14390,6 @@ vcl/source/cnttype/mcnttfactory.hxx vcl/source/cnttype/mcnttype.cxx vcl/source/cnttype/mcnttype.hxx vcl/source/components/dtranscomp.cxx -vcl/source/components/factory.cxx vcl/source/components/fontident.cxx vcl/source/control/FormattedField.cxx vcl/source/control/button.cxx @@ -14790,7 +14720,6 @@ vcl/unx/generic/dtrans/X11_transferable.cxx vcl/unx/generic/dtrans/X11_transferable.hxx vcl/unx/generic/dtrans/bmp.cxx vcl/unx/generic/dtrans/bmp.hxx -vcl/unx/generic/dtrans/config.cxx vcl/unx/generic/dtrans/copydata_curs.h vcl/unx/generic/dtrans/copydata_mask.h vcl/unx/generic/dtrans/linkdata_curs.h @@ -14808,25 +14737,13 @@ vcl/unx/generic/gdi/cairo_xlib_cairo.hxx vcl/unx/generic/gdi/cairotextrender.cxx vcl/unx/generic/gdi/font.cxx vcl/unx/generic/gdi/freetypetextrender.cxx -vcl/unx/generic/gdi/gdiimpl.cxx -vcl/unx/generic/gdi/gdiimpl.hxx -vcl/unx/generic/gdi/salbmp.cxx vcl/unx/generic/gdi/salgdi.cxx -vcl/unx/generic/gdi/salgdi2.cxx vcl/unx/generic/gdi/salvd.cxx vcl/unx/generic/glyphs/freetype_glyphcache.cxx vcl/unx/generic/glyphs/glyphcache.cxx -vcl/unx/generic/print/bitmap_gfx.cxx -vcl/unx/generic/print/common_gfx.cxx vcl/unx/generic/print/genprnpsp.cxx vcl/unx/generic/print/genpspgraphics.cxx -vcl/unx/generic/print/glyphset.cxx -vcl/unx/generic/print/glyphset.hxx -vcl/unx/generic/print/printerjob.cxx vcl/unx/generic/print/prtsetup.cxx -vcl/unx/generic/print/psputil.cxx -vcl/unx/generic/print/psputil.hxx -vcl/unx/generic/print/text_gfx.cxx vcl/unx/generic/printer/cupsmgr.cxx vcl/unx/generic/printer/jobdata.cxx vcl/unx/generic/printer/ppdparser.cxx @@ -14871,7 +14788,6 @@ vcl/unx/gtk3/hudawareness.cxx vcl/unx/gtk3/salnativewidgets-gtk.cxx vcl/unx/x11/x11sys.cxx vcl/unx/x11/xlimits.cxx -vcl/win/app/saldata.cxx vcl/win/app/salinfo.cxx vcl/win/app/salinst.cxx vcl/win/app/salshl.cxx @@ -14965,19 +14881,6 @@ vcl/workben/svptest.cxx vcl/workben/tgafuzzer.cxx vcl/workben/tiffuzzer.cxx vcl/workben/vcldemo.cxx -vcl/workben/win/dnd/atlwindow.cxx -vcl/workben/win/dnd/atlwindow.hxx -vcl/workben/win/dnd/dndTest.cxx -vcl/workben/win/dnd/sourcelistener.cxx -vcl/workben/win/dnd/sourcelistener.hxx -vcl/workben/win/dnd/targetlistener.cxx -vcl/workben/win/dnd/targetlistener.hxx -vcl/workben/win/dnd/transferable.cxx -vcl/workben/win/dnd/transferable.hxx -vcl/workben/win/dtrans/testmarshal.cxx -vcl/workben/win/dtrans/test_wincb.cxx -vcl/workben/win/dtrans/XTDo.cxx -vcl/workben/win/dtrans/XTDo.hxx vcl/workben/wmffuzzer.cxx vcl/workben/ww2fuzzer.cxx vcl/workben/ww6fuzzer.cxx @@ -15030,8 +14933,6 @@ xmlhelp/source/cxxhelp/provider/databases.cxx xmlhelp/source/cxxhelp/provider/databases.hxx xmlhelp/source/cxxhelp/provider/db.cxx xmlhelp/source/cxxhelp/provider/db.hxx -xmlhelp/source/cxxhelp/provider/inputstream.cxx -xmlhelp/source/cxxhelp/provider/inputstream.hxx xmlhelp/source/cxxhelp/provider/provider.cxx xmlhelp/source/cxxhelp/provider/provider.hxx xmlhelp/source/cxxhelp/provider/resultset.cxx @@ -15181,7 +15082,6 @@ xmloff/source/core/XMLBase64ImportContext.cxx xmloff/source/core/XMLBasicExportFilter.cxx xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx xmloff/source/core/XMLEmbeddedObjectImportContext.cxx -xmloff/source/core/attrlist.cxx xmloff/source/core/fasttokenhandler.cxx xmloff/source/core/i18nmap.cxx xmloff/source/core/namespacemap.cxx @@ -15617,7 +15517,6 @@ xmloff/source/transform/StyleOASISTContext.cxx xmloff/source/transform/StyleOASISTContext.hxx xmloff/source/transform/StyleOOoTContext.cxx xmloff/source/transform/StyleOOoTContext.hxx -xmloff/source/transform/Transformer.hxx xmloff/source/transform/TransformerActionInit.hxx xmloff/source/transform/TransformerActions.cxx xmloff/source/transform/TransformerActions.hxx @@ -15728,7 +15627,6 @@ xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx xmlsecurity/source/xmlsec/errorcallback.cxx xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx xmlsecurity/source/xmlsec/mscrypt/akmngr.hxx -xmlsecurity/source/xmlsec/mscrypt/oid.hxx xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx diff --git a/solenv/clang-format/generate-style-excludelist b/solenv/clang-format/generate-style-excludelist deleted file mode 100755 index b34b2041dea2..000000000000 --- a/solenv/clang-format/generate-style-excludelist +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env perl -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -# Generates an excludelist containing all existing cxx/hxx files. - -use strict; -use warnings; -use lib "solenv/clang-format"; -use ClangFormat; - -my $src = ClangFormat::get_extension_regex(); -my @filenames = (); - -# Get a list of files. -open (FILES, "git ls-files |") || die "Cannot run git ls-files."; -while (my $filename = <FILES>) -{ - chomp $filename; - if ($filename =~ /\.($src)$/) - { - push @filenames, $filename; - } -} - -ClangFormat::set_excludelist(\@filenames); - -# vim: set shiftwidth=4 softtabstop=4 expandtab: diff --git a/solenv/clang-format/reformat-formatted-files b/solenv/clang-format/reformat-formatted-files index a3a670f83a77..7e77c8bc8d8a 100755 --- a/solenv/clang-format/reformat-formatted-files +++ b/solenv/clang-format/reformat-formatted-files @@ -14,35 +14,23 @@ use warnings; use lib "solenv/clang-format"; use ClangFormat; -my $clang_format = ClangFormat::find(); -my $src = ClangFormat::get_extension_regex(); +my $clang_format = ClangFormat::find() . ' -i '; +my $re_ext = '\.('. ClangFormat::get_extension_regex() .')$'; my $excluded_list_names = ClangFormat::get_excludelist(); -my @filenames = (); -my $dry_run = 0; + +my $dry_run = $ARGV[0] eq '-n'; # Get a list of files. -open (FILES, "git ls-files |") || die "Cannot run git ls-files."; -while (my $filename = <FILES>) -{ - chomp $filename; - if ($filename =~ /\.($src)$/ and !exists($excluded_list_names->{$filename})) - { - push @filenames, $filename; - } -} +open (FILES, 'git ls-files |') or die 'Cannot run git ls-files.'; -if ($#ARGV ge 0 && $ARGV[0] eq "-n") -{ - $dry_run = 1; -} +my @filenames = grep { chomp $_; /$re_ext/ and !exists($excluded_list_names->{$_}) } <FILES>; foreach my $filename (@filenames) { - my $command = $clang_format . " -i " . $filename; - print($filename . " "); + print($filename, " "); if (!$dry_run) { - system($command) == 0 or die "failed to execute \"$command\": $?"; + system($clang_format . $filename) == 0 or die qq(failed to execute "$clang_format $filename": $?); } }
