[Libreoffice-commits] core.git: avmedia/source basegfx/source basic/source canvas/source chart2/source comphelper/source compilerplugins/clang connectivity/source cppcanvas/source dbaccess/source drawinglayer/source oox/source scripting/source sc/source sd/source slideshow/source solenv/clang-format solenv/CompilerTest_compilerplugins_clang.mk svx/source sw/source writerfilter/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jan 31 08:35:30 UTC 2020
avmedia/source/gstreamer/gstframegrabber.cxx | 2
avmedia/source/gstreamer/gstmanager.cxx | 2
avmedia/source/gstreamer/gstplayer.cxx | 2
avmedia/source/gstreamer/gstwindow.cxx | 2
avmedia/source/viewer/mediaevent_impl.cxx | 2
avmedia/source/viewer/mediawindow_impl.cxx | 2
avmedia/source/vlc/vlcmanager.cxx | 2
basegfx/source/color/bcolortools.cxx | 2
basegfx/source/matrix/b2dhommatrixtools.cxx | 4
basegfx/source/matrix/b3dhommatrixtools.cxx | 2
basegfx/source/polygon/b2dlinegeometry.cxx | 4
basegfx/source/polygon/b2dpolygonclipper.cxx | 4
basegfx/source/polygon/b2dpolygoncutandtouch.cxx | 4
basegfx/source/polygon/b2dpolygontools.cxx | 4
basegfx/source/polygon/b2dpolygontriangulator.cxx | 4
basegfx/source/polygon/b2dpolypolygoncutter.cxx | 4
basegfx/source/polygon/b2dpolypolygontools.cxx | 4
basegfx/source/polygon/b2dsvgpolypolygon.cxx | 4
basegfx/source/polygon/b2dtrapezoid.cxx | 12
basegfx/source/polygon/b3dpolygontools.cxx | 4
basegfx/source/polygon/b3dpolypolygontools.cxx | 4
basegfx/source/tools/b2dclipstate.cxx | 2
basegfx/source/tools/canvastools.cxx | 4
basegfx/source/tools/keystoplerp.cxx | 4
basegfx/source/tools/stringconversiontools.cxx | 4
basegfx/source/tools/tools.cxx | 4
basegfx/source/tools/zoomtools.cxx | 2
basic/source/basmgr/vbahelper.cxx | 2
canvas/source/tools/canvastools.cxx | 4
canvas/source/tools/elapsedtime.cxx | 2
canvas/source/tools/verifyinput.cxx | 4
canvas/source/vcl/impltools.cxx | 4
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx | 2
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 2
chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx | 2
chart2/source/controller/main/UndoActions.cxx | 2
chart2/source/tools/BaseGFXHelper.cxx | 2
chart2/source/tools/ImplOPropertySet.cxx | 2
chart2/source/tools/ModifyListenerHelper.cxx | 2
chart2/source/tools/PropertyHelper.cxx | 2
chart2/source/tools/XMLRangeHelper.cxx | 2
comphelper/source/misc/lok.cxx | 2
comphelper/source/misc/servicedecl.cxx | 2
comphelper/source/xml/xmltools.cxx | 4
compilerplugins/clang/namespaceindentation.cxx | 219 ++++++++++
compilerplugins/clang/test/namespaceindentation.cxx | 50 ++
connectivity/source/commontools/paramwrapper.cxx | 2
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 4
connectivity/source/drivers/file/FStatement.cxx | 4
connectivity/source/drivers/firebird/Driver.cxx | 8
connectivity/source/drivers/hsqldb/HStorageMap.cxx | 5
connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 4
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 4
connectivity/source/drivers/mysqlc/mysqlc_driver.cxx | 3
connectivity/source/drivers/odbc/ORealDriver.cxx | 4
connectivity/source/drivers/writer/WCatalog.cxx | 2
connectivity/source/drivers/writer/WConnection.cxx | 2
connectivity/source/drivers/writer/WDatabaseMetaData.cxx | 2
connectivity/source/drivers/writer/WDriver.cxx | 2
connectivity/source/drivers/writer/WTable.cxx | 2
connectivity/source/drivers/writer/WTables.cxx | 2
connectivity/source/sdbcx/VDescriptor.cxx | 4
cppcanvas/source/mtfrenderer/bitmapaction.cxx | 4
cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx | 4
cppcanvas/source/mtfrenderer/implrenderer.cxx | 4
cppcanvas/source/mtfrenderer/lineaction.cxx | 4
cppcanvas/source/mtfrenderer/mtftools.cxx | 4
cppcanvas/source/mtfrenderer/pointaction.cxx | 4
cppcanvas/source/mtfrenderer/polypolyaction.cxx | 4
cppcanvas/source/mtfrenderer/textaction.cxx | 4
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx | 4
cppcanvas/source/tools/canvasgraphichelper.cxx | 4
cppcanvas/source/tools/tools.cxx | 4
cppcanvas/source/wrapper/implbitmap.cxx | 4
cppcanvas/source/wrapper/implbitmapcanvas.cxx | 4
cppcanvas/source/wrapper/implcanvas.cxx | 4
cppcanvas/source/wrapper/implcustomsprite.cxx | 4
cppcanvas/source/wrapper/implpolypolygon.cxx | 4
cppcanvas/source/wrapper/implsprite.cxx | 4
cppcanvas/source/wrapper/implspritecanvas.cxx | 4
dbaccess/source/core/misc/sdbcoretools.cxx | 2
dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 2
drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx | 8
drawinglayer/source/geometry/viewinformation2d.cxx | 4
drawinglayer/source/geometry/viewinformation3d.cxx | 4
drawinglayer/source/primitive2d/animatedprimitive2d.cxx | 8
drawinglayer/source/primitive2d/svggradientprimitive2d.cxx | 16
oox/source/core/binarycodec.cxx | 2
oox/source/core/contexthandler.cxx | 2
oox/source/core/contexthandler2.cxx | 2
oox/source/core/fastparser.cxx | 2
oox/source/core/fasttokenhandler.cxx | 2
oox/source/core/filterbase.cxx | 2
oox/source/core/filterdetect.cxx | 2
oox/source/core/fragmenthandler.cxx | 2
oox/source/core/fragmenthandler2.cxx | 2
oox/source/core/recordparser.cxx | 4
oox/source/core/relations.cxx | 2
oox/source/core/relationshandler.cxx | 2
oox/source/core/xmlfilterbase.cxx | 2
oox/source/crypto/AgileEngine.cxx | 2
oox/source/crypto/CryptTools.cxx | 2
oox/source/crypto/DocumentDecryption.cxx | 2
oox/source/crypto/DocumentEncryption.cxx | 2
oox/source/crypto/Standard2007Engine.cxx | 2
oox/source/docprop/docprophandler.cxx | 2
oox/source/docprop/ooxmldocpropimport.cxx | 2
oox/source/drawingml/ThemeOverrideFragmentHandler.cxx | 2
oox/source/drawingml/chart/axiscontext.cxx | 2
oox/source/drawingml/chart/axismodel.cxx | 2
oox/source/drawingml/chart/chartcontextbase.cxx | 2
oox/source/drawingml/chart/chartconverter.cxx | 2
oox/source/drawingml/chart/chartdrawingfragment.cxx | 2
oox/source/drawingml/chart/chartspaceconverter.cxx | 2
oox/source/drawingml/chart/chartspacefragment.cxx | 2
oox/source/drawingml/chart/chartspacemodel.cxx | 2
oox/source/drawingml/chart/datasourcecontext.cxx | 2
oox/source/drawingml/chart/datasourceconverter.cxx | 2
oox/source/drawingml/chart/datasourcemodel.cxx | 2
oox/source/drawingml/chart/modelbase.cxx | 2
oox/source/drawingml/chart/plotareacontext.cxx | 2
oox/source/drawingml/chart/plotareamodel.cxx | 2
oox/source/drawingml/chart/seriesmodel.cxx | 2
oox/source/drawingml/chart/titlecontext.cxx | 2
oox/source/drawingml/chart/titleconverter.cxx | 2
oox/source/drawingml/chart/titlemodel.cxx | 2
oox/source/drawingml/chart/typegroupcontext.cxx | 2
oox/source/drawingml/chart/typegroupmodel.cxx | 2
oox/source/drawingml/colorchoicecontext.cxx | 2
oox/source/drawingml/diagram/datamodel.cxx | 2
oox/source/drawingml/drawingmltypes.cxx | 2
oox/source/drawingml/effectproperties.cxx | 2
oox/source/drawingml/graphicshapecontext.cxx | 2
oox/source/drawingml/hyperlinkcontext.cxx | 2
oox/source/drawingml/misccontexts.cxx | 2
oox/source/drawingml/shapepropertymap.cxx | 2
oox/source/drawingml/table/tablestylelistfragmenthandler.cxx | 2
oox/source/drawingml/textbodyproperties.cxx | 2
oox/source/drawingml/textcharacterproperties.cxx | 2
oox/source/drawingml/textfont.cxx | 2
oox/source/drawingml/theme.cxx | 2
oox/source/drawingml/themeelementscontext.cxx | 2
oox/source/drawingml/themefragmenthandler.cxx | 2
oox/source/drawingml/transform2dcontext.cxx | 2
oox/source/dump/dffdumper.cxx | 2
oox/source/dump/pptxdumper.cxx | 2
oox/source/export/ColorPropertySet.cxx | 2
oox/source/helper/progressbar.cxx | 2
oox/source/mathml/import.cxx | 2
oox/source/ole/axbinaryreader.cxx | 2
oox/source/ole/axbinarywriter.cxx | 2
oox/source/ole/axcontrolfragment.cxx | 2
oox/source/ole/axfontdata.cxx | 2
oox/source/ole/oleobjecthelper.cxx | 2
oox/source/ole/olestorage.cxx | 2
oox/source/ole/vbahelper.cxx | 2
oox/source/ole/vbainputstream.cxx | 2
oox/source/ole/vbamodule.cxx | 2
oox/source/ppt/presPropsfragmenthandler.cxx | 2
oox/source/vml/vmldrawing.cxx | 2
oox/source/vml/vmldrawingfragment.cxx | 2
oox/source/vml/vmlinputstream.cxx | 2
oox/source/vml/vmlshapecontainer.cxx | 2
oox/source/vml/vmltextbox.cxx | 2
oox/source/vml/vmltextboxcontext.cxx | 2
sc/source/filter/oox/autofiltercontext.cxx | 2
sc/source/filter/oox/biffhelper.cxx | 2
sc/source/filter/oox/chartsheetfragment.cxx | 2
sc/source/filter/oox/commentsbuffer.cxx | 2
sc/source/filter/oox/commentsfragment.cxx | 2
sc/source/filter/oox/condformatcontext.cxx | 2
sc/source/filter/oox/connectionsbuffer.cxx | 2
sc/source/filter/oox/connectionsfragment.cxx | 2
sc/source/filter/oox/defnamesbuffer.cxx | 2
sc/source/filter/oox/drawingbase.cxx | 2
sc/source/filter/oox/excelchartconverter.cxx | 2
sc/source/filter/oox/excelfilter.cxx | 2
sc/source/filter/oox/excelhandlers.cxx | 2
sc/source/filter/oox/excelvbaproject.cxx | 2
sc/source/filter/oox/externallinkfragment.cxx | 2
sc/source/filter/oox/extlstcontext.cxx | 2
sc/source/filter/oox/ooxformulaparser.cxx | 2
sc/source/filter/oox/pivotcachefragment.cxx | 2
sc/source/filter/oox/pivottablefragment.cxx | 2
sc/source/filter/oox/querytablebuffer.cxx | 2
sc/source/filter/oox/querytablefragment.cxx | 2
sc/source/filter/oox/richstring.cxx | 2
sc/source/filter/oox/richstringcontext.cxx | 2
sc/source/filter/oox/scenariobuffer.cxx | 2
sc/source/filter/oox/scenariocontext.cxx | 2
sc/source/filter/oox/sharedstringsbuffer.cxx | 2
sc/source/filter/oox/sharedstringsfragment.cxx | 2
sc/source/filter/oox/stylesfragment.cxx | 2
sc/source/filter/oox/tablebuffer.cxx | 2
sc/source/filter/oox/tablecolumnsbuffer.cxx | 2
sc/source/filter/oox/tablecolumnscontext.cxx | 2
sc/source/filter/oox/tablefragment.cxx | 2
sc/source/filter/oox/themebuffer.cxx | 2
sc/source/filter/oox/unitconverter.cxx | 2
sc/source/filter/oox/workbooksettings.cxx | 2
sc/source/filter/oox/worksheetbuffer.cxx | 2
sc/source/filter/oox/worksheetsettings.cxx | 2
sc/source/ui/sidebar/CellBorderStyleControl.cxx | 2
sc/source/ui/sidebar/CellLineStyleControl.cxx | 2
sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 2
sc/source/ui/vba/excelvbahelper.cxx | 2
sc/source/ui/view/drawview.cxx | 4
scripting/source/provider/MasterScriptProviderFactory.cxx | 2
scripting/source/stringresource/stringresource.cxx | 2
sd/source/ui/animations/SlideTransitionPane.cxx | 2
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx | 2
sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx | 2
slideshow/source/engine/animationnodes/animationaudionode.cxx | 2
slideshow/source/engine/slide/shapemanagerimpl.cxx | 2
solenv/CompilerTest_compilerplugins_clang.mk | 1
solenv/clang-format/blacklist | 1
svx/source/dialog/docrecovery.cxx | 5
svx/source/dialog/framelink.cxx | 3
svx/source/engine3d/helperminimaldepth3d.cxx | 4
svx/source/sdr/animation/animationstate.cxx | 5
svx/source/sdr/animation/objectanimator.cxx | 5
svx/source/sdr/animation/scheduler.cxx | 5
svx/source/sdr/attribute/sdrallfillattributeshelper.cxx | 5
svx/source/sdr/attribute/sdrfilltextattribute.cxx | 5
svx/source/sdr/attribute/sdrformtextattribute.cxx | 5
svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx | 5
svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx | 5
svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx | 5
svx/source/sdr/attribute/sdrshadowtextattribute.cxx | 5
svx/source/sdr/attribute/sdrtextattribute.cxx | 5
svx/source/sdr/contact/displayinfo.cxx | 4
svx/source/sdr/contact/objectcontactofpageview.cxx | 5
svx/source/sdr/contact/viewcontactofe3dcube.cxx | 5
svx/source/sdr/contact/viewcontactofe3dextrude.cxx | 5
svx/source/sdr/contact/viewcontactofe3dlathe.cxx | 5
svx/source/sdr/contact/viewcontactofe3dpolygon.cxx | 5
svx/source/sdr/contact/viewcontactofe3dsphere.cxx | 5
svx/source/sdr/contact/viewcontactofgraphic.cxx | 4
svx/source/sdr/contact/viewcontactofgroup.cxx | 5
svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx | 5
svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx | 5
svx/source/sdr/contact/viewcontactofsdrcircobj.cxx | 5
svx/source/sdr/contact/viewcontactofsdredgeobj.cxx | 5
svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx | 4
svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx | 5
svx/source/sdr/contact/viewcontactofsdrpathobj.cxx | 5
svx/source/sdr/contact/viewobjectcontactofe3d.cxx | 5
svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx | 5
svx/source/sdr/contact/viewobjectcontactofgraphic.cxx | 5
svx/source/sdr/contact/viewobjectcontactofgroup.cxx | 5
svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx | 4
svx/source/sdr/overlay/overlayanimatedbitmapex.cxx | 5
svx/source/sdr/overlay/overlaybitmapex.cxx | 5
svx/source/sdr/overlay/overlaycrosshair.cxx | 5
svx/source/sdr/overlay/overlayhelpline.cxx | 4
svx/source/sdr/overlay/overlayline.cxx | 4
svx/source/sdr/overlay/overlaymanager.cxx | 4
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 4
svx/source/sdr/overlay/overlayobject.cxx | 8
svx/source/sdr/overlay/overlayobjectcell.cxx | 5
svx/source/sdr/overlay/overlayobjectlist.cxx | 5
svx/source/sdr/overlay/overlaypolypolygon.cxx | 5
svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx | 4
svx/source/sdr/overlay/overlayrectangle.cxx | 4
svx/source/sdr/overlay/overlayrollingrectangle.cxx | 4
svx/source/sdr/overlay/overlayselection.cxx | 4
svx/source/sdr/overlay/overlaytools.cxx | 18
svx/source/sdr/overlay/overlaytriangle.cxx | 4
svx/source/sdr/primitive2d/sdrattributecreator.cxx | 4
svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx | 4
svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx | 4
svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx | 4
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 4
svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx | 7
svx/source/sdr/primitive2d/sdrframeborderprimitive2d.cxx | 10
svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx | 4
svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx | 4
svx/source/sdr/primitive2d/sdrole2primitive2d.cxx | 4
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx | 4
svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx | 4
svx/source/sdr/primitive2d/sdrprimitivetools.cxx | 4
svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx | 4
svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx | 25 -
svx/source/sdr/primitive3d/sdrattributecreator3d.cxx | 4
svx/source/sdr/properties/attributeproperties.cxx | 4
svx/source/sdr/properties/captionproperties.cxx | 4
svx/source/sdr/properties/circleproperties.cxx | 4
svx/source/sdr/properties/connectorproperties.cxx | 4
svx/source/sdr/properties/customshapeproperties.cxx | 4
svx/source/sdr/properties/defaultproperties.cxx | 4
svx/source/sdr/properties/e3dcompoundproperties.cxx | 4
svx/source/sdr/properties/e3dextrudeproperties.cxx | 4
svx/source/sdr/properties/e3dlatheproperties.cxx | 4
svx/source/sdr/properties/e3dproperties.cxx | 4
svx/source/sdr/properties/e3dsceneproperties.cxx | 4
svx/source/sdr/properties/e3dsphereproperties.cxx | 4
svx/source/sdr/properties/emptyproperties.cxx | 4
svx/source/sdr/properties/graphicproperties.cxx | 4
svx/source/sdr/properties/groupproperties.cxx | 4
svx/source/sdr/properties/itemsettools.cxx | 7
svx/source/sdr/properties/measureproperties.cxx | 4
svx/source/sdr/properties/oleproperties.cxx | 4
svx/source/sdr/properties/pageproperties.cxx | 4
svx/source/sdr/properties/properties.cxx | 4
svx/source/sdr/properties/rectangleproperties.cxx | 4
svx/source/sdr/properties/textproperties.cxx | 4
svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 2
svx/source/table/tablehandles.cxx | 2
svx/source/table/viewcontactoftableobj.cxx | 8
sw/source/core/access/accfrmobj.cxx | 2
sw/source/core/crsr/overlayrangesoutline.cxx | 4
sw/source/core/draw/dcontact.cxx | 8
sw/source/core/draw/dflyobj.cxx | 20
sw/source/core/layout/legacyitem.cxx | 4
sw/source/core/layout/paintfrm.cxx | 4
sw/source/filter/ww8/ww8par.cxx | 4
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 2
sw/source/uibase/docvw/OverlayRanges.cxx | 4
sw/source/uibase/docvw/frmsidebarwincontainer.cxx | 2
writerfilter/source/dmapper/NumberingManager.cxx | 3
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 3
343 files changed, 832 insertions(+), 564 deletions(-)
New commits:
commit 84b396a235671ea77f1a9fa0d131cb56d7662737
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jan 23 15:16:37 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jan 31 09:34:46 2020 +0100
new loplugin:namespaceindentation
check indentation of braces in namespace decls,
and the comments that often appear with them.
This is my penance for messing up the indentation with
clang-tidy-modernize-namespaces.
As such I have limited it to new-style namespaces for now,
and the check is off by default.
Change-Id: I4db7f10a81c79bc0eece8f8e3ee564da8bc7f168
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87723
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index 0323ec0dbb56..7da1917a019b 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -171,6 +171,6 @@ uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames()
return { AVMEDIA_GST_FRAMEGRABBER_SERVICENAME };
}
-} // namespace avmedia
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
index 0414437dfe3b..2b107e5c2dc5 100644
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -66,6 +66,6 @@ uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( )
return { AVMEDIA_GST_MANAGER_SERVICENAME };
}
-} // namespace avmedia
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index c581f6e19710..2c8dbc085ee9 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -923,6 +923,6 @@ uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames()
return { AVMEDIA_GST_PLAYER_SERVICENAME };
}
-} // namespace avmedia
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index 5c91cce1e920..61f1b6a4cb61 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -188,6 +188,6 @@ uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( )
return { AVMEDIA_GST_WINDOW_SERVICENAME };
}
-} // namespace avmedia
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx
index 2adae068bb7a..9fbaceea1145 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -168,6 +168,6 @@ void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& )
}
-} // namespace avmedia
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index c6cb20df7a36..e34b7fb0d6a0 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -664,6 +664,6 @@ void MediaWindowImpl::StartDrag(sal_Int8 nAction, const Point& rPosPixel)
mpMediaWindow->StartDrag(nAction, rPosPixel);
}
-} // namespace avmedia
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx
index 2d378d82c427..60c02b259fb0 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -119,6 +119,6 @@ uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames()
return { VLC_SERVICENAME };
}
-} // end namespace avmedia
+} // end namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/color/bcolortools.cxx b/basegfx/source/color/bcolortools.cxx
index 14f5e35780af..0ff808bc8367 100644
--- a/basegfx/source/color/bcolortools.cxx
+++ b/basegfx/source/color/bcolortools.cxx
@@ -189,6 +189,6 @@ namespace basegfx::utils
}
}
-} // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/matrix/b2dhommatrixtools.cxx b/basegfx/source/matrix/b2dhommatrixtools.cxx
index 6cf751fc8b87..72256688c0b2 100644
--- a/basegfx/source/matrix/b2dhommatrixtools.cxx
+++ b/basegfx/source/matrix/b2dhommatrixtools.cxx
@@ -23,7 +23,7 @@
#include <osl/diagnose.h>
namespace basegfx::utils
- {
+{
void createSinCosOrthogonal(double& o_rSin, double& o_rCos, double fRadiant)
{
if( fTools::equalZero( fmod( fRadiant, F_PI2 ) ) )
@@ -452,6 +452,6 @@ namespace basegfx::utils
{
return B2DTuple(rMatrix.get(0, nCol), rMatrix.get(1, nCol));
}
- } // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/matrix/b3dhommatrixtools.cxx b/basegfx/source/matrix/b3dhommatrixtools.cxx
index f8860df4acf6..9125aca4e0a6 100644
--- a/basegfx/source/matrix/b3dhommatrixtools.cxx
+++ b/basegfx/source/matrix/b3dhommatrixtools.cxx
@@ -66,6 +66,6 @@ void B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix& rMatrixIn,
rMatrixOut.Line4.Column3 = rMatrixIn.get(3, 2);
rMatrixOut.Line4.Column4 = rMatrixIn.get(3, 3);
}
-} // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx
index 1ae29f2a6047..72c25f0c0593 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -33,7 +33,7 @@
#include <basegfx/polygon/b2dpolygontriangulator.hxx>
namespace basegfx::utils
- {
+{
B2DPolyPolygon createAreaGeometryForLineStartEnd(
const B2DPolygon& rCandidate,
const B2DPolyPolygon& rArrow,
@@ -124,7 +124,7 @@ namespace basegfx::utils
return aRetval;
}
- } // end of namespace basegfx
+} // end of namespace
namespace basegfx
{
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx
index 13a569575b02..cdcfeafbfaea 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -27,7 +27,7 @@
#include <basegfx/utils/rectcliptools.hxx>
namespace basegfx::utils
- {
+{
B2DPolyPolygon clipPolygonOnParallelAxis(const B2DPolygon& rCandidate, bool bParallelToXAxis, bool bAboveAxis, double fValueOnOtherAxis, bool bStroke)
{
B2DPolyPolygon aRetval;
@@ -812,6 +812,6 @@ namespace basegfx::utils
return aResult;
}
- } // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index ed4af0843504..d96a38ac7f30 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -839,7 +839,7 @@ namespace basegfx
} // end of namespace basegfx
namespace basegfx::utils
- {
+{
B2DPolygon addPointsAtCutsAndTouches(const B2DPolygon& rCandidate)
{
@@ -1051,6 +1051,6 @@ namespace basegfx::utils
return rCandidate;
}
- } // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index c2089431e1fb..cf2de34859cd 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -40,7 +40,7 @@
#define STEPSPERQUARTER (3)
namespace basegfx::utils
- {
+{
void openWithGeometryChange(B2DPolygon& rCandidate)
{
if(rCandidate.isClosed())
@@ -3485,6 +3485,6 @@ namespace basegfx::utils
}
}
- } // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx
index cebe714386ef..880b1b5c310c 100644
--- a/basegfx/source/polygon/b2dpolygontriangulator.cxx
+++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx
@@ -369,7 +369,7 @@ namespace basegfx
} // end of namespace basegfx
namespace basegfx::triangulator
- {
+{
B2DTriangleVector triangulate(const B2DPolygon& rCandidate)
{
B2DTriangleVector aRetval;
@@ -430,6 +430,6 @@ namespace basegfx::triangulator
return aRetval;
}
- } // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index fa0471403d92..ad185f47f336 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
@@ -681,7 +681,7 @@ namespace basegfx
} // end of namespace basegfx
namespace basegfx::utils
- {
+{
B2DPolyPolygon solveCrossovers(const B2DPolyPolygon& rCandidate)
{
@@ -1104,6 +1104,6 @@ namespace basegfx::utils
return B2DPolyPolygon();
}
- } // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx
index b7e3bacf19ae..75b6d38a19df 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -29,7 +29,7 @@
#include <numeric>
namespace basegfx::utils
- {
+{
B2DPolyPolygon correctOrientations(const B2DPolyPolygon& rCandidate)
{
B2DPolyPolygon aRetval(rCandidate);
@@ -650,6 +650,6 @@ namespace basegfx::utils
}
}
- } // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index 0d846280b8b1..e8ec2cf6e76e 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
@@ -61,7 +61,7 @@ void putNumberChar(OUStringBuffer& rStr,double fValue, double fOldValue, bool bU
}
namespace basegfx::utils
- {
+{
bool PointIndex::operator<(const PointIndex& rComp) const
{
if(rComp.getPolygonIndex() == getPolygonIndex())
@@ -926,6 +926,6 @@ namespace basegfx::utils
return aResult.makeStringAndClear();
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b2dtrapezoid.cxx b/basegfx/source/polygon/b2dtrapezoid.cxx
index 8d7eab51337f..36c0c483a291 100644
--- a/basegfx/source/polygon/b2dtrapezoid.cxx
+++ b/basegfx/source/polygon/b2dtrapezoid.cxx
@@ -27,7 +27,7 @@
#include <list>
namespace basegfx::trapezoidhelper
- {
+{
// helper class to hold a simple edge. This is only used for horizontal edges
// currently, thus the YPositions will be equal. I did not create a special
@@ -189,10 +189,8 @@ namespace basegfx::trapezoidhelper
typedef std::list< TrDeEdgeEntry > TrDeEdgeEntries;
- } // end of namespace basegfx
-namespace basegfx::trapezoidhelper
- {
+
// FIXME: templatize this and use it for TrDeEdgeEntries too ...
namespace {
@@ -890,7 +888,7 @@ namespace basegfx::trapezoidhelper
};
}
- } // end of namespace basegfx
+} // end of namespace
namespace basegfx
{
@@ -944,7 +942,7 @@ namespace basegfx
} // end of namespace basegfx
namespace basegfx::utils
- {
+{
// convert Source utils::PolyPolygon to trapezoids
void trapezoidSubdivide(B2DTrapezoidVector& ro_Result, const B2DPolyPolygon& rSourcePolyPolygon)
{
@@ -1168,6 +1166,6 @@ namespace basegfx::utils
}
- } // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx
index 4fbd1bfa2c94..1d97d4d43f0e 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -28,7 +28,7 @@
#include <numeric>
namespace basegfx::utils
- {
+{
// B3DPolygon tools
void checkClosed(B3DPolygon& rCandidate)
{
@@ -737,6 +737,6 @@ namespace basegfx::utils
}
}
- } // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx
index f8b29914f4ac..31581a0be298 100644
--- a/basegfx/source/polygon/b3dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolypolygontools.cxx
@@ -33,7 +33,7 @@
#define nMaxSegments sal_uInt32(512)
namespace basegfx::utils
- {
+{
// B3DPolyPolygon tools
B3DRange getRange(const B3DPolyPolygon& rCandidate)
{
@@ -581,6 +581,6 @@ namespace basegfx::utils
}
}
- } // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx
index 4efe6fc2cb5e..aa5f655ccbc7 100644
--- a/basegfx/source/tools/b2dclipstate.cxx
+++ b/basegfx/source/tools/b2dclipstate.cxx
@@ -475,6 +475,6 @@ namespace basegfx::utils
}
-} // end of namespace basegfx
+} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx
index d52ddcfdfe18..3ef52a85e197 100644
--- a/basegfx/source/tools/canvastools.cxx
+++ b/basegfx/source/tools/canvastools.cxx
@@ -43,7 +43,7 @@
using namespace ::com::sun::star;
namespace basegfx::unotools
- {
+{
namespace
{
uno::Sequence< geometry::RealBezierSegment2D > bezierSequenceFromB2DPolygon(const ::basegfx::B2DPolygon& rPoly)
@@ -470,6 +470,6 @@ namespace basegfx::unotools
ceil(rRange.getMaxY()) );
}
- } // namespace canvas
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/tools/keystoplerp.cxx b/basegfx/source/tools/keystoplerp.cxx
index cb1a050dc94e..725d52cf431a 100644
--- a/basegfx/source/tools/keystoplerp.cxx
+++ b/basegfx/source/tools/keystoplerp.cxx
@@ -41,7 +41,7 @@ static void validateInput(const std::vector<double>& rKeyStops)
}
namespace basegfx::utils
- {
+{
KeyStopLerp::KeyStopLerp( const std::vector<double>& rKeyStops ) :
maKeyStops(rKeyStops),
mnLastIndex(0)
@@ -86,6 +86,6 @@ namespace basegfx::utils
mnLastIndex,
std::clamp(fRawLerp,0.0,1.0));
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/tools/stringconversiontools.cxx b/basegfx/source/tools/stringconversiontools.cxx
index 994812fbaeb8..079966b27557 100644
--- a/basegfx/source/tools/stringconversiontools.cxx
+++ b/basegfx/source/tools/stringconversiontools.cxx
@@ -21,7 +21,7 @@
#include <rtl/math.hxx>
namespace basegfx::internal
- {
+{
void skipSpaces(sal_Int32& io_rPos,
const OUString& rStr,
const sal_Int32 nLen)
@@ -157,6 +157,6 @@ namespace basegfx::internal
return true;
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/tools/tools.cxx b/basegfx/source/tools/tools.cxx
index ac791656d1a0..4a7f2c962ab3 100644
--- a/basegfx/source/tools/tools.cxx
+++ b/basegfx/source/tools/tools.cxx
@@ -23,7 +23,7 @@
#include <algorithm>
namespace basegfx::utils
- {
+{
namespace
{
double distance( const double& nX,
@@ -106,6 +106,6 @@ namespace basegfx::utils
moveLineOutsideRect( io_rLeftTop, io_rRightTop, aNormalTop, rFitTarget );
moveLineOutsideRect( io_rLeftBottom, io_rRightBottom, aNormalBottom, rFitTarget );
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/tools/zoomtools.cxx b/basegfx/source/tools/zoomtools.cxx
index 3acf23e8688b..488b19b31264 100644
--- a/basegfx/source/tools/zoomtools.cxx
+++ b/basegfx/source/tools/zoomtools.cxx
@@ -108,6 +108,6 @@ long zoomOut(long nCurrent)
nNew = enforceStep(nNew, nCurrent, 25);
return nNew;
}
-} // namespace basegfx
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/basmgr/vbahelper.cxx b/basic/source/basmgr/vbahelper.cxx
index c0827dd92a24..231452612051 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -182,6 +182,6 @@ void registerCurrentDirectory( const uno::Reference< frame::XModel >& rxModel, c
}
-} // namespace basic
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index c9e4c71284a6..957a7bb90b0a 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -63,7 +63,7 @@
using namespace ::com::sun::star;
namespace canvas::tools
- {
+{
geometry::RealSize2D createInfiniteSize2D()
{
return geometry::RealSize2D(
@@ -1317,6 +1317,6 @@ namespace canvas::tools
}
}
- } // namespace canvas
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx
index a73ffc5936dc..84a6ed5c48bd 100644
--- a/canvas/source/tools/elapsedtime.cxx
+++ b/canvas/source/tools/elapsedtime.cxx
@@ -124,6 +124,6 @@ void ElapsedTime::releaseTimer()
m_bInHoldMode = false;
}
-} // namespace canvas
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx
index fab7e13b684b..052d8bbfb723 100644
--- a/canvas/source/tools/verifyinput.cxx
+++ b/canvas/source/tools/verifyinput.cxx
@@ -47,7 +47,7 @@
using namespace ::com::sun::star;
namespace canvas::tools
- {
+{
void verifyInput( const geometry::RealPoint2D& rPoint,
const char* pStr,
const uno::Reference< uno::XInterface >& xIf,
@@ -708,6 +708,6 @@ namespace canvas::tools
}
- } // namespace canvas
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index c1e913b99fe4..754a34ce0806 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.cxx
@@ -44,7 +44,7 @@
using namespace ::com::sun::star;
namespace vclcanvas::tools
- {
+{
::BitmapEx bitmapExFromXBitmap( const uno::Reference< rendering::XBitmap >& xBitmap )
{
// TODO(F3): CanvasCustomSprite should also be tunnelled
@@ -216,6 +216,6 @@ namespace vclcanvas::tools
return vcl::bitmap::CanvasTransformBitmap(rBitmap, rTransform, aDestRect, aLocalTransform);
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 83728eb4c993..8920b1eda076 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -172,6 +172,6 @@ css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames()
"com.sun.star.drawing.LineProperties" };
}
-} // namespace chart
+} // namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 6747d743f4b4..52dd240a1587 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -294,6 +294,6 @@ awt::Point Chart2ModelContact::GetAxisPosition( const uno::Reference< css::chart
return aPoint;
}
-} // namespace chart
+} // namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 593ac535338d..6b48a91cb75d 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1442,7 +1442,7 @@ css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServic
};
}
-} // namespace chart
+} // namespace chart::wrapper
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface *
com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation(css::uno::XComponentContext *context,
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index a08df2d94f0e..649086a1a458 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -182,6 +182,6 @@ css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames()
};
}
-} // namespace chart
+} // namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 4dce225ba570..cf47d80977bb 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -418,6 +418,6 @@ css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames(
};
}
-} // namespace chart
+} // namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 606c98caead1..8b6d614be1dd 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -392,6 +392,6 @@ css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNa
};
}
-} // namespace chart
+} // namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index cf41c0066406..29c81bec0b23 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -360,6 +360,6 @@ css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNam
};
}
-} // namespace chart
+} // namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index e3e5f3b5ab3c..daa0f1de4f20 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -164,6 +164,6 @@ css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNam
};
}
-} // namespace chart
+} // namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index 3468b2cf317e..24a6dfb78a1c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -116,6 +116,6 @@ Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans
return uno::Any( m_rChartDocumentWrapper.getUpdateAddIn() );
}
-} //namespace chart
+} //namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index d402cf7b3eda..76bfe053c46f 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -118,6 +118,6 @@ void WrappedAutomaticPositionProperties::addWrappedProperties( std::vector< std:
rList.emplace_back( new WrappedAutomaticPositionProperty() );
}
-} //namespace chart
+} //namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index ef438c8a1e86..5b69f2292d9c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -396,6 +396,6 @@ Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< bean
return aRet;
}
-} //namespace chart
+} //namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index ed24809c04f6..67ea51b0e913 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -133,6 +133,6 @@ WrappedComplexCharacterHeightProperty::~WrappedComplexCharacterHeightProperty()
{
}
-} //namespace chart
+} //namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index b36e1db06038..f55540f67db8 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -145,6 +145,6 @@ void WrappedDataCaptionProperty::setValueToSeries( const Reference< beans::XProp
xSeriesPropertySet->setPropertyValue( CHART_UNONAME_LABEL, uno::Any( aLabel ) );
}
-} //namespace chart
+} //namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index 0184f879e05b..90194dde22d7 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -166,6 +166,6 @@ WrappedBarOverlapProperty::~WrappedBarOverlapProperty()
{
}
-} // namespace chart
+} // namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index 28cf4de86522..a2da1089f555 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -116,6 +116,6 @@ Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans:
return uno::Any( true ); // bLink
}
-} //namespace chart
+} //namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 1799f83e7fea..b0670ca02a18 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -133,6 +133,6 @@ void WrappedScaleTextProperties::addWrappedProperties( std::vector< std::unique_
rList.emplace_back( new WrappedScaleTextProperty( spChart2ModelContact ) );
}
-} //namespace chart
+} //namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index d65b42cd4808..d3a883429172 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -96,6 +96,6 @@ Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans:
return WrappedProperty::getPropertyValue( xInnerPropertySet );
}
-} //namespace chart
+} //namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
index 127d6b4def67..88fa72696c03 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
@@ -46,6 +46,6 @@ OUString WrappedSeriesAreaOrLineProperty::getInnerName() const
return m_aInnerAreaTypeName;
}
-} //namespace chart
+} //namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index bdb38b8e7ad0..c7ac1bdcd354 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -286,6 +286,6 @@ Any WrappedSplineTypeProperty::convertOuterToInnerValue( const Any& rOuterValue
return uno::Any(aInnerValue);
}
-} //namespace chart
+} //namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 1331e482292a..d4d262995afc 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -276,6 +276,6 @@ void WrappedStockProperties::addWrappedProperties( std::vector< std::unique_ptr<
rList.emplace_back( new WrappedUpDownProperty( spChart2ModelContact ) );
}
-} //namespace chart
+} //namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index ec37591200c0..5a8114c215c9 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -428,6 +428,6 @@ void ErrorBarItemConverter::FillSpecialItem(
}
}
-} // namespace chart
+} // namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index a16f9094210d..e767b40b15a7 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -179,6 +179,6 @@ void LegendItemConverter::FillSpecialItem(
}
}
-} // namespace chart
+} // namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 482c48e8efbe..8859158ac5b8 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -330,6 +330,6 @@ void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemS
}
}
-} // namespace chart
+} // namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 29538c0a371c..75638edfed22 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -205,6 +205,6 @@ void TitleItemConverter::FillSpecialItem(
}
}
-} // namespace chart
+} // namespace chart::wrapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx
index 62ac3a90bc77..78bc1f6b0ef4 100644
--- a/chart2/source/controller/main/UndoActions.cxx
+++ b/chart2/source/controller/main/UndoActions.cxx
@@ -118,6 +118,6 @@ void SAL_CALL ShapeUndoElement::disposing()
{
}
-} // namespace chart
+} // namespace chart::impl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/BaseGFXHelper.cxx b/chart2/source/tools/BaseGFXHelper.cxx
index 8db9b79b7fd0..9c475bc759d1 100644
--- a/chart2/source/tools/BaseGFXHelper.cxx
+++ b/chart2/source/tools/BaseGFXHelper.cxx
@@ -193,6 +193,6 @@ void ReduceToRotationMatrix( ::basegfx::B3DHomMatrix & rB3DMatrix )
rB3DMatrix = aRotationMatrix;
}
-} // namespace chart
+} // namespace chart::BaseGFXHelper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index fa52b5d03ddc..d5f30096e49e 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -173,6 +173,6 @@ bool ImplOPropertySet::SetStyle( const Reference< style::XStyle > & xStyle )
return true;
}
-} // namespace chart
+} // namespace property::impl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 4eb88a01cbe9..7d482f3e6d8a 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -178,6 +178,6 @@ void SAL_CALL ModifyEventForwarder::disposing()
DisposeAndClear( this );
}
-} // namespace chart
+} // namespace chart::ModifyListenerHelper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index fb242cd567c0..cb3e860c0350 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -292,6 +292,6 @@ void setEmptyPropertyValueDefault( tPropertyValueMap & rOutMap, tPropertyValueMa
setPropertyValueDefault( rOutMap, key, uno::Any());
}
-} // namespace chart
+} // namespace chart::PropertyHelper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx
index 6d9b5a2649e0..cc4749deee1f 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -387,6 +387,6 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
return aBuffer.makeStringAndClear();
}
-} // namespace chart
+} // namespace chart::XMLRangeHelper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 8a75db02f04b..d9eb6fc1b484 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -246,6 +246,6 @@ void statusIndicatorFinish()
pStatusIndicatorCallback(pStatusIndicatorCallbackData, statusIndicatorCallbackType::Finish, 0);
}
-} // namespace comphelper
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx
index ebbca601ecbe..1955f6b56251 100644
--- a/comphelper/source/misc/servicedecl.cxx
+++ b/comphelper/source/misc/servicedecl.cxx
@@ -155,6 +155,6 @@ void* component_getFactoryHelper( const char* pImplName,
return nullptr;
}
-} // namespace comphelper
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/xml/xmltools.cxx b/comphelper/source/xml/xmltools.cxx
index 04e97406b293..f506bc33affa 100644
--- a/comphelper/source/xml/xmltools.cxx
+++ b/comphelper/source/xml/xmltools.cxx
@@ -70,7 +70,7 @@ namespace
}
namespace comphelper::xml
- {
+{
OString makeXMLChaff()
{
rtlRandomPool pool = rtl_random_createPool();
@@ -102,5 +102,5 @@ namespace comphelper::xml
return str;
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/namespaceindentation.cxx b/compilerplugins/clang/namespaceindentation.cxx
new file mode 100644
index 000000000000..c8483e9a17d9
--- /dev/null
+++ b/compilerplugins/clang/namespaceindentation.cxx
@@ -0,0 +1,219 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+#ifndef LO_CLANG_SHARED_PLUGINS
+
+#include <cassert>
+#include <string>
+#include <iostream>
+#include <fstream>
+#include <set>
+#include "plugin.hxx"
+
+/*
+*/
+
+namespace
+{
+class NamespaceIndentation : public loplugin::FilteringPlugin<NamespaceIndentation>
+{
+public:
+ explicit NamespaceIndentation(loplugin::InstantiationData const& data)
+ : FilteringPlugin(data)
+ {
+ }
+
+ virtual bool preRun() override { return true; }
+
+ virtual void run() override
+ {
+ if (preRun())
+ TraverseDecl(compiler.getASTContext().getTranslationUnitDecl());
+ }
+
+ bool VisitNamespaceDecl(NamespaceDecl const*);
+
+private:
+ std::string GetFullNamespace(const NamespaceDecl* nsDecl);
+};
+
+void trim(std::string& str)
+{
+ // right trim
+ auto it1 = std::find_if(str.rbegin(), str.rend(), [](char ch) {
+ return !std::isspace<char>(ch, std::locale::classic());
+ });
+ str.erase(it1.base(), str.end());
+ // left trim
+ auto it2 = std::find_if(str.begin(), str.end(), [](char ch) {
+ return !std::isspace<char>(ch, std::locale::classic());
+ });
+ str.erase(str.begin(), it2);
+}
+
+bool NamespaceIndentation::VisitNamespaceDecl(NamespaceDecl const* nsDecl)
+{
+ if (ignoreLocation(nsDecl))
+ return true;
+ if (nsDecl->isAnonymousNamespace())
+ return true;
+ if (isInUnoIncludeFile(compiler.getSourceManager().getSpellingLoc(nsDecl->getLocation())))
+ return true;
+
+ // right now, just fixing up the fallout from clang-tidy-modernize-namespaces, which
+ // does not touch header files
+ if (!compiler.getSourceManager().isInMainFile(nsDecl->getLocation()))
+ return true;
+
+ auto& SM = compiler.getSourceManager();
+
+ // if we have a combined ns (.e.g namespace aaa::bbb), this appears in the AST
+ // as two nested namespace sharing the same source locations, so ignore the outer decls
+ if (!nsDecl->decls_empty())
+ {
+ auto child = dyn_cast_or_null<NamespaceDecl>(*nsDecl->decls_begin());
+ if (child)
+ {
+ bool invalid1 = false;
+ bool invalid2 = false;
+ unsigned line1 = SM.getPresumedLineNumber(compat::getBeginLoc(nsDecl), &invalid1);
+ unsigned line2 = SM.getPresumedLineNumber(compat::getBeginLoc(child), &invalid2);
+ if (line1 == line2)
+ return true;
+ }
+ }
+
+ // Truly hacky way to find the actual beginning of an xxx::yyy namespace declaration
+ // if we are inside the yyy NameSpaceDecl of
+ // namespace xxx::yyy
+ // the beginLoc is just between the "xxx" and the "::"
+ auto nsDeclBeginLoc = compat::getBeginLoc(nsDecl);
+ bool foundMultiple = false;
+ {
+ constexpr int BACKSCAN = 32;
+ auto beginLoc = compat::getBeginLoc(nsDecl).getLocWithOffset(-BACKSCAN);
+ auto endLoc = compat::getBeginLoc(nsDecl).getLocWithOffset(3);
+ const char* p1 = SM.getCharacterData(beginLoc);
+ const char* p2 = SM.getCharacterData(endLoc);
+ unsigned n = Lexer::MeasureTokenLength(endLoc, SM, compiler.getLangOpts());
+ if (p2 < p1 || n > 128 || (p2 - p1 + n) > 2048)
+ return true;
+ auto s = std::string(p1, p2 - p1);
+ auto idx1 = s.rfind(" "); // find the space preceding the namespace token
+ if (idx1 != std::string::npos)
+ {
+ auto namespaceToken = s.substr(idx1);
+ if (namespaceToken.find("::") != std::string::npos)
+ {
+ auto idx = s.rfind("\n");
+ nsDeclBeginLoc = compat::getBeginLoc(nsDecl).getLocWithOffset(idx - BACKSCAN + 1);
+ foundMultiple = true;
+ }
+ }
+ }
+
+ // for now, I am only interested in fixing the fallout from clang-tidy-modernize-namespace, not
+ // anything else
+ if (!foundMultiple)
+ return true;
+
+ bool invalid1 = false;
+ bool invalid2 = false;
+ unsigned col1 = SM.getPresumedColumnNumber(nsDeclBeginLoc, &invalid1);
+ unsigned col2 = SM.getPresumedColumnNumber(nsDecl->getRBraceLoc(), &invalid2);
+ unsigned line1 = SM.getPresumedLineNumber(nsDeclBeginLoc, &invalid1);
+ unsigned line2 = SM.getPresumedLineNumber(nsDecl->getRBraceLoc(), &invalid2);
+ if (invalid1 || invalid2)
+ return true;
+ if (line1 == line2) // single line declaration
+ return true;
+ if (col1 != col2)
+ report(DiagnosticsEngine::Warning, "statement right brace mis-aligned",
+ nsDecl->getRBraceLoc());
+
+ // no easy way to get the position of the left brace
+ auto endLoc = compat::getBeginLoc(nsDecl).getLocWithOffset(256);
+ const char* p1 = SM.getCharacterData(SM.getExpansionLoc(compat::getBeginLoc(nsDecl)));
+ const char* p2 = SM.getCharacterData(SM.getExpansionLoc(endLoc));
+ unsigned n = Lexer::MeasureTokenLength(endLoc, SM, compiler.getLangOpts());
+ if (p2 < p1 || n > 128 || (p2 - p1 + n) > 2048)
+ return true;
+ auto s = std::string(p1, p2 - p1 + n);
+ auto idx1 = s.find("\n");
+ auto idx2 = s.find("{");
+ if (idx1 != std::string::npos && idx2 != std::string::npos)
+ if (idx1 < idx2)
+ {
+ auto col3 = idx2 - idx1;
+ if (col1 != col3)
+ report(DiagnosticsEngine::Warning, "statement left brace mis-aligned",
+ compat::getBeginLoc(nsDecl));
+ }
+
+ // extract the comment following the end brace
+ auto beginLoc = nsDecl->getRBraceLoc();
+ endLoc = beginLoc.getLocWithOffset(128);
+ p1 = SM.getCharacterData(SM.getExpansionLoc(beginLoc));
+ p2 = SM.getCharacterData(SM.getExpansionLoc(endLoc));
+ n = Lexer::MeasureTokenLength(endLoc, SM, compiler.getLangOpts());
+ if (p2 < p1 || n > 128 || (p2 - p1 + n) > 2048)
+ return true;
+ s = std::string(p1, p2 - p1 + n);
+ idx1 = s.find("//");
+ idx2 = s.find("\n");
+ if (idx1 != std::string::npos && idx2 != std::string::npos && idx1 < idx2)
+ {
+ idx1 += 2;
+ s = s.substr(idx1, idx2 - idx1);
+ trim(s);
+ std::string fullNamespace = GetFullNamespace(nsDecl);
+ if (!(s == fullNamespace || s == (fullNamespace + " namespace") || s == "namespace"
+ || s == ("namespace " + fullNamespace) || s == ("namespace ::" + fullNamespace)
+ || s == ("end " + fullNamespace) || s == "end namespace"
+ || s == ("end namespace " + fullNamespace)
+ || s == ("end " + fullNamespace + " namespace") || s == "end of namespace"
+ || s == ("end of namespace " + fullNamespace)
+ || s == ("end of namespace ::" + fullNamespace)
+ || s == ("eof of namespace " + fullNamespace)))
+ {
+ report(DiagnosticsEngine::Warning, "incorrect comment at end of namespace %0",
+ nsDecl->getRBraceLoc())
+ << fullNamespace;
+ }
+ }
+
+ return true;
+}
+
+std::string NamespaceIndentation::GetFullNamespace(const NamespaceDecl* nsDecl)
+{
+ std::vector<llvm::StringRef> names;
+ auto ns = nsDecl;
+ while (ns)
+ {
+ names.push_back(ns->getName());
+ ns = dyn_cast<NamespaceDecl>(ns->getParent());
+ }
+ std::string fullNamespace;
+ for (auto it = names.rbegin(); it != names.rend(); ++it)
+ fullNamespace += "::" + it->str();
+ fullNamespace = fullNamespace.substr(2);
+ return fullNamespace;
+}
+
+// leave this off by default, so as not to annoy people
+loplugin::Plugin::Registration<NamespaceIndentation> namespaceindentation("namespaceindentation",
+ false);
+
+} // namespace
+
+#endif // LO_CLANG_SHARED_PLUGINS
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/test/namespaceindentation.cxx b/compilerplugins/clang/test/namespaceindentation.cxx
new file mode 100644
index 000000000000..f97f781fcae0
--- /dev/null
+++ b/compilerplugins/clang/test/namespaceindentation.cxx
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * 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/.
+ */
+
+#include "config_clang.h"
+
+// no warning expected
+namespace xxx::yyy
+{
+}
+namespace xxx::yyy {
+}
+// expected-error at +1 {{statement left brace mis-aligned [loplugin:namespaceindentation]}}
+namespace xxx::yyy
+ {
+// expected-error at +1 {{statement right brace mis-aligned [loplugin:namespaceindentation]}}
+ }
+namespace xxx::yyy
+{
+ // expected-error at +1 {{statement right brace mis-aligned [loplugin:namespaceindentation]}}
+ }
+// expected-error at +1 {{statement left brace mis-aligned [loplugin:namespaceindentation]}}
+namespace xxx::yyy
+ {
+}
+namespace xxx::yyy {
+// expected-error at +1 {{statement right brace mis-aligned [loplugin:namespaceindentation]}}
+ }
+namespace xxx::yyy
+{
+} // fooo baaaar
+// expected-error at -1 {{incorrect comment at end of namespace xxx::yyy [loplugin:namespaceindentation]}}
+namespace aaa::bbb
+{
+} // namespace foo
+// expected-error at -1 {{incorrect comment at end of namespace aaa::bbb [loplugin:namespaceindentation]}}
+namespace xxx::yyy
+{
+} // xxx::yyy
+// no warning expected
+namespace com { namespace sun { namespace star { } } }
+// no warning expected
+namespace com::sun::star::uno { class XComponentContext; }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index e56cf9e24f01..d0d36cdadbf9 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -347,7 +347,7 @@ namespace dbtools::param
}
-} // namespace dbtools::param
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 6045b0f3123c..a5efdd2a0e6a 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -45,7 +45,7 @@ namespace
}
namespace connectivity::evoab
- {
+{
static sal_Int32 const s_nCOLUMN_SIZE = 256;
static sal_Int32 const s_nDECIMAL_DIGITS = 0;
static sal_Int32 const s_nNULLABLE = 1;
@@ -236,7 +236,7 @@ namespace connectivity::evoab
}
- }
+}
OEvoabDatabaseMetaData::OEvoabDatabaseMetaData(OEvoabConnection* _pCon)
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index a3fd14970b22..daacdbf7aac8 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -39,7 +39,7 @@
#include <algorithm>
namespace connectivity::file
- {
+{
using namespace dbtools;
@@ -704,7 +704,7 @@ void OStatement_Base::parseParamterElem(const OUString& /*_sColumnName*/,OSQLPar
// do nothing here
}
- }// namespace connectivity
+}// namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 823c76ef3f6e..aa6f0d9d5c57 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -45,14 +45,14 @@ using namespace ::osl;
using namespace connectivity::firebird;
namespace connectivity::firebird
- {
+{
Reference< XInterface > FirebirdDriver_CreateInstance(
const Reference< XMultiServiceFactory >& _rxFactory)
{
SAL_INFO("connectivity.firebird", "FirebirdDriver_CreateInstance()" );
return *(new FirebirdDriver(comphelper::getComponentContext(_rxFactory)));
}
- }
+}
// Static const variables
namespace {
@@ -228,7 +228,7 @@ uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByUR
}
namespace connectivity::firebird
- {
+{
void checkDisposed(bool _bThrow)
{
if (_bThrow)
@@ -236,7 +236,7 @@ namespace connectivity::firebird
}
- } // namespace connectivity
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 0d49ce333575..598ef060bc4c 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -29,7 +29,7 @@
#include <algorithm>
namespace connectivity::hsqldb
- {
+{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -354,8 +354,7 @@ namespace connectivity::hsqldb
env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr());
}
- }
-// namespace connectivity
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 4ecf06640096..7858230b07f6 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -25,12 +25,12 @@ using namespace com::sun::star::sdbc;
namespace connectivity::mork
- {
+{
static sal_Int32 const s_nCOLUMN_SIZE = 256;
static sal_Int32 const s_nDECIMAL_DIGITS = 0;
static sal_Int32 const s_nNULLABLE = 1;
static sal_Int32 const s_nCHAR_OCTET_LENGTH = 65535;
- }
+}
ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon)
: ::connectivity::ODatabaseMetaDataBase(_pCon,_pCon->getConnectionInfo())
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
index ab9f370989e0..4dd9110a6f0f 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
@@ -23,7 +23,7 @@
#include "MNSINIParser.hxx"
namespace connectivity::mozab
- {
+{
ProfileStruct::ProfileStruct()
{
}
@@ -203,7 +203,7 @@ namespace connectivity::mozab
ProductStruct &rProduct = m_ProductProfileList[index];
return rProduct.mProfileList.find(profileName) != rProduct.mProfileList.end();
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx b/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx
index d58ac07d55ca..c7c88d03ebe6 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx
@@ -134,7 +134,6 @@ void checkDisposed(bool _bThrow)
throw DisposedException();
}
}
-
-} /* connectivity */
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index f6432dbf57cf..47576954a8f2 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -23,7 +23,7 @@
#include <odbc/OFunctions.hxx>
namespace connectivity::odbc
- {
+{
namespace {
class ORealOdbcDriver : public ODBCDriver
@@ -287,6 +287,6 @@ SQLHANDLE ORealOdbcDriver::EnvironmentHandle(OUString &_rPath)
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WCatalog.cxx b/connectivity/source/drivers/writer/WCatalog.cxx
index 5f9ba6b36f75..8671af7bd5d9 100644
--- a/connectivity/source/drivers/writer/WCatalog.cxx
+++ b/connectivity/source/drivers/writer/WCatalog.cxx
@@ -55,6 +55,6 @@ void OWriterCatalog::refreshTables()
m_pTables = std::make_unique<OWriterTables>(m_xMetaData, *this, m_aMutex, aVector);
}
-} // namespace connectivity
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx
index 7940d231bbf7..c4cc699e4ad2 100644
--- a/connectivity/source/drivers/writer/WConnection.cxx
+++ b/connectivity/source/drivers/writer/WConnection.cxx
@@ -243,6 +243,6 @@ uno::Reference<sdbc::XPreparedStatement>
return nullptr;
}
-} // namespace connectivity
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
index 32bec31e5ec4..0c2e7129ed5c 100644
--- a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
@@ -106,6 +106,6 @@ uno::Reference<sdbc::XResultSet> SAL_CALL OWriterDatabaseMetaData::getTables(
return xRef;
}
-} // namespace connectivity
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WDriver.cxx b/connectivity/source/drivers/writer/WDriver.cxx
index fd285ff9bff2..63dc1f3f483d 100644
--- a/connectivity/source/drivers/writer/WDriver.cxx
+++ b/connectivity/source/drivers/writer/WDriver.cxx
@@ -75,6 +75,6 @@ ODriver::getPropertyInfo(const OUString& url, const uno::Sequence<beans::Propert
return uno::Sequence<sdbc::DriverPropertyInfo>();
}
-} // namespace connectivity
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx
index 1c0b5d501699..118a098f9619 100644
--- a/connectivity/source/drivers/writer/WTable.cxx
+++ b/connectivity/source/drivers/writer/WTable.cxx
@@ -251,6 +251,6 @@ bool OWriterTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool
return true;
}
-} // namespace connectivity
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/writer/WTables.cxx b/connectivity/source/drivers/writer/WTables.cxx
index bfbe6f82c134..15dc9e0c1941 100644
--- a/connectivity/source/drivers/writer/WTables.cxx
+++ b/connectivity/source/drivers/writer/WTables.cxx
@@ -40,6 +40,6 @@ sdbcx::ObjectType OWriterTables::createObject(const OUString& rName)
return xRet;
}
-} // namespace connectivity
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx
index a8c409f6081f..8a32a1b58b39 100644
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
@@ -26,7 +26,7 @@
#include <algorithm>
namespace connectivity::sdbcx
- {
+{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
@@ -122,7 +122,7 @@ namespace connectivity::sdbcx
return aTypes.getTypes();
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index b427142a874a..8040c9a018c0 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -39,7 +39,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
namespace
{
@@ -214,6 +214,6 @@ namespace cppcanvas::internal
rCanvas,
rState );
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
index afaa100dce8f..8d63d30a335a 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
@@ -30,7 +30,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
CachedPrimitiveBase::CachedPrimitiveBase( const CanvasSharedPtr& rCanvas,
bool bOnlyRedrawWithSameTransform ) :
mpCanvas( rCanvas ),
@@ -76,6 +76,6 @@ namespace cppcanvas::internal
return renderPrimitive( mxCachedPrimitive,
rTransformation );
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index ca5b531138c7..14e3981547d5 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -229,7 +229,7 @@ namespace
}
namespace cppcanvas::internal
- {
+{
// state stack manipulators
void VectorOfOutDevStates::clearStateStack()
@@ -3069,6 +3069,6 @@ namespace cppcanvas::internal
return false;
}
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index ba479ddc9e9e..066a2e0052f1 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.cxx
@@ -37,7 +37,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
namespace
{
class LineAction : public Action
@@ -149,6 +149,6 @@ namespace cppcanvas::internal
rState);
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index 67e3fad6f720..f043162ee9f2 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.cxx
@@ -37,7 +37,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::tools
- {
+{
void initRenderState( rendering::RenderState& renderState,
const ::cppcanvas::internal::OutDevState& outdevState )
{
@@ -666,6 +666,6 @@ namespace cppcanvas::tools
createUnderlinePolyPolygon(rUnderlinePolyPoly, aStartPos, rLineWidth, rTextLineInfo);
createStrikeoutPolyPolygon(rStrikeoutPolyPoly, aStartPos, rLineWidth, rTextLineInfo);
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index 67e2af712cd4..0f2340d9ae74 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.cxx
@@ -38,7 +38,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
namespace
{
class PointAction : public Action
@@ -168,6 +168,6 @@ namespace cppcanvas::internal
{
return std::make_shared<PointAction>( rPoint, rCanvas, rState, rColor );
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 5f570d662bfc..6d679cbd0a81 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -39,7 +39,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
namespace
{
class PolyPolyAction : public CachedPrimitiveBase
@@ -500,6 +500,6 @@ namespace cppcanvas::internal
nTransparency );
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index c6acfb330a11..277dc4e0d692 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -50,7 +50,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
namespace
{
void init( rendering::RenderState& o_rRenderState,
@@ -2311,6 +2311,6 @@ namespace cppcanvas::internal
}
return ret;
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 5636b7608109..5512c0bdbf7d 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -57,7 +57,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
// free support functions
// ======================
namespace
@@ -471,6 +471,6 @@ namespace cppcanvas::internal
rState );
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx
index a233eda34453..2ccc1f0cbae5 100644
--- a/cppcanvas/source/tools/canvasgraphichelper.cxx
+++ b/cppcanvas/source/tools/canvasgraphichelper.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star;
/* Implementation of CanvasGraphicHelper class */
namespace cppcanvas::internal
- {
+{
CanvasGraphicHelper::CanvasGraphicHelper( const CanvasSharedPtr& rParentCanvas ) :
maClipPolyPolygon(),
mpCanvas( rParentCanvas )
@@ -83,6 +83,6 @@ namespace cppcanvas::internal
maRenderState.CompositeOperation = aOp;
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/tools/tools.cxx b/cppcanvas/source/tools/tools.cxx
index 5813851e0065..a41f40b145c3 100644
--- a/cppcanvas/source/tools/tools.cxx
+++ b/cppcanvas/source/tools/tools.cxx
@@ -24,7 +24,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::tools
- {
+{
uno::Sequence< double > intSRGBAToDoubleSequence( IntSRGBA aColor )
{
uno::Sequence< double > aRes( 4 );
@@ -44,6 +44,6 @@ namespace cppcanvas::tools
static_cast<sal_uInt8>( 255*rColor[2] + .5 ),
static_cast<sal_uInt8>( 255*rColor[3] + .5 ) );
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx
index f7465e5d7188..8ce319539523 100644
--- a/cppcanvas/source/wrapper/implbitmap.cxx
+++ b/cppcanvas/source/wrapper/implbitmap.cxx
@@ -27,7 +27,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
ImplBitmap::ImplBitmap( const CanvasSharedPtr& rParentCanvas,
const uno::Reference< rendering::XBitmap >& rBitmap ) :
@@ -106,6 +106,6 @@ namespace cppcanvas::internal
{
return mxBitmap;
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
index c4751d2923eb..bb34f8e5aa3c 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
@@ -29,7 +29,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
ImplBitmapCanvas::ImplBitmapCanvas( const uno::Reference< rendering::XBitmapCanvas >& rCanvas ) :
ImplCanvas( rCanvas ),
mxBitmapCanvas( rCanvas ),
@@ -54,6 +54,6 @@ namespace cppcanvas::internal
{
return std::make_shared<ImplBitmapCanvas>( *this );
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index da7eda676347..3a186404ce2e 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.cxx
@@ -32,7 +32,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
ImplCanvas::ImplCanvas( const uno::Reference< rendering::XCanvas >& xCanvas ) :
maViewState(),
@@ -111,6 +111,6 @@ namespace cppcanvas::internal
return maViewState;
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx
index 624c15dee7e1..e30adf085374 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.cxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.cxx
@@ -26,7 +26,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
ImplCustomSprite::ImplCustomSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas,
const uno::Reference< rendering::XCustomSprite >& rSprite,
const ImplSpriteCanvas::TransformationArbiterSharedPtr& rTransformArbiter ) :
@@ -65,6 +65,6 @@ namespace cppcanvas::internal
return mpLastCanvas;
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx
index a7d1124e61fb..1e8fc7c8b5f5 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
ImplPolyPolygon::ImplPolyPolygon( const CanvasSharedPtr& rParentCanvas,
const uno::Reference< rendering::XPolyPolygon2D >& rPolyPoly ) :
CanvasGraphicHelper( rParentCanvas ),
@@ -130,6 +130,6 @@ namespace cppcanvas::internal
return mxPolyPoly;
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx
index 432a393a82dc..a7458d27a05a 100644
--- a/cppcanvas/source/wrapper/implsprite.cxx
+++ b/cppcanvas/source/wrapper/implsprite.cxx
@@ -28,7 +28,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
ImplSprite::ImplSprite( const uno::Reference< rendering::XSpriteCanvas >& rParentCanvas,
const uno::Reference< rendering::XSprite >& rSprite,
@@ -185,6 +185,6 @@ namespace cppcanvas::internal
if( mxSprite.is() )
mxSprite->setPriority(fPriority);
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx
index a33615eb9ef3..65b36077bae8 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.cxx
@@ -28,7 +28,7 @@
using namespace ::com::sun::star;
namespace cppcanvas::internal
- {
+{
ImplSpriteCanvas::TransformationArbiter::TransformationArbiter() :
maTransformation()
{
@@ -103,6 +103,6 @@ namespace cppcanvas::internal
return mxSpriteCanvas;
}
- }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
index cc28d21b4f15..2216b071ae04 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -142,7 +142,7 @@ namespace dbaccess
return bSuccess;
}
- }
+}
} // namespace dbaccess
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 2a578393be05..c07e093869d3 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -217,7 +217,7 @@ void LimitBoxController::dispatchCommand(
}
}
-} ///dbaui namespace
+} // dbaui namespace
extern "C" void createRegistryInfo_LimitBoxController()
{
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 35d94b1ded56..e4708c4131b4 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -70,13 +70,13 @@ namespace drawinglayer::unorenderer
};
}
- } // end of namespace drawinglayer
+} // end of namespace drawinglayer::unorenderer
// uno functions
namespace drawinglayer::unorenderer
- {
+{
uno::Sequence< OUString > XPrimitive2DRenderer_getSupportedServiceNames()
{
return { "com.sun.star.graphic.Primitive2DTools" };
@@ -91,11 +91,11 @@ namespace drawinglayer::unorenderer
{
return static_cast< ::cppu::OWeakObject* >(new XPrimitive2DRenderer);
}
- } // end of namespace drawinglayer
+} // end of namespace drawinglayer::unorenderer
namespace drawinglayer::unorenderer
- {
+{
XPrimitive2DRenderer::XPrimitive2DRenderer()
{
}
diff --git a/drawinglayer/source/geometry/viewinformation2d.cxx b/drawinglayer/source/geometry/viewinformation2d.cxx
index 7dd74bd112ce..c5c053e07aff 100644
--- a/drawinglayer/source/geometry/viewinformation2d.cxx
+++ b/drawinglayer/source/geometry/viewinformation2d.cxx
@@ -387,11 +387,11 @@ namespace drawinglayer::geometry
&& mxExtendedInformation == rCandidate.mxExtendedInformation);
}
};
- } // end of namespace drawinglayer
+} // end of namespace drawinglayer::geometry
namespace drawinglayer::geometry
- {
+{
namespace
{
struct theGlobalDefault :
diff --git a/drawinglayer/source/geometry/viewinformation3d.cxx b/drawinglayer/source/geometry/viewinformation3d.cxx
index 879a85f94ef4..f59a88fa0071 100644
--- a/drawinglayer/source/geometry/viewinformation3d.cxx
+++ b/drawinglayer/source/geometry/viewinformation3d.cxx
@@ -412,11 +412,11 @@ namespace drawinglayer::geometry
&& mxExtendedInformation == rCandidate.mxExtendedInformation);
}
};
- } // end of namespace drawinglayer
+} // end of namespace drawinglayer::geometry
namespace drawinglayer::geometry
- {
+{
namespace
{
struct theGlobalDefault :
diff --git a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
index 82f11460c581..19e586359395 100644
--- a/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/animatedprimitive2d.cxx
@@ -83,11 +83,11 @@ namespace drawinglayer::primitive2d
// provide unique ID
ImplPrimitive2DIDBlock(AnimatedSwitchPrimitive2D, PRIMITIVE2D_ID_ANIMATEDSWITCHPRIMITIVE2D)
- } // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
namespace drawinglayer::primitive2d
- {
+{
AnimatedBlinkPrimitive2D::AnimatedBlinkPrimitive2D(
const animation::AnimationEntry& rAnimationEntry,
const Primitive2DContainer& rChildren)
@@ -111,11 +111,11 @@ namespace drawinglayer::primitive2d
// provide unique ID
ImplPrimitive2DIDBlock(AnimatedBlinkPrimitive2D, PRIMITIVE2D_ID_ANIMATEDBLINKPRIMITIVE2D)
- } // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
namespace drawinglayer::primitive2d
- {
+{
AnimatedInterpolatePrimitive2D::AnimatedInterpolatePrimitive2D(
const std::vector< basegfx::B2DHomMatrix >& rmMatrixStack,
const animation::AnimationEntry& rAnimationEntry,
diff --git a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
index e66f76ce9785..b6b85390a711 100644
--- a/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/svggradientprimitive2d.cxx
@@ -302,11 +302,11 @@ namespace drawinglayer::primitive2d
&& getSpreadMethod() == rCompare.getSpreadMethod());
}
- } // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
namespace drawinglayer::primitive2d
- {
+{
void SvgLinearGradientPrimitive2D::checkPreconditions()
{
// call parent
@@ -574,11 +574,11 @@ namespace drawinglayer::primitive2d
// provide unique ID
ImplPrimitive2DIDBlock(SvgLinearGradientPrimitive2D, PRIMITIVE2D_ID_SVGLINEARGRADIENTPRIMITIVE2D)
- } // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
namespace drawinglayer::primitive2d
- {
+{
void SvgRadialGradientPrimitive2D::checkPreconditions()
{
// call parent
@@ -875,13 +875,13 @@ namespace drawinglayer::primitive2d
// provide unique ID
ImplPrimitive2DIDBlock(SvgRadialGradientPrimitive2D, PRIMITIVE2D_ID_SVGRADIALGRADIENTPRIMITIVE2D)
- } // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
// SvgLinearAtomPrimitive2D class
namespace drawinglayer::primitive2d
- {
+{
void SvgLinearAtomPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
const double fDelta(getOffsetB() - getOffsetA());
@@ -960,13 +960,13 @@ namespace drawinglayer::primitive2d
// provide unique ID
ImplPrimitive2DIDBlock(SvgLinearAtomPrimitive2D, PRIMITIVE2D_ID_SVGLINEARATOMPRIMITIVE2D)
- } // end of namespace drawinglayer
+} // end of namespace drawinglayer::primitive2d
// SvgRadialAtomPrimitive2D class
namespace drawinglayer::primitive2d
- {
+{
void SvgRadialAtomPrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
const double fDeltaScale(getScaleB() - getScaleA());
diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx
index 30d5591fadf0..d257be6dace7 100644
--- a/oox/source/core/binarycodec.cxx
+++ b/oox/source/core/binarycodec.cxx
@@ -38,6 +38,6 @@ sal_uInt16 CodecHelper::getPasswordHash( const AttributeList& rAttribs, sal_Int3
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/core/contexthandler.cxx b/oox/source/core/contexthandler.cxx
index a68d51951770..6eef9029a7d2 100644
--- a/oox/source/core/contexthandler.cxx
+++ b/oox/source/core/contexthandler.cxx
@@ -128,6 +128,6 @@ void ContextHandler::endRecord( sal_Int32 )
{
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index ef6075428554..a63a9b6ba1a5 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -256,6 +256,6 @@ void ContextHandler2::onEndRecord()
{
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx
index f8aed31f32c3..8268b9bb6277 100644
--- a/oox/source/core/fastparser.cxx
+++ b/oox/source/core/fastparser.cxx
@@ -136,6 +136,6 @@ void FastParser::parseStream( StorageBase& rStorage, const OUString& rStreamName
parseStream( rStorage.openInputStream( rStreamName ), rStreamName );
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx
index 9b3345acb82b..d6639136b3ca 100644
--- a/oox/source/core/fasttokenhandler.cxx
+++ b/oox/source/core/fasttokenhandler.cxx
@@ -71,7 +71,7 @@ sal_Int32 FastTokenHandler::getTokenDirect( const char *pToken, sal_Int32 nLengt
return mrTokenMap.getTokenFromUTF8( pToken, nLength );
}
-} // namespace oox
+} // namespace oox::core
extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
com_sun_star_comp_oox_core_FastTokenHandler_get_implementation(
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 6e63a5653e7b..0cb7f2a264b1 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -578,6 +578,6 @@ bool FilterBase::isExportTemplate() const
return mxImpl->mbExportTemplate;
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 7581b40f332b..b76ed613d95c 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -432,7 +432,7 @@ OUString SAL_CALL FilterDetect::detect( Sequence< PropertyValue >& rMediaDescSeq
return aFilterName;
}
-} // namespace oox
+} // namespace oox::core
extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
com_sun_star_comp_oox_FormatDetector_get_implementation(uno::XComponentContext* pCtx,
diff --git a/oox/source/core/fragmenthandler.cxx b/oox/source/core/fragmenthandler.cxx
index 1036d0e4d116..22319fda6e85 100644
--- a/oox/source/core/fragmenthandler.cxx
+++ b/oox/source/core/fragmenthandler.cxx
@@ -114,6 +114,6 @@ const RecordInfo* FragmentHandler::getRecordInfos() const
return nullptr;
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx
index 1f8ef418cb34..3e6112820bad 100644
--- a/oox/source/core/fragmenthandler2.cxx
+++ b/oox/source/core/fragmenthandler2.cxx
@@ -216,6 +216,6 @@ void FragmentHandler2::finalizeImport()
{
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index c8f33fd1552e..d5a9a9866f13 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -153,7 +153,7 @@ void ContextStack::popContext()
}
}
-} // namespace prv
+} // namespace oox::core::prv
namespace {
@@ -322,6 +322,6 @@ const RecordInfo* RecordParser::getEndRecordInfo( sal_Int32 nRecId ) const
return (aIt == maEndMap.end()) ? nullptr : &aIt->second;
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index e7442fd9ebb7..6f443abcf3b4 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -148,6 +148,6 @@ OUString Relations::getFragmentPathFromFirstTypeFromOfficeDoc( const OUString& r
return pRelation ? getFragmentPathFromRelation( *pRelation ) : OUString();
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx
index ff604602db7a..6e80a0834dab 100644
--- a/oox/source/core/relationshandler.cxx
+++ b/oox/source/core/relationshandler.cxx
@@ -91,6 +91,6 @@ Reference< XFastContextHandler > RelationsFragment::createFastChildContext(
return xRet;
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index f381beb3aec4..3957f51cca1f 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -1140,6 +1140,6 @@ void XmlFilterBase::exportCustomFragments()
}
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx
index c544b53441a0..5f0f9aab5653 100644
--- a/oox/source/crypto/AgileEngine.cxx
+++ b/oox/source/crypto/AgileEngine.cxx
@@ -819,6 +819,6 @@ void AgileEngine::encrypt(css::uno::Reference<css::io::XInputStream> & rxInputS
encryptHmacValue();
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index e55c0849f2bc..30832eb6bc16 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -480,6 +480,6 @@ std::vector<sal_uInt8> CryptoHash::finalize()
return aHash;
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index a7806f8d32cb..a90bdada7bc9 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -110,6 +110,6 @@ bool DocumentDecryption::decrypt(const uno::Reference<io::XStream>& xDocumentStr
return bResult;
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/crypto/DocumentEncryption.cxx b/oox/source/crypto/DocumentEncryption.cxx
index c32c184db31a..13019246514f 100644
--- a/oox/source/crypto/DocumentEncryption.cxx
+++ b/oox/source/crypto/DocumentEncryption.cxx
@@ -67,6 +67,6 @@ bool DocumentEncryption::encrypt()
return true;
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx
index 1113542d886d..c3b23aa426d5 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -317,6 +317,6 @@ bool Standard2007Engine::readEncryptionInfo(css::uno::Reference<css::io::XInputS
return !aBinaryStream.isEof();
}
-} // namespace oox
+} // namespace oox::core
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index cb1870f799f5..15bf005e84a4 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -684,6 +684,6 @@ void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars )
}
}
-} // namespace oox
+} // namespace oox::docprop
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx
index 5377c55099d6..6a222b4cf0c6 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -159,7 +159,7 @@ void SAL_CALL DocumentPropertiesImport::importProperties(
}
}
-} // namespace oox
+} // namespace oox::docprop
extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
com_sun_star_comp_oox_docprop_DocumentPropertiesImporter_get_implementation(
diff --git a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
index 730348ee33f1..45ccbdf44804 100644
--- a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
+++ b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
@@ -43,6 +43,6 @@ ContextHandlerRef ThemeOverrideFragmentHandler::onCreateContext( sal_Int32 nElem
return nullptr;
}
-} // namespace oox
+} // namespace oox::drawingml
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/axiscontext.cxx b/oox/source/drawingml/chart/axiscontext.cxx
index 11127b3f7c38..b90857785e32 100644
--- a/oox/source/drawingml/chart/axiscontext.cxx
+++ b/oox/source/drawingml/chart/axiscontext.cxx
@@ -293,6 +293,6 @@ ContextHandlerRef ValAxisContext::onCreateContext( sal_Int32 nElement, const Att
return AxisContextBase::onCreateContext( nElement, rAttribs );
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx
index 1fd55d4afc23..a5b2d5542160 100644
--- a/oox/source/drawingml/chart/axismodel.cxx
+++ b/oox/source/drawingml/chart/axismodel.cxx
@@ -57,6 +57,6 @@ AxisModel::~AxisModel()
{
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/chartcontextbase.cxx b/oox/source/drawingml/chart/chartcontextbase.cxx
index 410a1ad9d39c..5423c52b3d35 100644
--- a/oox/source/drawingml/chart/chartcontextbase.cxx
+++ b/oox/source/drawingml/chart/chartcontextbase.cxx
@@ -102,6 +102,6 @@ ContextHandlerRef LayoutContext::onCreateContext( sal_Int32 nElement, const Attr
return nullptr;
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/chartconverter.cxx b/oox/source/drawingml/chart/chartconverter.cxx
index fa78d0f22166..e75b1c09c866 100644
--- a/oox/source/drawingml/chart/chartconverter.cxx
+++ b/oox/source/drawingml/chart/chartconverter.cxx
@@ -152,6 +152,6 @@ Reference< XDataSequence > ChartConverter::createDataSequence(
return nullptr;
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx b/oox/source/drawingml/chart/chartdrawingfragment.cxx
index add6faa0912a..af20cd292368 100644
--- a/oox/source/drawingml/chart/chartdrawingfragment.cxx
+++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx
@@ -228,6 +228,6 @@ void ChartDrawingFragment::onEndElement()
}
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index d9376064f804..ade046ef08e8 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -290,6 +290,6 @@ void ChartSpaceConverter::convertFromModel( const Reference< XShapes >& rxExtern
}
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx b/oox/source/drawingml/chart/chartspacefragment.cxx
index 129dbd7cff9c..4d5d9158567f 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -119,6 +119,6 @@ ContextHandlerRef ChartSpaceFragment::onCreateContext( sal_Int32 nElement, const
return nullptr;
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/chartspacemodel.cxx b/oox/source/drawingml/chart/chartspacemodel.cxx
index afdaf41dd19d..3aa7366ff82e 100644
--- a/oox/source/drawingml/chart/chartspacemodel.cxx
+++ b/oox/source/drawingml/chart/chartspacemodel.cxx
@@ -36,6 +36,6 @@ ChartSpaceModel::~ChartSpaceModel()
{
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx
index c79578b62411..9c69b723ec8c 100644
--- a/oox/source/drawingml/chart/datasourcecontext.cxx
+++ b/oox/source/drawingml/chart/datasourcecontext.cxx
@@ -299,6 +299,6 @@ ContextHandlerRef DataSourceContext::onCreateContext( sal_Int32 nElement, const
return nullptr;
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/datasourceconverter.cxx b/oox/source/drawingml/chart/datasourceconverter.cxx
index 0f72da69a9c5..72399426538d 100644
--- a/oox/source/drawingml/chart/datasourceconverter.cxx
+++ b/oox/source/drawingml/chart/datasourceconverter.cxx
@@ -97,6 +97,6 @@ Reference< XDataSequence > DataSourceConverter::createDataSequence( const OUStri
return xDataSeq;
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/datasourcemodel.cxx b/oox/source/drawingml/chart/datasourcemodel.cxx
index 92409d432df5..e83b6b3558a5 100644
--- a/oox/source/drawingml/chart/datasourcemodel.cxx
+++ b/oox/source/drawingml/chart/datasourcemodel.cxx
@@ -39,6 +39,6 @@ DataSourceModel::~DataSourceModel()
{
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/modelbase.cxx b/oox/source/drawingml/chart/modelbase.cxx
index 0e959403929a..feb5b9aed251 100644
--- a/oox/source/drawingml/chart/modelbase.cxx
+++ b/oox/source/drawingml/chart/modelbase.cxx
@@ -53,6 +53,6 @@ LayoutModel::~LayoutModel()
{
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx
index bbda258abfe3..f4a9dc9d4102 100644
--- a/oox/source/drawingml/chart/plotareacontext.cxx
+++ b/oox/source/drawingml/chart/plotareacontext.cxx
@@ -201,6 +201,6 @@ ContextHandlerRef PlotAreaContext::onCreateContext( sal_Int32 nElement, const At
return nullptr;
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/plotareamodel.cxx b/oox/source/drawingml/chart/plotareamodel.cxx
index cff935bca3d0..72abacc20570 100644
--- a/oox/source/drawingml/chart/plotareamodel.cxx
+++ b/oox/source/drawingml/chart/plotareamodel.cxx
@@ -59,6 +59,6 @@ PlotAreaModel::~PlotAreaModel()
{
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/seriesmodel.cxx b/oox/source/drawingml/chart/seriesmodel.cxx
index 3a9f3f64c412..563e0e48e3bf 100644
--- a/oox/source/drawingml/chart/seriesmodel.cxx
+++ b/oox/source/drawingml/chart/seriesmodel.cxx
@@ -124,6 +124,6 @@ SeriesModel::~SeriesModel()
{
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx
index 36bf48c8d375..955fc2ac50be 100644
--- a/oox/source/drawingml/chart/titlecontext.cxx
+++ b/oox/source/drawingml/chart/titlecontext.cxx
@@ -175,6 +175,6 @@ ContextHandlerRef LegendContext::onCreateContext( sal_Int32 nElement, const Attr
return nullptr;
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx
index 115589105584..a6623aa1ed49 100644
--- a/oox/source/drawingml/chart/titleconverter.cxx
+++ b/oox/source/drawingml/chart/titleconverter.cxx
@@ -342,6 +342,6 @@ void LegendConverter::legendEntriesFormatting(const Reference<XDiagram>& rxDiagr
}
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/titlemodel.cxx b/oox/source/drawingml/chart/titlemodel.cxx
index 73709db0ac37..ff1891d02f8d 100644
--- a/oox/source/drawingml/chart/titlemodel.cxx
+++ b/oox/source/drawingml/chart/titlemodel.cxx
@@ -60,6 +60,6 @@ LegendModel::~LegendModel()
{
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/typegroupcontext.cxx b/oox/source/drawingml/chart/typegroupcontext.cxx
index 9bea7540e234..b41169229451 100644
--- a/oox/source/drawingml/chart/typegroupcontext.cxx
+++ b/oox/source/drawingml/chart/typegroupcontext.cxx
@@ -367,6 +367,6 @@ ContextHandlerRef SurfaceTypeGroupContext::onCreateContext( sal_Int32 nElement,
return nullptr;
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/chart/typegroupmodel.cxx b/oox/source/drawingml/chart/typegroupmodel.cxx
index 2fdd3c488680..e109d89b913d 100644
--- a/oox/source/drawingml/chart/typegroupmodel.cxx
+++ b/oox/source/drawingml/chart/typegroupmodel.cxx
@@ -63,6 +63,6 @@ TypeGroupModel::~TypeGroupModel()
{
}
-} // namespace oox
+} // namespace oox::drawingml::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx
index 6d08c7b18963..0a4c627833ee 100644
--- a/oox/source/drawingml/colorchoicecontext.cxx
+++ b/oox/source/drawingml/colorchoicecontext.cxx
@@ -148,6 +148,6 @@ ColorContext::ColorContext( ContextHandler2Helper const & rParent, Color& rColor
return nullptr;
}
-} // namespace oox
+} // namespace oox::drawingml
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/diagram/datamodel.cxx b/oox/source/drawingml/diagram/datamodel.cxx
index 90e10010b897..c6f20ae9fa53 100644
--- a/oox/source/drawingml/diagram/datamodel.cxx
+++ b/oox/source/drawingml/diagram/datamodel.cxx
@@ -57,7 +57,7 @@ void Point::dump() const
<< msModelId << ", type " << mnType);
}
-} // dgm namespace
+} // oox::drawingml::dgm namespace
DiagramData::DiagramData() :
mpFillProperties( std::make_shared<FillProperties>() )
diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx
index be9c3832fa64..a6c8b66efba2 100644
--- a/oox/source/drawingml/drawingmltypes.cxx
+++ b/oox/source/drawingml/drawingmltypes.cxx
@@ -397,6 +397,6 @@ IndexRange GetIndexRange( const Reference< XFastAttributeList >& xAttributes )
return range;
}
-} // namespace oox
+} // namespace oox::drawingml
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx
index ff50919646c6..2ca45bae05a8 100644
--- a/oox/source/drawingml/effectproperties.cxx
+++ b/oox/source/drawingml/effectproperties.cxx
@@ -91,6 +91,6 @@ css::beans::PropertyValue Effect::getEffect()
return aRet;
}
-} // namespace oox
+} // namespace oox::drawingml
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index f85202afcaa8..0b81825086c8 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -311,6 +311,6 @@ ContextHandlerRef ChartGraphicDataContext::onCreateContext( ::sal_Int32 nElement
return nullptr;
}
-} // namespace oox
+} // namespace oox::drawingml
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx
index 9e5631eb7b38..c58e8fb9b7e5 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -163,6 +163,6 @@ ContextHandlerRef HyperLinkContext::onCreateContext(
return this;
}
-} // namespace oox
+} // namespace oox::drawingml
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/misccontexts.cxx b/oox/source/drawingml/misccontexts.cxx
index b54cda58a329..7ee6d25911f3 100644
--- a/oox/source/drawingml/misccontexts.cxx
+++ b/oox/source/drawingml/misccontexts.cxx
@@ -378,6 +378,6 @@ ContextHandlerRef ArtisticEffectContext::onCreateContext(
return nullptr;
}
-} // namespace oox
+} // namespace oox::drawingml
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/shapepropertymap.cxx b/oox/source/drawingml/shapepropertymap.cxx
index 3cecae3f9e9b..b018aa41828f 100644
--- a/oox/source/drawingml/shapepropertymap.cxx
+++ b/oox/source/drawingml/shapepropertymap.cxx
@@ -230,6 +230,6 @@ bool ShapePropertyMap::setFillBitmapName(const Any& rValue)
return false;
}
-} // namespace oox
+} // namespace oox::drawingml
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx b/oox/source/drawingml/table/tablestylelistfragmenthandler.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list