include/basegfx/polygon/b2dpolypolygontools.hxx | 2
include/basegfx/polygon/b3dpolypolygontools.hxx | 2
include/basegfx/utils/canvastools.hxx | 12 +-
include/basegfx/utils/keystoplerp.hxx | 4
include/canvas/canvastools.hxx | 16 +--
include/codemaker/commoncpp.hxx | 4
include/codemaker/commonjava.hxx | 4
include/comphelper/SelectionMultiplex.hxx | 2
include/comphelper/accessibleeventnotifier.hxx | 8 -
include/comphelper/accessibletexthelper.hxx | 6 -
include/comphelper/accessiblewrapper.hxx | 2
include/comphelper/anytostring.hxx | 2
include/comphelper/base64.hxx | 2
include/comphelper/basicio.hxx | 2
include/comphelper/configuration.hxx | 4
include/comphelper/configurationhelper.hxx | 4
include/comphelper/configurationlistener.hxx | 4
include/comphelper/dispatchcommand.hxx | 6 -
include/comphelper/docpasswordhelper.hxx | 6 -
include/comphelper/docpasswordrequest.hxx | 2
include/comphelper/documentinfo.hxx | 4
include/comphelper/embeddedobjectcontainer.hxx | 12 +-
include/comphelper/eventattachermgr.hxx | 4
include/comphelper/genericpropertyset.hxx | 2
include/comphelper/getexpandeduri.hxx | 7 -
include/comphelper/interfacecontainer2.hxx | 2
include/comphelper/listenernotification.hxx | 2
include/comphelper/logging.hxx | 4
include/comphelper/mimeconfighelper.hxx | 14 +--
include/comphelper/namecontainer.hxx | 2
include/comphelper/numberedcollection.hxx | 2
include/comphelper/numbers.hxx | 4
include/comphelper/ofopxmlhelper.hxx | 10 +-
include/comphelper/processfactory.hxx | 7 -
include/comphelper/property.hxx | 2
include/comphelper/propertycontainer.hxx | 4
include/comphelper/propmultiplex.hxx | 4
include/comphelper/proxyaggregation.hxx | 8 -
include/comphelper/sequenceashashmap.hxx | 4
include/comphelper/simplefileaccessinteraction.hxx | 4
include/comphelper/stl_types.hxx | 2
include/comphelper/storagehelper.hxx | 4
include/comphelper/streamsection.hxx | 6 -
include/comphelper/string.hxx | 10 +-
include/comphelper/synchronousdispatch.hxx | 8 -
include/comphelper/types.hxx | 8 -
include/comphelper/weakeventlistener.hxx | 2
include/connectivity/dbtools.hxx | 4
include/cppcanvas/bitmap.hxx | 4
include/cppcanvas/canvas.hxx | 4
include/cppcanvas/polypolygon.hxx | 4
include/cppcanvas/spritecanvas.hxx | 4
include/cppcanvas/vclfactory.hxx | 4
include/dbaccess/IController.hxx | 4
include/dbaccess/controllerframe.hxx | 4
include/dbaccess/dataview.hxx | 4
include/dbaccess/dbaundomanager.hxx | 4
include/dbaccess/dbsubcomponentcontroller.hxx | 4
include/dbaccess/genericcontroller.hxx | 4
include/drawinglayer/attribute/fillgradientattribute.hxx | 4
include/drawinglayer/attribute/fillgraphicattribute.hxx | 4
include/drawinglayer/attribute/fillhatchattribute.hxx | 4
include/drawinglayer/attribute/fontattribute.hxx | 4
include/drawinglayer/attribute/linestartendattribute.hxx | 4
include/drawinglayer/attribute/materialattribute3d.hxx | 4
include/drawinglayer/attribute/sdrfillattribute.hxx | 4
include/drawinglayer/attribute/sdrfillgraphicattribute.hxx | 4
include/drawinglayer/attribute/sdrlightattribute3d.hxx | 4
include/drawinglayer/attribute/sdrlightingattribute3d.hxx | 4
include/drawinglayer/attribute/sdrlineattribute.hxx | 4
include/drawinglayer/attribute/sdrlinestartendattribute.hxx | 4
include/drawinglayer/attribute/sdrobjectattribute3d.hxx | 4
include/drawinglayer/attribute/sdrsceneattribute3d.hxx | 4
include/drawinglayer/attribute/sdrshadowattribute.hxx | 4
include/drawinglayer/geometry/viewinformation3d.hxx | 4
include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx | 2
include/drawinglayer/primitive2d/textbreakuphelper.hxx | 2
include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx | 4
include/drawinglayer/primitive2d/textlayoutdevice.hxx | 4
include/drawinglayer/primitive3d/baseprimitive3d.hxx | 8 -
include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx | 4
include/drawinglayer/processor2d/hittestprocessor2d.hxx | 2
include/drawinglayer/processor2d/objectinfoextractor2d.hxx | 2
include/drawinglayer/processor2d/processor2dtools.hxx | 4
include/drawinglayer/processor2d/processorfromoutputdevice.hxx | 6 -
include/editeng/SpellPortions.hxx | 4
include/editeng/editeng.hxx | 4
include/editeng/edtdlg.hxx | 4
include/editeng/flditem.hxx | 8 -
include/editeng/numitem.hxx | 6 -
include/editeng/outliner.hxx | 6 -
include/editeng/overflowingtxt.hxx | 7 -
include/editeng/splwrap.hxx | 4
include/editeng/unolingu.hxx | 4
include/filter/msfilter/escherex.hxx | 8 -
include/filter/msfilter/mscodec.hxx | 4
include/filter/msfilter/msdffimp.hxx | 4
include/filter/msfilter/msocximex.hxx | 5 -
include/filter/msfilter/msoleexp.hxx | 4
include/filter/msfilter/mstoolbar.hxx | 4
include/filter/msfilter/msvbahelper.hxx | 4
include/filter/msfilter/svdfppt.hxx | 4
include/filter/msfilter/util.hxx | 4
include/formula/FormulaCompiler.hxx | 4
include/formula/FormulaOpCodeMapperObj.hxx | 4
include/formula/IFunctionDescription.hxx | 4
include/formula/tokenarray.hxx | 4
include/i18nutil/casefolding.hxx | 2
include/i18nutil/paper.hxx | 2
include/i18nutil/widthfolding.hxx | 2
include/jvmaccess/classpath.hxx | 6 -
include/linguistic/lngprophelp.hxx | 10 --
include/linguistic/misc.hxx | 10 --
include/oox/core/binarycodec.hxx | 4
include/oox/core/contexthandler.hxx | 8 -
include/oox/core/contexthandler2.hxx | 8 -
include/oox/core/fastparser.hxx | 12 +-
include/oox/core/filterbase.hxx | 8 -
include/oox/core/filterdetect.hxx | 10 +-
include/oox/core/fragmenthandler.hxx | 10 +-
include/oox/core/fragmenthandler2.hxx | 8 -
include/oox/core/relationshandler.hxx | 8 -
include/oox/core/xmlfilterbase.hxx | 14 +--
include/oox/crypto/DocumentDecryption.hxx | 6 -
include/oox/crypto/DocumentEncryption.hxx | 6 -
include/oox/drawingml/chart/chartconverter.hxx | 10 +-
include/oox/drawingml/clrscheme.hxx | 4
include/oox/drawingml/connectorshapecontext.hxx | 6 -
include/oox/drawingml/diagram/diagram.hxx | 4
include/oox/drawingml/drawingmltypes.hxx | 6 -
include/oox/drawingml/graphicshapecontext.hxx | 8 -
include/oox/drawingml/shape.hxx | 16 +--
include/oox/drawingml/shapecontext.hxx | 4
include/oox/drawingml/shapegroupcontext.hxx | 4
include/oox/drawingml/theme.hxx | 6 -
include/oox/drawingml/themefragmenthandler.hxx | 2
include/oox/dump/dumperbase.hxx | 8 -
include/oox/dump/oledumper.hxx | 4
include/oox/dump/pptxdumper.hxx | 6 -
include/oox/dump/xlsbdumper.hxx | 6 -
include/oox/export/chartexport.hxx | 8 -
include/oox/export/drawingml.hxx | 4
include/oox/export/shapes.hxx | 8 -
include/oox/export/utils.hxx | 4
include/oox/export/vmlexport.hxx | 4
include/oox/helper/attributelist.hxx | 6 -
include/oox/helper/binaryinputstream.hxx | 4
include/oox/helper/binaryoutputstream.hxx | 4
include/oox/helper/binarystreambase.hxx | 4
include/oox/helper/containerhelper.hxx | 4
include/oox/helper/grabbagstack.hxx | 4
include/oox/helper/graphichelper.hxx | 4
include/oox/helper/modelobjecthelper.hxx | 4
include/oox/helper/progressbar.hxx | 4
include/oox/helper/propertymap.hxx | 4
include/oox/helper/propertyset.hxx | 4
include/oox/helper/storagebase.hxx | 4
include/oox/helper/textinputstream.hxx | 4
include/oox/helper/zipstorage.hxx | 4
include/oox/mathml/importutils.hxx | 6 -
include/oox/ole/axbinaryreader.hxx | 2
include/oox/ole/axcontrol.hxx | 4
include/oox/ole/axcontrolfragment.hxx | 2
include/oox/ole/olehelper.hxx | 4
include/oox/ole/oleobjecthelper.hxx | 4
include/oox/ole/olestorage.hxx | 4
include/oox/ole/vbacontrol.hxx | 4
include/oox/ole/vbaexport.hxx | 4
include/oox/ole/vbamodule.hxx | 4
include/oox/ole/vbaproject.hxx | 6 -
include/oox/ppt/animationspersist.hxx | 4
include/oox/ppt/backgroundproperties.hxx | 6 -
include/oox/ppt/comments.hxx | 4
include/oox/ppt/customshowlistcontext.hxx | 4
include/oox/ppt/headerfooter.hxx | 4
include/oox/ppt/layoutfragmenthandler.hxx | 6 -
include/oox/ppt/pptfilterhelpers.hxx | 8 -
include/oox/ppt/pptgraphicshapecontext.hxx | 6 -
include/oox/ppt/pptimport.hxx | 10 +-
include/oox/ppt/pptshape.hxx | 8 -
include/oox/ppt/pptshapecontext.hxx | 6 -
include/oox/ppt/pptshapegroupcontext.hxx | 4
include/oox/ppt/pptshapepropertiescontext.hxx | 4
include/oox/ppt/presentationfragmenthandler.hxx | 6 -
include/oox/ppt/slidefragmenthandler.hxx | 6 -
include/oox/ppt/slidemastertextstylescontext.hxx | 4
include/oox/ppt/slidepersist.hxx | 12 +-
include/oox/ppt/slidetimingcontext.hxx | 4
include/oox/ppt/slidetransition.hxx | 8 -
include/oox/ppt/slidetransitioncontext.hxx | 4
include/oox/ppt/soundactioncontext.hxx | 4
include/oox/ppt/timenode.hxx | 10 +-
include/oox/ppt/timenodelistcontext.hxx | 10 +-
include/oox/shape/ShapeFilterBase.hxx | 4
include/oox/vml/vmldrawing.hxx | 4
include/oox/vml/vmldrawingfragment.hxx | 6 -
include/oox/vml/vmlformatting.hxx | 4
include/oox/vml/vmlinputstream.hxx | 4
include/oox/vml/vmlshape.hxx | 4
include/oox/vml/vmlshapecontainer.hxx | 4
include/oox/vml/vmltextbox.hxx | 4
include/sax/fastattribs.hxx | 6 -
include/sax/fastparser.hxx | 10 --
include/sax/fshelper.hxx | 2
include/sax/tools/converter.hxx | 4
include/sfx2/DocumentMetadataAccess.hxx | 8 -
include/sfx2/Metadatable.hxx | 4
include/sfx2/XmlIdRegistry.hxx | 4
include/sfx2/dinfdlg.hxx | 4
include/sfx2/docinf.hxx | 4
include/sfx2/frmhtmlw.hxx | 4
include/sfx2/linkmgr.hxx | 4
include/sfx2/linksrc.hxx | 4
include/sfx2/lnkbase.hxx | 4
include/sfx2/module.hxx | 4
include/sfx2/objsh.hxx | 4
include/sfx2/sfxbasemodel.hxx | 4
include/sfx2/sidebar/AsynchronousCall.hxx | 4
include/sfx2/sidebar/Context.hxx | 4
include/sfx2/sidebar/ControllerItem.hxx | 4
include/sfx2/sidebar/Deck.hxx | 4
include/sfx2/sidebar/FocusManager.hxx | 4
include/sfx2/sidebar/IContextChangeReceiver.hxx | 4
include/sfx2/sidebar/ILayoutableWindow.hxx | 4
include/sfx2/sidebar/Panel.hxx | 4
include/sfx2/sidebar/ResourceManager.hxx | 8 -
include/sfx2/sidebar/Sidebar.hxx | 4
include/sfx2/sidebar/SidebarChildWindow.hxx | 4
include/sfx2/sidebar/SidebarController.hxx | 4
include/sfx2/sidebar/SidebarDockingWindow.hxx | 4
include/sfx2/sidebar/SidebarModelUpdate.hxx | 4
include/sfx2/sidebar/SidebarPanelBase.hxx | 4
include/sfx2/sidebar/SidebarToolBox.hxx | 4
include/sfx2/sidebar/TabBar.hxx | 4
include/sfx2/sidebar/Theme.hxx | 4
include/sfx2/templatedlg.hxx | 4
include/sfx2/viewsh.hxx | 4
include/sot/exchange.hxx | 6 -
include/sot/stg.hxx | 6 -
include/sot/storage.hxx | 6 -
include/svl/asiancfg.hxx | 4
include/svl/documentlockfile.hxx | 4
include/svl/ilstitem.hxx | 2
include/svl/instrm.hxx | 4
include/svl/outstrm.hxx | 4
include/svl/ownlist.hxx | 9 -
include/svl/sharecontrolfile.hxx | 10 +-
include/svl/sigstruct.hxx | 2
include/svl/slstitm.hxx | 2
include/svl/undo.hxx | 4
include/svl/urihelper.hxx | 4
include/svl/zforlist.hxx | 13 --
include/svl/zformat.hxx | 2
include/svtools/DocumentInfoPreview.hxx | 4
include/svtools/DocumentToGraphicRenderer.hxx | 4
include/svtools/embedhlp.hxx | 4
include/svtools/openfiledroptargetlistener.hxx | 4
include/svtools/parhtml.hxx | 4
include/svtools/restartdialog.hxx | 4
include/svtools/textwindowpeer.hxx | 4
include/svx/AccessibleControlShape.hxx | 4
include/svx/AccessibleOLEShape.hxx | 4
include/svx/AccessibleShape.hxx | 4
include/svx/AccessibleShapeInfo.hxx | 4
include/svx/AccessibleShapeTreeInfo.hxx | 4
include/svx/AccessibleTextHelper.hxx | 4
include/svx/ChildrenManager.hxx | 4
include/svx/SmartTagItem.hxx | 13 +-
include/svx/SmartTagMgr.hxx | 28 +++---
include/svx/charmap.hxx | 4
include/svx/charthelper.hxx | 4
include/svx/cube3d.hxx | 2
include/svx/dlgctrl.hxx | 4
include/svx/e3dsceneupdater.hxx | 4
include/svx/fmpage.hxx | 4
include/svx/fmshell.hxx | 4
include/svx/fmview.hxx | 8 -
include/svx/helperhittest3d.hxx | 4
include/svx/nbdtmg.hxx | 4
include/svx/nbdtmgfact.hxx | 5 -
include/svx/numvset.hxx | 4
include/svx/obj3d.hxx | 4
include/svx/scene3d.hxx | 4
include/svx/sdr/contact/objectcontact.hxx | 4
include/svx/sdr/contact/viewcontact.hxx | 4
include/svx/sdr/contact/viewcontactofe3dscene.hxx | 4
include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx | 4
include/svx/sdr/contact/viewcontactofsdrobj.hxx | 4
include/svx/sdr/contact/viewcontactofvirtobj.hxx | 4
include/svx/sdr/contact/viewobjectcontact.hxx | 8 -
include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx | 4
include/svx/sdr/contact/viewobjectcontactredirector.hxx | 4
include/svx/sdr/overlay/overlaymanager.hxx | 4
include/svx/sdr/table/tablecontroller.hxx | 4
include/svx/sdr/table/tabledesign.hxx | 4
include/svx/sdrhittesthelper.hxx | 4
include/svx/sdrpagewindow.hxx | 2
include/svx/sidebar/AreaPropertyPanelBase.hxx | 4
include/svx/sidebar/AreaTransparencyGradientPopup.hxx | 4
include/svx/sidebar/LineWidthPopup.hxx | 4
include/svx/sidebar/SelectionAnalyzer.hxx | 4
include/svx/sidebar/SelectionChangeHandler.hxx | 4
include/svx/sidebar/ValueSetWithTextControl.hxx | 4
include/svx/svdedxv.hxx | 4
include/svx/svdetc.hxx | 4
include/svx/svdhdl.hxx | 4
include/svx/svdocapt.hxx | 4
include/svx/svdocirc.hxx | 4
include/svx/svdoedge.hxx | 4
include/svx/svdomeas.hxx | 4
include/svx/svdomedia.hxx | 2
include/svx/svdoole2.hxx | 4
include/svx/svdorect.hxx | 4
include/svx/svdotable.hxx | 8 -
include/svx/svdotext.hxx | 20 ++--
include/svx/svdouno.hxx | 4
include/svx/svdpage.hxx | 2
include/svx/svdpntv.hxx | 10 +-
include/svx/svdtext.hxx | 4
include/svx/svdview.hxx | 2
include/svx/svxdlg.hxx | 5 -
include/svx/unoshtxt.hxx | 4
include/toolkit/awt/vclxaccessiblecomponent.hxx | 2
include/toolkit/awt/vclxfont.hxx | 2
include/toolkit/awt/vclxtopwindow.hxx | 2
include/toolkit/awt/vclxwindow.hxx | 2
include/toolkit/controls/unocontrolmodel.hxx | 2
include/toolkit/controls/unocontrols.hxx | 4
include/toolkit/helper/accessiblefactory.hxx | 4
include/toolkit/helper/formpdfexport.hxx | 4
include/toolkit/helper/vclunohelper.hxx | 10 +-
include/tools/color.hxx | 4
include/tools/date.hxx | 2
include/tools/gen.hxx | 4
include/tools/link.hxx | 4
include/tools/time.hxx | 2
include/tools/urlobj.hxx | 6 -
include/ucbhelper/cancelcommandexecution.hxx | 4
include/ucbhelper/content.hxx | 22 ++--
include/ucbhelper/contenthelper.hxx | 10 +-
include/ucbhelper/getcomponentcontext.hxx | 4
include/ucbhelper/propertyvalueset.hxx | 10 +-
include/ucbhelper/providerhelper.hxx | 6 -
include/ucbhelper/proxydecider.hxx | 4
include/ucbhelper/registerucb.hxx | 7 -
include/ucbhelper/resultset.hxx | 4
include/ucbhelper/resultsethelper.hxx | 2
include/ucbhelper/resultsetmetadata.hxx | 4
include/ucbhelper/simpleauthenticationrequest.hxx | 4
include/ucbhelper/simplecertificatevalidationrequest.hxx | 4
include/unotest/officeconnection.hxx | 4
include/unotools/ZipPackageHelper.hxx | 6 -
include/unotools/calendarwrapper.hxx | 16 ---
include/unotools/charclass.hxx | 9 -
include/unotools/closeveto.hxx | 2
include/unotools/cmdoptions.hxx | 4
include/unotools/collatorwrapper.hxx | 8 -
include/unotools/compatibility.hxx | 2
include/unotools/configitem.hxx | 4
include/unotools/configmgr.hxx | 6 -
include/unotools/confignode.hxx | 14 +--
include/unotools/configvaluecontainer.hxx | 4
include/unotools/datetime.hxx | 6 -
include/unotools/dynamicmenuoptions.hxx | 2
include/unotools/eventlisteneradapter.hxx | 4
include/unotools/fontcfg.hxx | 4
include/unotools/historyoptions.hxx | 2
include/unotools/intlwrapper.hxx | 2
include/unotools/lingucfg.hxx | 4
include/unotools/localedatawrapper.hxx | 17 +--
include/unotools/mediadescriptor.hxx | 4
include/unotools/moduleoptions.hxx | 4
include/unotools/nativenumberwrapper.hxx | 9 -
include/unotools/sharedunocomponent.hxx | 4
include/unotools/textsearch.hxx | 4
include/unotools/transliterationwrapper.hxx | 11 --
include/unotools/ucbhelper.hxx | 8 -
include/unotools/viewoptions.hxx | 2
include/vbahelper/vbaapplicationbase.hxx | 4
include/vbahelper/vbacollectionimpl.hxx | 8 -
include/vbahelper/vbadialogbase.hxx | 8 -
include/vbahelper/vbadialogsbase.hxx | 8 -
include/vbahelper/vbadocumentbase.hxx | 8 -
include/vbahelper/vbadocumentsbase.hxx | 8 -
include/vbahelper/vbaeventshelperbase.hxx | 6 -
include/vbahelper/vbafontbase.hxx | 8 -
include/vbahelper/vbaglobalbase.hxx | 8 -
include/vbahelper/vbahelper.hxx | 4
include/vbahelper/vbapagesetupbase.hxx | 8 -
include/vbahelper/vbashape.hxx | 8 -
include/vbahelper/vbashaperange.hxx | 8 -
include/vbahelper/vbashapes.hxx | 8 -
include/vbahelper/vbatextframe.hxx | 8 -
include/vbahelper/vbawindowbase.hxx | 8 -
include/vcl/BitmapTools.hxx | 7 -
include/vcl/FilterConfigItem.hxx | 8 -
include/vcl/GraphicObject.hxx | 2
include/vcl/ITiledRenderable.hxx | 2
include/vcl/ImageTree.hxx | 6 -
include/vcl/abstdlg.hxx | 4
include/vcl/accessiblefactory.hxx | 4
include/vcl/accessibletable.hxx | 7 -
include/vcl/accessibletableprovider.hxx | 2
include/vcl/bitmapex.hxx | 6 -
include/vcl/builder.hxx | 2
include/vcl/button.hxx | 2
include/vcl/canvastools.hxx | 10 +-
include/vcl/commandinfoprovider.hxx | 11 --
include/vcl/embeddedfontshelper.hxx | 4
include/vcl/field.hxx | 2
include/vcl/graph.hxx | 2
include/vcl/graphicfilter.hxx | 4
include/vcl/menu.hxx | 7 -
include/vcl/mnemonic.hxx | 2
include/vcl/notebookbar.hxx | 2
include/vcl/outdev.hxx | 4
include/vcl/pdfwriter.hxx | 6 -
include/vcl/pngwrite.hxx | 4
include/vcl/textview.hxx | 7 -
include/vcl/toolbox.hxx | 4
include/vcl/transfer.hxx | 6 -
include/vcl/uitest/uitest.hxx | 6 -
include/vcl/unohelp2.hxx | 8 -
include/vcl/vclevent.hxx | 8 -
include/vcl/vclptr.hxx | 4
include/vcl/vectorgraphicdata.hxx | 2
include/vcl/window.hxx | 46
+++++-----
include/vcl/wmfexternal.hxx | 2
include/vcl/wrkwin.hxx | 2
include/xmloff/DashStyle.hxx | 6 -
include/xmloff/GradientStyle.hxx | 6 -
include/xmloff/HatchStyle.hxx | 6 -
include/xmloff/ImageStyle.hxx | 6 -
include/xmloff/MarkerStyle.hxx | 6 -
include/xmloff/SchXMLImportHelper.hxx | 8 -
include/xmloff/SchXMLSeriesHelper.hxx | 8 -
include/xmloff/SettingsExportHelper.hxx | 10 +-
include/xmloff/SinglePropertySetInfoCache.hxx | 4
include/xmloff/XMLBase64ImportContext.hxx | 6 -
include/xmloff/XMLCharContext.hxx | 2
include/xmloff/XMLEventExport.hxx | 8 -
include/xmloff/XMLEventsImportContext.hxx | 8 -
include/xmloff/XMLPageExport.hxx | 4
include/xmloff/XMLSettingsExportContext.hxx | 2
include/xmloff/XMLTextListAutoStylePool.hxx | 5 -
include/xmloff/XMLTextMasterPageContext.hxx | 4
include/xmloff/XMLTextMasterPageExport.hxx | 4
include/xmloff/animationexport.hxx | 6 -
include/xmloff/animexp.hxx | 4
include/xmloff/formlayerexport.hxx | 10 +-
include/xmloff/formlayerimport.hxx | 6 -
include/xmloff/numehelp.hxx | 4
include/xmloff/prstylei.hxx | 6 -
include/xmloff/settingsstore.hxx | 6 -
include/xmloff/shapeexport.hxx | 8 -
include/xmloff/shapeimport.hxx | 10 +-
include/xmloff/styleexp.hxx | 6 -
include/xmloff/txtimp.hxx | 6 -
include/xmloff/txtparae.hxx | 4
include/xmloff/xformsexport.hxx | 4
include/xmloff/xformsimport.hxx | 4
include/xmloff/xmlaustp.hxx | 10 +-
include/xmloff/xmlerror.hxx | 6 -
include/xmloff/xmlevent.hxx | 10 +-
include/xmloff/xmlexp.hxx | 30 +++---
include/xmloff/xmlexppr.hxx | 4
include/xmloff/xmlictxt.hxx | 2
include/xmloff/xmlimp.hxx | 28 +++---
include/xmloff/xmlimppr.hxx | 18 +--
include/xmloff/xmlmetae.hxx | 4
include/xmloff/xmlmetai.hxx | 6 -
include/xmloff/xmlnume.hxx | 8 -
include/xmloff/xmlnumfe.hxx | 6 -
include/xmloff/xmlnumfi.hxx | 6 -
include/xmloff/xmlnumi.hxx | 4
include/xmloff/xmlprhdl.hxx | 2
include/xmloff/xmlscripti.hxx | 4
include/xmloff/xmlstyle.hxx | 4
include/xmloff/xmltoken.hxx | 4
include/xmloff/xmluconv.hxx | 18 +--
include/xmlscript/xml_helper.hxx | 6 -
include/xmlscript/xmldlg_imexp.hxx | 14 +--
include/xmlscript/xmllib_imexp.hxx | 4
include/xmlscript/xmlmod_imexp.hxx | 4
sfx2/inc/sidebar/ControlFactory.hxx | 4
sfx2/inc/sidebar/UnoSidebar.hxx | 2
486 files changed, 1268 insertions(+), 1354 deletions(-)
New commits:
commit 47cd34a60ff9048404075823e519f1abdd4b0e9a
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri May 1 14:52:05 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 3 09:21:51 2020 +0200
use more compact namespace syntax in /include
excluding the UDK headers of course
Change-Id: Iac7ab83d60265f7d362c860776f1de9d5e444ec0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93268
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/basegfx/polygon/b2dpolypolygontools.hxx
b/include/basegfx/polygon/b2dpolypolygontools.hxx
index d52cbc5decad..3bf21ada8c59 100644
--- a/include/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b2dpolypolygontools.hxx
@@ -28,7 +28,7 @@
#include <basegfx/basegfxdllapi.h>
-namespace com { namespace sun { namespace star { namespace drawing { struct
PolyPolygonBezierCoords; } } } }
+namespace com::sun::star::drawing { struct PolyPolygonBezierCoords; }
namespace basegfx
{
diff --git a/include/basegfx/polygon/b3dpolypolygontools.hxx
b/include/basegfx/polygon/b3dpolypolygontools.hxx
index fbaf07e70581..3111c9df50a0 100644
--- a/include/basegfx/polygon/b3dpolypolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolypolygontools.hxx
@@ -25,7 +25,7 @@
#include <basegfx/basegfxdllapi.h>
-namespace com { namespace sun { namespace star { namespace drawing { struct
PolyPolygonShape3D; } } } }
+namespace com::sun::star::drawing { struct PolyPolygonShape3D; }
namespace basegfx
{
diff --git a/include/basegfx/utils/canvastools.hxx
b/include/basegfx/utils/canvastools.hxx
index fa2ad145c154..794074da0fdb 100644
--- a/include/basegfx/utils/canvastools.hxx
+++ b/include/basegfx/utils/canvastools.hxx
@@ -25,7 +25,7 @@
#include <basegfx/basegfxdllapi.h>
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com::sun::star::geometry
{
struct AffineMatrix2D;
struct AffineMatrix3D;
@@ -36,18 +36,18 @@ namespace com { namespace sun { namespace star { namespace
geometry
struct IntegerSize2D;
struct IntegerRectangle2D;
struct RealBezierSegment2D;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
{
class XGraphicDevice;
class XPolyPolygon2D;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace awt
+namespace com::sun::star::awt
{
struct Rectangle;
-} } } }
+}
namespace basegfx
{
diff --git a/include/basegfx/utils/keystoplerp.hxx
b/include/basegfx/utils/keystoplerp.hxx
index 551e31bcf65a..b35c46e638f1 100644
--- a/include/basegfx/utils/keystoplerp.hxx
+++ b/include/basegfx/utils/keystoplerp.hxx
@@ -23,9 +23,9 @@
#include <vector>
#include <basegfx/basegfxdllapi.h>
-namespace com{ namespace sun{ namespace star{ namespace uno {
+namespace com::sun::star::uno {
template<typename T> class Sequence;
-}}}}
+}
namespace basegfx
{
diff --git a/include/canvas/canvastools.hxx b/include/canvas/canvastools.hxx
index 10f734cfebe3..56e230f4d5a6 100644
--- a/include/canvas/canvastools.hxx
+++ b/include/canvas/canvastools.hxx
@@ -43,15 +43,15 @@ namespace basegfx
class B2DPolyPolygon;
}
-namespace com { namespace sun { namespace star { namespace geometry
+namespace com::sun::star::geometry
{
struct RealSize2D;
struct IntegerSize2D;
struct AffineMatrix2D;
struct Matrix2D;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
{
struct RenderState;
struct ViewState;
@@ -59,17 +59,17 @@ namespace com { namespace sun { namespace star { namespace
rendering
class XCanvas;
struct Texture;
class XIntegerBitmapColorSpace;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace awt
+namespace com::sun::star::awt
{
struct Rectangle;
class XWindow2;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
struct PropertyValue;
-} } } }
+}
class Color;
class OutputDevice;
diff --git a/include/codemaker/commoncpp.hxx b/include/codemaker/commoncpp.hxx
index 29e2c9dfc2e1..b7586e872426 100644
--- a/include/codemaker/commoncpp.hxx
+++ b/include/codemaker/commoncpp.hxx
@@ -29,7 +29,7 @@ namespace rtl {
class OUString;
}
-namespace codemaker { namespace cpp {
+namespace codemaker::cpp {
/** Stick a namespace scope to c++ type
@@ -55,7 +55,7 @@ rtl::OString translateUnoToCppIdentifier(
IdentifierTranslationMode transmode = IdentifierTranslationMode::Global,
rtl::OString const * forbidden = nullptr);
-} }
+}
#endif // INCLUDED_CODEMAKER_COMMONCPP_HXX
diff --git a/include/codemaker/commonjava.hxx b/include/codemaker/commonjava.hxx
index d34540f19734..11e1446bf64a 100644
--- a/include/codemaker/commonjava.hxx
+++ b/include/codemaker/commonjava.hxx
@@ -26,7 +26,7 @@
namespace rtl { class OString; }
-namespace codemaker { namespace java {
+namespace codemaker::java {
rtl::OString translateUnoToJavaType(
codemaker::UnoType::Sort sort, rtl::OString const & nucleus,
@@ -35,7 +35,7 @@ rtl::OString translateUnoToJavaType(
rtl::OString translateUnoToJavaIdentifier(
rtl::OString const & identifier, rtl::OString const & prefix);
-} }
+}
#endif // INCLUDED_CODEMAKER_COMMONJAVA_HXX
diff --git a/include/comphelper/SelectionMultiplex.hxx
b/include/comphelper/SelectionMultiplex.hxx
index 8ac2cecf407a..46b892c37525 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -25,7 +25,7 @@
#include <cppuhelper/implbase.hxx>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace view { class
XSelectionSupplier; } } } }
+namespace com::sun::star::view { class XSelectionSupplier; }
//= selection helper classes
diff --git a/include/comphelper/accessibleeventnotifier.hxx
b/include/comphelper/accessibleeventnotifier.hxx
index 90df00caabb4..75828cda6319 100644
--- a/include/comphelper/accessibleeventnotifier.hxx
+++ b/include/comphelper/accessibleeventnotifier.hxx
@@ -22,10 +22,10 @@
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace uno { class
XInterface; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template
<class interface_type> class Reference; } } } }
-namespace com { namespace sun { namespace star { namespace accessibility {
class XAccessibleEventListener; } } } }
-namespace com { namespace sun { namespace star { namespace accessibility {
struct AccessibleEventObject; } } } }
+namespace com::sun::star::uno { class XInterface; }
+namespace com::sun::star::uno { template <class interface_type> class
Reference; }
+namespace com::sun::star::accessibility { class XAccessibleEventListener; }
+namespace com::sun::star::accessibility { struct AccessibleEventObject; }
namespace comphelper {
diff --git a/include/comphelper/accessibletexthelper.hxx
b/include/comphelper/accessibletexthelper.hxx
index 04de7c7d87e9..576cc89cf4ee 100644
--- a/include/comphelper/accessibletexthelper.hxx
+++ b/include/comphelper/accessibletexthelper.hxx
@@ -26,9 +26,9 @@
#include <cppuhelper/implbase1.hxx>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace i18n { class
XBreakIterator; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { class
XCharacterClassification; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { struct
Boundary; } } } }
+namespace com::sun::star::i18n { class XBreakIterator; }
+namespace com::sun::star::i18n { class XCharacterClassification; }
+namespace com::sun::star::i18n { struct Boundary; }
namespace comphelper
{
diff --git a/include/comphelper/accessiblewrapper.hxx
b/include/comphelper/accessiblewrapper.hxx
index 2772084476bc..dd7da31a0c46 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -40,7 +40,7 @@
#include <comphelper/comphelperdllapi.h>
#include <rtl/ref.hxx>
-namespace com { namespace sun { namespace star { namespace uno { class
XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
namespace comphelper
{
diff --git a/include/comphelper/anytostring.hxx
b/include/comphelper/anytostring.hxx
index e5a0e4ab2eb0..21afda1a6cd1 100644
--- a/include/comphelper/anytostring.hxx
+++ b/include/comphelper/anytostring.hxx
@@ -23,7 +23,7 @@
#include <rtl/ustring.hxx>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace uno { class Any; }
} } }
+namespace com::sun::star::uno { class Any; }
namespace comphelper
{
diff --git a/include/comphelper/base64.hxx b/include/comphelper/base64.hxx
index 763312caaa78..d962aabacda0 100644
--- a/include/comphelper/base64.hxx
+++ b/include/comphelper/base64.hxx
@@ -26,7 +26,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>
-namespace com { namespace sun { namespace star { namespace uno { template
<class E> class Sequence; } } } }
+namespace com::sun::star::uno { template <class E> class Sequence; }
namespace comphelper {
diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index cd54f37a569b..96e185d78838 100644
--- a/include/comphelper/basicio.hxx
+++ b/include/comphelper/basicio.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/io/XObjectInputStream.hpp>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace awt { struct
FontDescriptor; } } } }
+namespace com::sun::star::awt { struct FontDescriptor; }
namespace comphelper
{
diff --git a/include/comphelper/configuration.hxx
b/include/comphelper/configuration.hxx
index de65a7ad3f1e..e56951281f9e 100644
--- a/include/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
@@ -20,7 +20,7 @@
#include <sal/types.h>
#include <memory>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace configuration { class XReadWriteAccess; }
namespace container {
class XHierarchicalNameAccess;
@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star {
class XNameContainer;
}
namespace uno { class XComponentContext; }
-} } }
+}
namespace comphelper {
diff --git a/include/comphelper/configurationhelper.hxx
b/include/comphelper/configurationhelper.hxx
index e09a3a985882..162319316df6 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -26,8 +26,8 @@
#include <comphelper/comphelperdllapi.h>
#include <o3tl/typed_flags_set.hxx>
-namespace com { namespace sun { namespace star { namespace uno { class
XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class
XInterface; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { class XInterface; }
namespace comphelper
{
diff --git a/include/comphelper/configurationlistener.hxx
b/include/comphelper/configurationlistener.hxx
index 4897323b8b9e..29a2b578b588 100644
--- a/include/comphelper/configurationlistener.hxx
+++ b/include/comphelper/configurationlistener.hxx
@@ -19,8 +19,8 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/configurationhelper.hxx>
-namespace com { namespace sun { namespace star { namespace beans { struct
PropertyChangeEvent; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class
XComponentContext; } } } }
+namespace com::sun::star::beans { struct PropertyChangeEvent; }
+namespace com::sun::star::uno { class XComponentContext; }
namespace comphelper {
diff --git a/include/comphelper/dispatchcommand.hxx
b/include/comphelper/dispatchcommand.hxx
index f0b67eda70eb..384536952789 100644
--- a/include/comphelper/dispatchcommand.hxx
+++ b/include/comphelper/dispatchcommand.hxx
@@ -14,9 +14,9 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star { namespace beans { struct
PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace frame { class
XDispatchResultListener; class XFrame; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template
<typename > class Sequence; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::frame { class XDispatchResultListener; class XFrame;
}
+namespace com::sun::star::uno { template <typename > class Sequence; }
namespace comphelper
{
diff --git a/include/comphelper/docpasswordhelper.hxx
b/include/comphelper/docpasswordhelper.hxx
index b45d584c9c7a..7505e3bdf2c4 100644
--- a/include/comphelper/docpasswordhelper.hxx
+++ b/include/comphelper/docpasswordhelper.hxx
@@ -25,9 +25,9 @@
#include <comphelper/docpasswordrequest.hxx>
#include <comphelper/hash.hxx>
-namespace com { namespace sun { namespace star { namespace task { class
XInteractionHandler; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct
PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct
NamedValue; } } } }
+namespace com::sun::star::task { class XInteractionHandler; }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::beans { struct NamedValue; }
namespace comphelper {
diff --git a/include/comphelper/docpasswordrequest.hxx
b/include/comphelper/docpasswordrequest.hxx
index 4f1d034e2eb6..a4e8704eb5e4 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -26,7 +26,7 @@
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
-namespace com { namespace sun { namespace star { namespace task { class
XInteractionAbort; } } } }
+namespace com::sun::star::task { class XInteractionAbort; }
namespace comphelper {
diff --git a/include/comphelper/documentinfo.hxx
b/include/comphelper/documentinfo.hxx
index a195722b9169..a7002120a4bf 100644
--- a/include/comphelper/documentinfo.hxx
+++ b/include/comphelper/documentinfo.hxx
@@ -23,8 +23,8 @@
#include <comphelper/comphelperdllapi.h>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star { namespace frame { class
XModel; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template
<class interface_type> class Reference; } } } }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { template <class interface_type> class
Reference; }
namespace comphelper {
diff --git a/include/comphelper/embeddedobjectcontainer.hxx
b/include/comphelper/embeddedobjectcontainer.hxx
index 93f7327b5435..130a6a1ad031 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -26,12 +26,12 @@
#include <rtl/ustring.hxx>
#include <memory>
-namespace com { namespace sun { namespace star { namespace beans { struct
PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace embed { class
XEmbeddedObject; } } } }
-namespace com { namespace sun { namespace star { namespace embed { class
XStorage; } } } }
-namespace com { namespace sun { namespace star { namespace io { class
XInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace task { class
XInteractionHandler; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class
XInterface; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::embed { class XEmbeddedObject; }
+namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::task { class XInteractionHandler; }
+namespace com::sun::star::uno { class XInterface; }
namespace comphelper
{
diff --git a/include/comphelper/eventattachermgr.hxx
b/include/comphelper/eventattachermgr.hxx
index 22323514aace..4a2a99909459 100644
--- a/include/comphelper/eventattachermgr.hxx
+++ b/include/comphelper/eventattachermgr.hxx
@@ -23,14 +23,14 @@
#include <com/sun/star/uno/Reference.h>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace uno {
class XComponentContext;
}
namespace script {
class XEventAttacherManager;
}
-} } }
+}
namespace comphelper
diff --git a/include/comphelper/genericpropertyset.hxx
b/include/comphelper/genericpropertyset.hxx
index 527b7d8e4960..8f61ac14befb 100644
--- a/include/comphelper/genericpropertyset.hxx
+++ b/include/comphelper/genericpropertyset.hxx
@@ -23,7 +23,7 @@
#include <com/sun/star/uno/Reference.h>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace beans { class
XPropertySet; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
namespace comphelper { class PropertySetInfo; }
namespace comphelper
diff --git a/include/comphelper/getexpandeduri.hxx
b/include/comphelper/getexpandeduri.hxx
index ab73a5ff8596..90eb101b7b2c 100644
--- a/include/comphelper/getexpandeduri.hxx
+++ b/include/comphelper/getexpandeduri.hxx
@@ -15,11 +15,8 @@
#include <comphelper/comphelperdllapi.h>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star { namespace uno {
- class XComponentContext;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace uno { template
<typename > class Reference; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <typename > class Reference; }
namespace comphelper {
diff --git a/include/comphelper/interfacecontainer2.hxx
b/include/comphelper/interfacecontainer2.hxx
index 63888008d3ea..c049a6c6726e 100644
--- a/include/comphelper/interfacecontainer2.hxx
+++ b/include/comphelper/interfacecontainer2.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace uno { class
XInterface; } } } }
+namespace com::sun::star::uno { class XInterface; }
namespace osl { class Mutex; }
/** */ //for docpp
diff --git a/include/comphelper/listenernotification.hxx
b/include/comphelper/listenernotification.hxx
index ba52983f86af..688571304938 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -27,7 +27,7 @@
#include <memory>
-namespace com { namespace sun { namespace star { namespace lang { class
XEventListener; } } } }
+namespace com::sun::star::lang { class XEventListener; }
namespace comphelper
{
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx
index d7bd806c8f84..f0a599765b80 100644
--- a/include/comphelper/logging.hxx
+++ b/include/comphelper/logging.hxx
@@ -38,7 +38,7 @@ namespace comphelper
//= EventLogger
- namespace log { namespace convert
+ namespace log::convert
{
inline const OUString& convertLogArgToString( const OUString& _rValue )
{
@@ -59,7 +59,7 @@ namespace comphelper
inline OUString convertLogArgToString( bool _bValue ) { return
OUString::boolean( _bValue ); }
void convertLogArgToString(sal_Bool) = delete;
- } } // namespace log::convert
+ } // namespace log::convert
//= EventLogger
diff --git a/include/comphelper/mimeconfighelper.hxx
b/include/comphelper/mimeconfighelper.hxx
index c9b38452ad81..f7472dfd2918 100644
--- a/include/comphelper/mimeconfighelper.hxx
+++ b/include/comphelper/mimeconfighelper.hxx
@@ -23,13 +23,13 @@
#include <com/sun/star/uno/Reference.hxx>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace beans { struct
NamedValue; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct
PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace container { class
XContainerQuery; } } } }
-namespace com { namespace sun { namespace star { namespace container { class
XNameAccess; } } } }
-namespace com { namespace sun { namespace star { namespace embed { struct
VerbDescriptor; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class
XMultiServiceFactory; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class
XComponentContext; } } } }
+namespace com::sun::star::beans { struct NamedValue; }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::container { class XContainerQuery; }
+namespace com::sun::star::container { class XNameAccess; }
+namespace com::sun::star::embed { struct VerbDescriptor; }
+namespace com::sun::star::lang { class XMultiServiceFactory; }
+namespace com::sun::star::uno { class XComponentContext; }
enum class SfxFilterFlags;
diff --git a/include/comphelper/namecontainer.hxx
b/include/comphelper/namecontainer.hxx
index 3df8e1fc3e0b..86553e52ff6c 100644
--- a/include/comphelper/namecontainer.hxx
+++ b/include/comphelper/namecontainer.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/uno/Reference.h>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace container { class
XNameContainer; } } } }
+namespace com::sun::star::container { class XNameContainer; }
namespace comphelper
{
diff --git a/include/comphelper/numberedcollection.hxx
b/include/comphelper/numberedcollection.hxx
index f2a9d0b3277a..efb70288f3ba 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -32,7 +32,7 @@
#include <unordered_map>
#include <vector>
-namespace com { namespace sun { namespace star { namespace uno { class
XInterface; } } } }
+namespace com::sun::star::uno { class XInterface; }
namespace comphelper{
diff --git a/include/comphelper/numbers.hxx b/include/comphelper/numbers.hxx
index 919be8aac187..e486bac0bb3e 100644
--- a/include/comphelper/numbers.hxx
+++ b/include/comphelper/numbers.hxx
@@ -24,8 +24,8 @@
#include <com/sun/star/uno/Reference.h>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace util { class
XNumberFormats; } } } }
-namespace com { namespace sun { namespace star { namespace util { class
XNumberFormatter; } } } }
+namespace com::sun::star::util { class XNumberFormats; }
+namespace com::sun::star::util { class XNumberFormatter; }
namespace comphelper
{
diff --git a/include/comphelper/ofopxmlhelper.hxx
b/include/comphelper/ofopxmlhelper.hxx
index 4679d3fd381c..d4efbf39b4f4 100644
--- a/include/comphelper/ofopxmlhelper.hxx
+++ b/include/comphelper/ofopxmlhelper.hxx
@@ -24,11 +24,11 @@
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace beans { struct
StringPair; } } } }
-namespace com { namespace sun { namespace star { namespace io { class
XInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class
XOutputStream; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class
XComponentContext; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template
<class interface_type> class Reference; } } } }
+namespace com::sun::star::beans { struct StringPair; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::io { class XOutputStream; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <class interface_type> class
Reference; }
namespace comphelper
{
diff --git a/include/comphelper/processfactory.hxx
b/include/comphelper/processfactory.hxx
index 33b72f51cbed..0f74e5b1365d 100644
--- a/include/comphelper/processfactory.hxx
+++ b/include/comphelper/processfactory.hxx
@@ -23,11 +23,10 @@
#include <com/sun/star/uno/Reference.hxx>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace lang {
+namespace com::sun::star::lang {
class XMultiServiceFactory;
-} } } }
-
-namespace com { namespace sun { namespace star { namespace uno { class
XComponentContext; } } } }
+}
+namespace com::sun::star::uno { class XComponentContext; }
namespace comphelper
{
diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx
index 1a7f86591fe4..b9787f1308bc 100644
--- a/include/comphelper/property.hxx
+++ b/include/comphelper/property.hxx
@@ -26,7 +26,7 @@
#include <type_traits>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace beans { class
XPropertySet; } } } }
+namespace com::sun::star::beans { class XPropertySet; }
namespace comphelper
{
diff --git a/include/comphelper/propertycontainer.hxx
b/include/comphelper/propertycontainer.hxx
index 63c464f49e9d..2c64b2cdfedf 100644
--- a/include/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
@@ -25,8 +25,8 @@
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace uno { class Any; }
} } }
-namespace com { namespace sun { namespace star { namespace uno { class Type; }
} } }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { class Type; }
namespace comphelper
{
diff --git a/include/comphelper/propmultiplex.hxx
b/include/comphelper/propmultiplex.hxx
index 4407e39528ad..38a1ee73056a 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -26,9 +26,7 @@
#include <rtl/ref.hxx>
#include <vector>
-namespace com { namespace sun { namespace star { namespace beans {
- class XPropertySet;
-} } } }
+namespace com::sun::star::beans { class XPropertySet; }
//= property helper classes
diff --git a/include/comphelper/proxyaggregation.hxx
b/include/comphelper/proxyaggregation.hxx
index 2bd2b47708e8..48444355ce23 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -27,11 +27,11 @@
#include <cppuhelper/compbase_ex.hxx>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
class XComponentContext;
-} } } }
-namespace com { namespace sun { namespace star { namespace uno { class
XAggregation; } } } }
-namespace com { namespace sun { namespace star { namespace lang { class
XComponent; } } } }
+}
+namespace com::sun::star::uno { class XAggregation; }
+namespace com::sun::star::lang { class XComponent; }
/* class hierarchy herein:
diff --git a/include/comphelper/sequenceashashmap.hxx
b/include/comphelper/sequenceashashmap.hxx
index 8e0d07c524aa..d6bcd77f0d1a 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -25,8 +25,8 @@
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace beans { struct
NamedValue; } } } }
-namespace com { namespace sun { namespace star { namespace beans { struct
PropertyValue; } } } }
+namespace com::sun::star::beans { struct NamedValue; }
+namespace com::sun::star::beans { struct PropertyValue; }
namespace comphelper{
diff --git a/include/comphelper/simplefileaccessinteraction.hxx
b/include/comphelper/simplefileaccessinteraction.hxx
index 503b70e99c3d..e9295d4d7e83 100644
--- a/include/comphelper/simplefileaccessinteraction.hxx
+++ b/include/comphelper/simplefileaccessinteraction.hxx
@@ -14,8 +14,8 @@
#include <ucbhelper/interceptedinteraction.hxx>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace task { class
XInteractionHandler; } } } }
-namespace com { namespace sun { namespace star { namespace task { class
XInteractionRequest; } } } }
+namespace com::sun::star::task { class XInteractionHandler; }
+namespace com::sun::star::task { class XInteractionRequest; }
namespace comphelper {
/** An interaction handler wrapper for simple file access.
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index e84f9d405dae..3b5a991eb4e3 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -26,7 +26,7 @@
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-namespace com { namespace sun { namespace star { namespace uno { template
<typename > class Reference; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
namespace comphelper
{
diff --git a/include/comphelper/storagehelper.hxx
b/include/comphelper/storagehelper.hxx
index 2ebec23e1eb7..a4bd3605c296 100644
--- a/include/comphelper/storagehelper.hxx
+++ b/include/comphelper/storagehelper.hxx
@@ -34,7 +34,7 @@
#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 "PackageSHA1MS1252EncryptionKey"
#define PACKAGE_ENCRYPTIONDATA_SHA1CORRECT "PackageSHA1CorrectEncryptionKey"
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { struct NamedValue; }
namespace embed { class XStorage; }
namespace io {
@@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star {
}
namespace lang { class XSingleServiceFactory; }
namespace uno { class XComponentContext; }
-} } }
+}
namespace comphelper {
diff --git a/include/comphelper/streamsection.hxx
b/include/comphelper/streamsection.hxx
index 5de717824705..c4f945966ab5 100644
--- a/include/comphelper/streamsection.hxx
+++ b/include/comphelper/streamsection.hxx
@@ -24,9 +24,9 @@
#include <com/sun/star/uno/Reference.h>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace io { class
XDataInputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class
XDataOutputStream; } } } }
-namespace com { namespace sun { namespace star { namespace io { class
XMarkableStream; } } } }
+namespace com::sun::star::io { class XDataInputStream; }
+namespace com::sun::star::io { class XDataOutputStream; }
+namespace com::sun::star::io { class XMarkableStream; }
namespace comphelper
{
diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx
index 3f7ebf958512..1db92036949b 100644
--- a/include/comphelper/string.hxx
+++ b/include/comphelper/string.hxx
@@ -32,13 +32,13 @@
#include <com/sun/star/lang/Locale.hpp>
-namespace com { namespace sun { namespace star { namespace i18n { class
XBreakIterator; } } } }
-namespace com { namespace sun { namespace star { namespace i18n { class
XCollator; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class
XComponentContext; } } } }
+namespace com::sun::star::i18n { class XBreakIterator; }
+namespace com::sun::star::i18n { class XCollator; }
+namespace com::sun::star::uno { class XComponentContext; }
// OUString helper functions that are not widespread or mature enough to
// go into the stable URE API:
-namespace comphelper { namespace string {
+namespace comphelper::string {
/** Compare an OUString to a single char
@@ -375,7 +375,7 @@ COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const OString
&rString);
*/
COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const OUString &rString);
-} }
+}
#endif
diff --git a/include/comphelper/synchronousdispatch.hxx
b/include/comphelper/synchronousdispatch.hxx
index 3c2b89b9fbfd..8503b2a431e5 100644
--- a/include/comphelper/synchronousdispatch.hxx
+++ b/include/comphelper/synchronousdispatch.hxx
@@ -25,15 +25,15 @@
#include <com/sun/star/uno/Reference.h>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace uno {
class XInterface; }
namespace lang {
class XComponent; }
-} } }
+}
-namespace com { namespace sun { namespace star { namespace beans { struct
PropertyValue; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template
<class E> class Sequence; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
namespace comphelper
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index b35fbef5f18f..2cb47f2218bc 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -25,12 +25,12 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/comphelperdllapi.h>
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
struct FontDescriptor;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace uno { class Any; }
} } }
-namespace com { namespace sun { namespace star { namespace uno { class
XInterface; } } } }
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::uno { class XInterface; }
namespace comphelper
diff --git a/include/comphelper/weakeventlistener.hxx
b/include/comphelper/weakeventlistener.hxx
index 611744e4796c..dc26966115fc 100644
--- a/include/comphelper/weakeventlistener.hxx
+++ b/include/comphelper/weakeventlistener.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-namespace com { namespace sun { namespace star { namespace uno { class XWeak;
} } } }
+namespace com::sun::star::uno { class XWeak; }
namespace comphelper
{
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index fdf763dc7a4f..27d965d4b2bb 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -26,7 +26,7 @@
#include <connectivity/dbtoolsdllapi.hxx>
#include <connectivity/FValue.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sdb {
class XSingleSelectQueryComposer;
@@ -66,7 +66,7 @@ namespace task {
class XInteractionHandler;
}
-} } }
+}
class SvStream;
diff --git a/include/cppcanvas/bitmap.hxx b/include/cppcanvas/bitmap.hxx
index 0dd3f69f3a84..1b163b82d479 100644
--- a/include/cppcanvas/bitmap.hxx
+++ b/include/cppcanvas/bitmap.hxx
@@ -25,10 +25,10 @@
#include <cppcanvas/bitmapcanvas.hxx>
#include <memory>
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
{
class XBitmap;
-} } } }
+}
/* Definition of Bitmap interface */
diff --git a/include/cppcanvas/canvas.hxx b/include/cppcanvas/canvas.hxx
index ec34af5e0caa..97562ede24fb 100644
--- a/include/cppcanvas/canvas.hxx
+++ b/include/cppcanvas/canvas.hxx
@@ -29,11 +29,11 @@ namespace basegfx
class B2DPolyPolygon;
}
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
{
class XCanvas;
struct ViewState;
-} } } }
+}
/* Definition of BitmapCanvas */
diff --git a/include/cppcanvas/polypolygon.hxx
b/include/cppcanvas/polypolygon.hxx
index 058ea25940d4..917ef4dafb04 100644
--- a/include/cppcanvas/polypolygon.hxx
+++ b/include/cppcanvas/polypolygon.hxx
@@ -25,10 +25,10 @@
#include <cppcanvas/color.hxx>
#include <memory>
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
{
class XPolyPolygon2D;
-} } } }
+}
/* Definition of tools::PolyPolygon interface */
diff --git a/include/cppcanvas/spritecanvas.hxx
b/include/cppcanvas/spritecanvas.hxx
index abeef3d2b25f..c4d100dbedb9 100644
--- a/include/cppcanvas/spritecanvas.hxx
+++ b/include/cppcanvas/spritecanvas.hxx
@@ -25,10 +25,10 @@
#include <cppcanvas/customsprite.hxx>
#include <memory>
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
{
class XSpriteCanvas;
-} } } }
+}
/* Definition of SpriteCanvas */
diff --git a/include/cppcanvas/vclfactory.hxx b/include/cppcanvas/vclfactory.hxx
index b36b66a7ad34..73867626d3c0 100644
--- a/include/cppcanvas/vclfactory.hxx
+++ b/include/cppcanvas/vclfactory.hxx
@@ -33,12 +33,12 @@ class BitmapEx;
class GDIMetaFile;
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
{
class XCanvas;
class XBitmapCanvas;
class XSpriteCanvas;
-} } } }
+}
/* Definition of VCLFactory class */
diff --git a/include/dbaccess/IController.hxx b/include/dbaccess/IController.hxx
index 754667afd4c0..82e8c5603b16 100644
--- a/include/dbaccess/IController.hxx
+++ b/include/dbaccess/IController.hxx
@@ -26,7 +26,7 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans {
struct PropertyValue;
}
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star {
namespace frame {
class XController;
}
-} } }
+}
class NotifyEvent;
diff --git a/include/dbaccess/controllerframe.hxx
b/include/dbaccess/controllerframe.hxx
index fd14bb02f92a..97a9c249d43a 100644
--- a/include/dbaccess/controllerframe.hxx
+++ b/include/dbaccess/controllerframe.hxx
@@ -25,9 +25,9 @@
#include <com/sun/star/frame/FrameAction.hpp>
#include <com/sun/star/uno/Reference.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace frame { class XFrame; }
-} } }
+}
namespace dbaui
{
diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx
index 738ccc352da1..b599b8c513c5 100644
--- a/include/dbaccess/dataview.hxx
+++ b/include/dbaccess/dataview.hxx
@@ -29,10 +29,10 @@
#include <vcl/vclptr.hxx>
#include <vcl/window.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace frame { class XFrame; }
namespace uno { class XComponentContext; }
-} } }
+}
namespace svt {
class AcceleratorExecute;
diff --git a/include/dbaccess/dbaundomanager.hxx
b/include/dbaccess/dbaundomanager.hxx
index b39e36f49783..f6f75c063cc5 100644
--- a/include/dbaccess/dbaundomanager.hxx
+++ b/include/dbaccess/dbaundomanager.hxx
@@ -30,11 +30,11 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace document { class XUndoAction; }
namespace document { class XUndoManagerListener; }
namespace uno { class XInterface; }
-} } }
+}
namespace cppu {
class OWeakObject;
diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx
b/include/dbaccess/dbsubcomponentcontroller.hxx
index 01da13c9f8ff..a1bc687ce512 100644
--- a/include/dbaccess/dbsubcomponentcontroller.hxx
+++ b/include/dbaccess/dbsubcomponentcontroller.hxx
@@ -35,7 +35,7 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { class XPropertySet; }
namespace beans { struct PropertyValue; }
namespace document { class XEmbeddedScripts; }
@@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star {
namespace uno { class XComponentContext; }
namespace util { class XModifyListener; }
namespace util { class XNumberFormatter; }
-} } }
+}
namespace dbtools {
class DatabaseMetaData;
diff --git a/include/dbaccess/genericcontroller.hxx
b/include/dbaccess/genericcontroller.hxx
index 805131548f28..c60cf9feb25c 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -62,7 +62,7 @@
#include <tools/link.hxx>
#include <vcl/vclptr.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt { class XKeyHandler; }
namespace awt { class XMouseClickHandler; }
namespace awt { class XWindow; }
@@ -83,7 +83,7 @@ namespace com { namespace sun { namespace star {
namespace ui { class XSidebarProvider; }
namespace uno { class XComponentContext; }
namespace util { class XURLTransformer; }
-} } }
+}
namespace vcl { class Window; }
namespace weld { class Window; }
diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx
b/include/drawinglayer/attribute/fillgradientattribute.hxx
index 6bea915a8e67..a994c826f48b 100644
--- a/include/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/include/drawinglayer/attribute/fillgradientattribute.hxx
@@ -30,9 +30,9 @@ namespace basegfx {
class BColor;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpFillGradientAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/fillgraphicattribute.hxx
b/include/drawinglayer/attribute/fillgraphicattribute.hxx
index 971241f5469a..2cec83c68962 100644
--- a/include/drawinglayer/attribute/fillgraphicattribute.hxx
+++ b/include/drawinglayer/attribute/fillgraphicattribute.hxx
@@ -31,9 +31,9 @@ namespace basegfx {
class B2DRange;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpFillGraphicAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/fillhatchattribute.hxx
b/include/drawinglayer/attribute/fillhatchattribute.hxx
index a4ffe4b656a7..7c2f819f0ac1 100644
--- a/include/drawinglayer/attribute/fillhatchattribute.hxx
+++ b/include/drawinglayer/attribute/fillhatchattribute.hxx
@@ -30,9 +30,9 @@ namespace basegfx {
class BColor;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpFillHatchAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/fontattribute.hxx
b/include/drawinglayer/attribute/fontattribute.hxx
index 5308ababbd24..a12ffb405001 100644
--- a/include/drawinglayer/attribute/fontattribute.hxx
+++ b/include/drawinglayer/attribute/fontattribute.hxx
@@ -30,9 +30,9 @@ namespace rtl {
class OUString;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpFontAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/linestartendattribute.hxx
b/include/drawinglayer/attribute/linestartendattribute.hxx
index 1de23c832bd7..9f87e6cb7ecf 100644
--- a/include/drawinglayer/attribute/linestartendattribute.hxx
+++ b/include/drawinglayer/attribute/linestartendattribute.hxx
@@ -30,9 +30,9 @@ namespace basegfx {
class B2DPolyPolygon;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpLineStartEndAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/materialattribute3d.hxx
b/include/drawinglayer/attribute/materialattribute3d.hxx
index c343f7a19a26..4eddfea25109 100644
--- a/include/drawinglayer/attribute/materialattribute3d.hxx
+++ b/include/drawinglayer/attribute/materialattribute3d.hxx
@@ -26,9 +26,9 @@
// predefines
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpMaterialAttribute3D;
-}}
+}
namespace basegfx {
class BColor;
diff --git a/include/drawinglayer/attribute/sdrfillattribute.hxx
b/include/drawinglayer/attribute/sdrfillattribute.hxx
index 54567bb1885c..7801f04123d6 100644
--- a/include/drawinglayer/attribute/sdrfillattribute.hxx
+++ b/include/drawinglayer/attribute/sdrfillattribute.hxx
@@ -30,12 +30,12 @@ namespace basegfx {
class BColor;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpSdrFillAttribute;
class FillGradientAttribute;
class FillHatchAttribute;
class SdrFillGraphicAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx
b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx
index caebc4adf544..281733132d31 100644
--- a/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx
+++ b/include/drawinglayer/attribute/sdrfillgraphicattribute.hxx
@@ -32,10 +32,10 @@ namespace basegfx {
class B2DVector;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class FillGraphicAttribute;
class ImpSdrFillGraphicAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrlightattribute3d.hxx
b/include/drawinglayer/attribute/sdrlightattribute3d.hxx
index 31ee658b3b37..06d024f5b9d4 100644
--- a/include/drawinglayer/attribute/sdrlightattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrlightattribute3d.hxx
@@ -31,9 +31,9 @@ namespace basegfx {
class B3DVector;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpSdr3DLightAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrlightingattribute3d.hxx
b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx
index 5fa40db3b524..35a4da1c65a8 100644
--- a/include/drawinglayer/attribute/sdrlightingattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrlightingattribute3d.hxx
@@ -33,10 +33,10 @@ namespace basegfx {
class B3DVector;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpSdrLightingAttribute;
class Sdr3DLightAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrlineattribute.hxx
b/include/drawinglayer/attribute/sdrlineattribute.hxx
index 59c9985f1b27..f0ea867b6616 100644
--- a/include/drawinglayer/attribute/sdrlineattribute.hxx
+++ b/include/drawinglayer/attribute/sdrlineattribute.hxx
@@ -33,9 +33,9 @@ namespace basegfx {
class BColor;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpSdrLineAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx
b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx
index 8c14bc24ebda..e3a90ac6f372 100644
--- a/include/drawinglayer/attribute/sdrlinestartendattribute.hxx
+++ b/include/drawinglayer/attribute/sdrlinestartendattribute.hxx
@@ -30,9 +30,9 @@ namespace basegfx {
class B2DPolyPolygon;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpSdrLineStartEndAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx
b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx
index f0a325d604ad..2e8013dd6d84 100644
--- a/include/drawinglayer/attribute/sdrobjectattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrobjectattribute3d.hxx
@@ -31,10 +31,10 @@
// predefines
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpSdr3DObjectAttribute;
class MaterialAttribute3D;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx
b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx
index 1e18788b8172..2fca2acb4038 100644
--- a/include/drawinglayer/attribute/sdrsceneattribute3d.hxx
+++ b/include/drawinglayer/attribute/sdrsceneattribute3d.hxx
@@ -29,9 +29,9 @@
// predefines
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpSdrSceneAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/attribute/sdrshadowattribute.hxx
b/include/drawinglayer/attribute/sdrshadowattribute.hxx
index c785a24f1e81..fc797dc9d0a0 100644
--- a/include/drawinglayer/attribute/sdrshadowattribute.hxx
+++ b/include/drawinglayer/attribute/sdrshadowattribute.hxx
@@ -31,9 +31,9 @@ namespace basegfx {
class B2DVector;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class ImpSdrShadowAttribute;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/geometry/viewinformation3d.hxx
b/include/drawinglayer/geometry/viewinformation3d.hxx
index e6faece8d01f..77bcec66cd13 100644
--- a/include/drawinglayer/geometry/viewinformation3d.hxx
+++ b/include/drawinglayer/geometry/viewinformation3d.hxx
@@ -28,9 +28,9 @@
// predefines
-namespace drawinglayer { namespace geometry {
+namespace drawinglayer::geometry {
class ImpViewInformation3D;
-}}
+}
namespace basegfx {
class B3DHomMatrix;
diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
index fcd0454cf0c1..635d6bb9d0dc 100644
--- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx
@@ -28,7 +28,7 @@
// predefines
namespace basegfx { class B2DPolygon; }
-namespace drawinglayer { namespace texture { struct B2DHomMatrixAndBColor; } }
+namespace drawinglayer::texture { struct B2DHomMatrixAndBColor; }
// FillGradientPrimitive2D class
diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx
b/include/drawinglayer/primitive2d/textbreakuphelper.hxx
index ccc7e503ab6d..d32f3ba69ccd 100644
--- a/include/drawinglayer/primitive2d/textbreakuphelper.hxx
+++ b/include/drawinglayer/primitive2d/textbreakuphelper.hxx
@@ -24,7 +24,7 @@
#include <drawinglayer/primitive2d/textlayoutdevice.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-namespace drawinglayer { namespace primitive2d { class
TextSimplePortionPrimitive2D; } }
+namespace drawinglayer::primitive2d { class TextSimplePortionPrimitive2D; }
namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
index 30d13b787b37..d39a81f98b8b 100644
--- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx
@@ -24,9 +24,9 @@
#include <drawinglayer/primitive2d/textprimitive2d.hxx>
#include <drawinglayer/primitive2d/textenumsprimitive2d.hxx>
-namespace basegfx { namespace utils {
+namespace basegfx::utils {
class B2DHomMatrixBufferedOnDemandDecompose;
-}}
+}
namespace drawinglayer
{
diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx
b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
index fa418e073f21..3f1f189aa03a 100644
--- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx
+++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx
@@ -32,9 +32,9 @@ namespace vcl { class Font; }
class GDIMetaFile;
namespace tools { class Rectangle; }
enum class DrawTextFlags;
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class FontAttribute;
-}}
+}
namespace com::sun::star::lang { struct Locale; }
diff --git a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index 2d2fd1b68963..8fab8e6f6089 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -44,11 +44,11 @@
// predefines
-namespace drawinglayer { namespace geometry {
+namespace drawinglayer::geometry {
class ViewInformation3D;
-}}
+}
-namespace drawinglayer { namespace primitive3d {
+namespace drawinglayer::primitive3d {
/// typedefs for basePrimitive3DImplBase, Primitive3DContainer and
Primitive3DReference
typedef cppu::WeakComponentImplHelper< css::graphic::XPrimitive3D >
BasePrimitive3DImplBase;
typedef css::uno::Reference< css::graphic::XPrimitive3D >
Primitive3DReference;
@@ -72,7 +72,7 @@ namespace drawinglayer { namespace primitive3d {
bool operator!=(const Primitive3DContainer& rB) const { return
!operator==(rB); }
basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D&
aViewInformation) const;
};
-}}
+}
// basePrimitive3D class
diff --git a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
index 8a296b9a334f..621de447986e 100644
--- a/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
+++ b/include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx
@@ -29,9 +29,9 @@
// predefines
-namespace drawinglayer { namespace geometry {
+namespace drawinglayer::geometry {
class ViewInformation3D;
-}}
+}
namespace drawinglayer
diff --git a/include/drawinglayer/processor2d/hittestprocessor2d.hxx
b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
index 184149e00412..3b044b451f2f 100644
--- a/include/drawinglayer/processor2d/hittestprocessor2d.hxx
+++ b/include/drawinglayer/processor2d/hittestprocessor2d.hxx
@@ -26,7 +26,7 @@
namespace basegfx { class B2DPolygon; }
namespace basegfx { class B2DPolyPolygon; }
-namespace drawinglayer { namespace primitive2d { class ScenePrimitive2D; }}
+namespace drawinglayer::primitive2d { class ScenePrimitive2D; }
namespace drawinglayer
{
diff --git a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx
b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx
index 38612dbaf8a5..59d8fc2b1dc9 100644
--- a/include/drawinglayer/processor2d/objectinfoextractor2d.hxx
+++ b/include/drawinglayer/processor2d/objectinfoextractor2d.hxx
@@ -22,7 +22,7 @@
#include <drawinglayer/drawinglayerdllapi.h>
#include <drawinglayer/processor2d/baseprocessor2d.hxx>
-namespace drawinglayer { namespace primitive2d { class ObjectInfoPrimitive2D;
}}
+namespace drawinglayer::primitive2d { class ObjectInfoPrimitive2D; }
namespace drawinglayer
{
diff --git a/include/drawinglayer/processor2d/processor2dtools.hxx
b/include/drawinglayer/processor2d/processor2dtools.hxx
index 18ba6b216dc7..95c1c679336c 100644
--- a/include/drawinglayer/processor2d/processor2dtools.hxx
+++ b/include/drawinglayer/processor2d/processor2dtools.hxx
@@ -22,8 +22,8 @@
#include <drawinglayer/drawinglayerdllapi.h>
#include <memory>
-namespace drawinglayer { namespace geometry { class ViewInformation2D; } }
-namespace drawinglayer { namespace processor2d { class BaseProcessor2D; } }
+namespace drawinglayer::geometry { class ViewInformation2D; }
+namespace drawinglayer::processor2d { class BaseProcessor2D; }
class OutputDevice;
diff --git a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx
b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx
index 25ea79ff477a..f15a98e34784 100644
--- a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx
+++ b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx
@@ -25,11 +25,11 @@
class OutputDevice;
-namespace drawinglayer { namespace processor2d {
+namespace drawinglayer::processor2d {
class BaseProcessor2D;
-}}
+}
-namespace drawinglayer { namespace geometry { class ViewInformation2D; } }
+namespace drawinglayer::geometry { class ViewInformation2D; }
namespace drawinglayer
{
diff --git a/include/editeng/SpellPortions.hxx
b/include/editeng/SpellPortions.hxx
index 89b90d87f09e..0681b5dbbfcc 100644
--- a/include/editeng/SpellPortions.hxx
+++ b/include/editeng/SpellPortions.hxx
@@ -26,9 +26,9 @@
#include <com/sun/star/linguistic2/SingleProofreadingError.hpp>
#include <vector>
-namespace com{ namespace sun{ namespace star{ namespace linguistic2{
+namespace com::sun::star::linguistic2 {
class XSpellAlternatives;
-}}}}
+}
namespace com::sun::star::linguistic2 { class XProofreader; }
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index d8e780e736e8..292b620a9b95 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -46,7 +46,7 @@
template <typename Arg, typename Ret> class Link;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace linguistic2 {
class XSpellChecker1;
class XHyphenator;
@@ -57,7 +57,7 @@ namespace com { namespace sun { namespace star {
namespace lang {
struct Locale;
}
-}}}
+}
namespace svx {
struct SpellPortion;
diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index 7aeff9965a5e..1cadb9978042 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -25,11 +25,11 @@
#include <vcl/abstdlg.hxx>
#include <editeng/hangulhanja.hxx>
-namespace com { namespace sun { namespace star { namespace linguistic2
+namespace com::sun::star::linguistic2
{
class XThesaurus;
class XHyphenator;
-} } } }
+}
template <typename Arg, typename Ret> class Link;
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index c7cd1e02209a..2f44c8e2522b 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -27,11 +27,9 @@
#include <com/sun/star/text/textfield/Type.hpp>
-namespace com { namespace sun { namespace star { namespace text {
-
-class XTextContent;
-
-}}}}
+namespace com::sun::star::text {
+ class XTextContent;
+}
class SvNumberFormatter;
class MetaAction;
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 1b8c4b130463..fda3169cbfd9 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -37,11 +37,7 @@ class SvxBrushItem;
namespace vcl { class Font; }
class Graphic;
class SvxNodeNum;
-namespace com{namespace sun{ namespace star{
- namespace text{
- class XNumberingFormatter;
- }
-}}}
+namespace com::sun::star::text { class XNumberingFormatter; }
namespace com::sun::star::lang { struct Locale; }
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 7037e30da288..a048c4e06ac0 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -77,16 +77,16 @@ enum class PointerStyle;
class SvxNumRule;
enum class TextRotation;
-namespace com { namespace sun { namespace star { namespace linguistic2 {
+namespace com::sun::star::linguistic2 {
class XSpellChecker1;
class XHyphenator;
-}}}}
+}
namespace svx{
struct SpellPortion;
typedef std::vector<SpellPortion> SpellPortions;
}
namespace basegfx { class B2DPolyPolygon; }
-namespace com { namespace sun { namespace star { namespace lang { struct
Locale; } } } }
+namespace com::sun::star::lang { struct Locale; }
diff --git a/include/editeng/overflowingtxt.hxx
b/include/editeng/overflowingtxt.hxx
index 2f5aac938655..ad0a662d1201 100644
--- a/include/editeng/overflowingtxt.hxx
+++ b/include/editeng/overflowingtxt.hxx
@@ -27,10 +27,9 @@
#include <com/sun/star/uno/Reference.h>
#include <memory>
-namespace com { namespace sun { namespace star {
- namespace datatransfer {
- class XTransferable;
-} } } }
+namespace com::sun::star {
+ namespace datatransfer { class XTransferable; }
+}
namespace rtl {
class OUString;
};
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index 69dfbbc6c780..e9c719d45364 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -28,11 +28,11 @@
// forward ---------------------------------------------------------------
-namespace com { namespace sun { namespace star { namespace linguistic2 {
+namespace com::sun::star::linguistic2 {
class XDictionary;
class XSpellChecker1;
class XHyphenator;
-}}}}
+}
// misc functions
---------------------------------------------------------------
diff --git a/include/editeng/unolingu.hxx b/include/editeng/unolingu.hxx
index 2deae37c5a13..3032b7b7dc74 100644
--- a/include/editeng/unolingu.hxx
+++ b/include/editeng/unolingu.hxx
@@ -83,9 +83,9 @@ public:
};
-namespace com { namespace sun { namespace star { namespace linguistic2 {
+namespace com::sun::star::linguistic2 {
class XHyphenatedWord;
-}}}}
+}
struct SvxAlternativeSpelling
diff --git a/include/filter/msfilter/escherex.hxx
b/include/filter/msfilter/escherex.hxx
index 5a1bf293152c..9acfb51bd892 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -44,12 +44,12 @@
class Color;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt { struct Rectangle; }
namespace beans { class XPropertySet; }
namespace drawing { struct EnhancedCustomShapeParameter; }
namespace drawing { struct Hatch; }
-} } }
+}
namespace tools {
class Polygon;
@@ -441,7 +441,7 @@ enum MSOPATHTYPE
const sal_uInt32 DFF_DGG_CLUSTER_SIZE = 0x00000400; /// Shape IDs per
cluster in DGG atom.
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt {
struct Gradient;
}
@@ -450,7 +450,7 @@ namespace com { namespace sun { namespace star {
class XShape;
class XShapes;
}
-}}}
+}
struct MSFILTER_DLLPUBLIC EscherConnectorListEntry
{
diff --git a/include/filter/msfilter/mscodec.hxx
b/include/filter/msfilter/mscodec.hxx
index 47067a38fe5e..a7917ec1aa09 100644
--- a/include/filter/msfilter/mscodec.hxx
+++ b/include/filter/msfilter/mscodec.hxx
@@ -27,9 +27,9 @@
#include <sal/types.h>
#include <vector>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { struct NamedValue; }
-} } }
+}
namespace msfilter {
diff --git a/include/filter/msfilter/msdffimp.hxx
b/include/filter/msfilter/msdffimp.hxx
index 2af6fdfa4682..78ea42bae527 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -66,11 +66,11 @@ class SfxItemSet;
struct DffObjData;
class SvGlobalName;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { class XPropertySet; }
namespace embed { class XEmbeddedObject; }
namespace embed { class XStorage; }
-} } }
+}
class MSFILTER_DLLPUBLIC SvxMSDffClientData
{
diff --git a/include/filter/msfilter/msocximex.hxx
b/include/filter/msfilter/msocximex.hxx
index ae29caae8374..89e64de23af4 100644
--- a/include/filter/msfilter/msocximex.hxx
+++ b/include/filter/msfilter/msocximex.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <filter/msfilter/msfilterdllapi.h>
-namespace com{namespace sun{namespace star{
+namespace com::sun::star {
namespace drawing{
class XDrawPage;
class XShape;
@@ -43,8 +43,7 @@ namespace com{namespace sun{namespace star{
namespace frame{
class XModel;
}
-
-}}}
+}
class MSFILTER_DLLPUBLIC SvxMSConvertOCXControls
{
diff --git a/include/filter/msfilter/msoleexp.hxx
b/include/filter/msfilter/msoleexp.hxx
index c6a3eab9d138..77b2cc3b4608 100644
--- a/include/filter/msfilter/msoleexp.hxx
+++ b/include/filter/msfilter/msoleexp.hxx
@@ -23,9 +23,9 @@
#include <filter/msfilter/msfilterdllapi.h>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace embed { class XEmbeddedObject; }
-} } }
+}
namespace svt {
class EmbeddedObjectRef;
diff --git a/include/filter/msfilter/mstoolbar.hxx
b/include/filter/msfilter/mstoolbar.hxx
index f3c3e1ac7a47..7ec9ee7c0ab7 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -20,13 +20,13 @@
#include <tools/stream.hxx>
#include <vcl/bitmapex.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { struct PropertyValue; }
namespace container { class XIndexAccess; }
namespace graphic { class XGraphic; }
namespace ui { class XUIConfigurationManager; }
namespace ui { class XUIConfigurationManagerSupplier; }
-} } }
+}
class TBCHeader;
diff --git a/include/filter/msfilter/msvbahelper.hxx
b/include/filter/msfilter/msvbahelper.hxx
index 5e142df6b503..673476caa9b6 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -31,11 +31,11 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace frame { class XModel; }
namespace uno { class XComponentContext; }
namespace uno { class XInterface; }
-} } }
+}
class SfxObjectShell;
diff --git a/include/filter/msfilter/svdfppt.hxx
b/include/filter/msfilter/svdfppt.hxx
index 9ee6944f1138..eb54305fa968 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -48,12 +48,12 @@
#include <vcl/graph.hxx>
#include <salhelper/simplereferenceobject.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt { struct Size; }
namespace drawing { class XShape; }
namespace form { class XFormComponent; }
namespace frame { class XModel; }
-} } }
+}
class SdrPage;
class SdrObject;
diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx
index 5b85f749ef75..5ce3b2a2159c 100644
--- a/include/filter/msfilter/util.hxx
+++ b/include/filter/msfilter/util.hxx
@@ -20,10 +20,10 @@
class Color;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt { struct Size; }
namespace lang { struct Locale; }
-} } }
+}
namespace msfilter {
namespace util {
diff --git a/include/formula/FormulaCompiler.hxx
b/include/formula/FormulaCompiler.hxx
index 185dd7a04ada..ecc9e5dd3f4f 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -42,12 +42,12 @@
#define FORMULA_MAXPARAMSII 8 /* maximum number of parameters for
functions that have implicit intersection ranges */
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet {
struct FormulaOpCodeMapEntry;
struct FormulaToken;
}
-}}}
+}
class CharClass;
enum class FormulaError : sal_uInt16;
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx
b/include/formula/FormulaOpCodeMapperObj.hxx
index 8804e2488d94..bd0595d438d9 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -31,12 +31,12 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet { struct FormulaOpCodeMapEntry; }
namespace sheet { struct FormulaToken; }
namespace uno { class XComponentContext; }
namespace uno { class XInterface; }
-} } }
+}
namespace formula
{
diff --git a/include/formula/IFunctionDescription.hxx
b/include/formula/IFunctionDescription.hxx
index 5d4616b9b9e5..82fd50d9736c 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -29,11 +29,11 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet { struct FormulaToken; }
namespace sheet { class XFormulaOpCodeMapper; }
namespace sheet { class XFormulaParser; }
-} } }
+}
namespace com::sun::star::uno { template <class E> class Sequence; }
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 44122686c158..87377cb228e0 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -36,9 +36,9 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace sheet { struct FormulaToken; }
-} } }
+}
namespace com::sun::star::uno { template <typename > class Sequence; }
namespace formula { class FormulaTokenArray; }
diff --git a/include/i18nutil/casefolding.hxx b/include/i18nutil/casefolding.hxx
index 14b0f6bf4333..65dfc2d515d2 100644
--- a/include/i18nutil/casefolding.hxx
+++ b/include/i18nutil/casefolding.hxx
@@ -24,7 +24,7 @@
#include <o3tl/typed_flags_set.hxx>
#include <config_options.h>
-namespace com { namespace sun { namespace star { namespace lang { struct
Locale; } } } }
+namespace com::sun::star::lang { struct Locale; }
enum class TransliterationFlags;
diff --git a/include/i18nutil/paper.hxx b/include/i18nutil/paper.hxx
index 99bf5df87116..3590e170a60a 100644
--- a/include/i18nutil/paper.hxx
+++ b/include/i18nutil/paper.hxx
@@ -23,7 +23,7 @@
#include <i18nutil/i18nutildllapi.h>
#include <rtl/string.hxx>
-namespace com { namespace sun { namespace star { namespace lang { struct
Locale; } } } }
+namespace com::sun::star::lang { struct Locale; }
//!! The values of the following enumerators must correspond to the array
position
//!! of the respective paper size in the file i18nutil/source/utility/paper.cxx
diff --git a/include/i18nutil/widthfolding.hxx
b/include/i18nutil/widthfolding.hxx
index 73ad5eb2a558..616b6884e5a1 100644
--- a/include/i18nutil/widthfolding.hxx
+++ b/include/i18nutil/widthfolding.hxx
@@ -24,7 +24,7 @@
#include <i18nutil/i18nutildllapi.h>
#include <config_options.h>
-namespace com { namespace sun { namespace star { namespace uno { template
<typename > class Sequence; } } } }
+namespace com::sun::star::uno { template <typename > class Sequence; }
namespace i18nutil { class oneToOneMapping; }
namespace i18nutil {
diff --git a/include/jvmaccess/classpath.hxx b/include/jvmaccess/classpath.hxx
index c3e3f7fe3603..9882a42ce25e 100644
--- a/include/jvmaccess/classpath.hxx
+++ b/include/jvmaccess/classpath.hxx
@@ -27,11 +27,11 @@
#include <jvmaccess/jvmaccessdllapi.h>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
class XComponentContext;
-} } } }
+}
-namespace com { namespace sun { namespace star { namespace uno { template
<typename > class Reference; } } } }
+namespace com::sun::star::uno { template <typename > class Reference; }
namespace jvmaccess {
diff --git a/include/linguistic/lngprophelp.hxx
b/include/linguistic/lngprophelp.hxx
index 37a2124d2206..52af61c4e61c 100644
--- a/include/linguistic/lngprophelp.hxx
+++ b/include/linguistic/lngprophelp.hxx
@@ -29,14 +29,8 @@
#include <rtl/ref.hxx>
#include <config_options.h>
-namespace com { namespace sun { namespace star { namespace beans {
- class XPropertySet;
-}}}}
-
-namespace com { namespace sun { namespace star { namespace linguistic2 {
- struct LinguServiceEvent;
-}}}}
-
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::linguistic2 { struct LinguServiceEvent; }
namespace com::sun::star::linguistic2 { class XLinguProperties; }
diff --git a/include/linguistic/misc.hxx b/include/linguistic/misc.hxx
index f0186f3dc33f..a251ced79c63 100644
--- a/include/linguistic/misc.hxx
+++ b/include/linguistic/misc.hxx
@@ -33,14 +33,8 @@
#include <vector>
-namespace com { namespace sun { namespace star { namespace beans {
- class XPropertySet;
-}}}}
-
-namespace com { namespace sun { namespace star { namespace frame {
- class XDesktop2;
-}}}}
-
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::frame { class XDesktop2; }
namespace com::sun::star::linguistic2 { class XDictionary; }
namespace com::sun::star::linguistic2 { class XDictionaryEntry; }
namespace com::sun::star::linguistic2 { class XHyphenatedWord; }
diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index 00375842e1ad..2318e52a17cc 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -25,9 +25,9 @@
#include <oox/dllapi.h>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { struct NamedValue; }
-} } }
+}
namespace oox { class AttributeList; }
diff --git a/include/oox/core/contexthandler.hxx
b/include/oox/core/contexthandler.hxx
index 51f442f4731f..f9b4ef9a0f5d 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -32,10 +32,10 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XFastAttributeList; } }
- namespace xml { namespace sax { class XLocator; } }
-} } }
+namespace com::sun::star {
+ namespace xml::sax { class XFastAttributeList; }
+ namespace xml::sax { class XLocator; }
+}
namespace oox { class SequenceInputStream; }
diff --git a/include/oox/core/contexthandler2.hxx
b/include/oox/core/contexthandler2.hxx
index 06761ff0797c..02e2cf2a08f1 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -30,10 +30,10 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XFastAttributeList; } }
- namespace xml { namespace sax { class XFastContextHandler; } }
-} } }
+namespace com::sun::star {
+ namespace xml::sax { class XFastAttributeList; }
+ namespace xml::sax { class XFastContextHandler; }
+}
namespace oox {
class AttributeList;
diff --git a/include/oox/core/fastparser.hxx b/include/oox/core/fastparser.hxx
index db8057da0d25..fa79aba5d574 100644
--- a/include/oox/core/fastparser.hxx
+++ b/include/oox/core/fastparser.hxx
@@ -26,14 +26,14 @@
#include <sal/types.h>
#include <oox/dllapi.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io { class XInputStream; }
namespace uno { class XComponentContext; }
- namespace xml { namespace sax { class XFastDocumentHandler; } }
- namespace xml { namespace sax { class XFastParser; } }
- namespace xml { namespace sax { class XFastTokenHandler; } }
- namespace xml { namespace sax { struct InputSource; } }
-} } }
+ namespace xml::sax { class XFastDocumentHandler; }
+ namespace xml::sax { class XFastParser; }
+ namespace xml::sax { class XFastTokenHandler; }
+ namespace xml::sax { struct InputSource; }
+}
namespace oox {
struct NamespaceMap;
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index ed4e35f3b52d..e341de4e0885 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -38,7 +38,7 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { struct PropertyValue; }
namespace drawing { class XShape; }
namespace frame { class XFrame; }
@@ -50,7 +50,7 @@ namespace com { namespace sun { namespace star {
namespace lang { class XMultiServiceFactory; }
namespace task { class XStatusIndicator; }
namespace uno { class XComponentContext; }
-} } }
+}
namespace comphelper {
class SequenceAsHashMap;
@@ -64,10 +64,10 @@ namespace oox {
class ModelObjectHelper;
}
-namespace oox { namespace ole {
+namespace oox::ole {
class OleObjectHelper;
class VbaProject;
-} }
+}
namespace oox {
namespace core {
diff --git a/include/oox/core/filterdetect.hxx
b/include/oox/core/filterdetect.hxx
index 9b34de75b09c..ccb9fe9170b8 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -33,14 +33,14 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { struct PropertyValue; }
namespace io { class XInputStream; }
namespace uno { class XComponentContext; }
- namespace xml { namespace sax { class XFastAttributeList; } }
- namespace xml { namespace sax { class XFastContextHandler; } }
- namespace xml { namespace sax { class XLocator; } }
-} } }
+ namespace xml::sax { class XFastAttributeList; }
+ namespace xml::sax { class XFastContextHandler; }
+ namespace xml::sax { class XLocator; }
+}
namespace utl { class MediaDescriptor; }
diff --git a/include/oox/core/fragmenthandler.hxx
b/include/oox/core/fragmenthandler.hxx
index 2563a7ac9bf8..5983a50c5e7d 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -32,12 +32,12 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io { class XInputStream; }
- namespace xml { namespace sax { class XFastAttributeList; } }
- namespace xml { namespace sax { class XFastContextHandler; } }
- namespace xml { namespace sax { class XLocator; } }
-} } }
+ namespace xml::sax { class XFastAttributeList; }
+ namespace xml::sax { class XFastContextHandler; }
+ namespace xml::sax { class XLocator; }
+}
namespace oox {
namespace core {
diff --git a/include/oox/core/fragmenthandler2.hxx
b/include/oox/core/fragmenthandler2.hxx
index 7c64c200041d..93822ceafcca 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -31,10 +31,10 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XFastAttributeList; } }
- namespace xml { namespace sax { class XFastContextHandler; } }
-} } }
+namespace com::sun::star {
+ namespace xml::sax { class XFastAttributeList; }
+ namespace xml::sax { class XFastContextHandler; }
+}
namespace oox {
class AttributeList;
diff --git a/include/oox/core/relationshandler.hxx
b/include/oox/core/relationshandler.hxx
index 5f284f4a6657..f35d186058f0 100644
--- a/include/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
@@ -25,10 +25,10 @@
#include <oox/core/relations.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XFastAttributeList; } }
- namespace xml { namespace sax { class XFastContextHandler; } }
-} } }
+namespace com::sun::star {
+ namespace xml::sax { class XFastAttributeList; }
+ namespace xml::sax { class XFastContextHandler; }
+}
namespace oox {
namespace core {
diff --git a/include/oox/core/xmlfilterbase.hxx
b/include/oox/core/xmlfilterbase.hxx
index 68bd801eaefd..4264e54fb3e4 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -31,7 +31,7 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace document { class XDocumentProperties; }
namespace io { class XInputStream; }
namespace io { class XOutputStream; }
@@ -40,17 +40,17 @@ namespace com { namespace sun { namespace star {
namespace text { class XTextCursor; }
namespace text { class XTextField; }
namespace uno { class XComponentContext; }
- namespace xml { namespace dom { class XDocument; } }
- namespace xml { namespace sax { class XFastSAXSerializable; } }
-} } }
+ namespace xml::dom { class XDocument; }
+ namespace xml::sax { class XFastSAXSerializable; }
+}
namespace oox {
namespace drawingml { class Theme; }
- namespace drawingml { namespace chart { class ChartConverter; } }
- namespace drawingml { namespace table {
+ namespace drawingml::chart { class ChartConverter; }
+ namespace drawingml::table {
class TableStyleList;
typedef std::shared_ptr< TableStyleList > TableStyleListPtr;
- } }
+ }
namespace vml { class Drawing; }
}
diff --git a/include/oox/crypto/DocumentDecryption.hxx
b/include/oox/crypto/DocumentDecryption.hxx
index 10a971182c8b..7919fa7a40f3 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -20,14 +20,14 @@
#include <oox/crypto/CryptoEngine.hxx>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { struct NamedValue; }
namespace io { class XInputStream; }
namespace io { class XStream; }
namespace uno { class XComponentContext; }
-} } }
+}
-namespace oox { namespace ole { class OleStorage; } }
+namespace oox::ole { class OleStorage; }
namespace oox {
namespace core {
diff --git a/include/oox/crypto/DocumentEncryption.hxx
b/include/oox/crypto/DocumentEncryption.hxx
index 03ad719d7c99..9be7c99bb41c 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -17,11 +17,11 @@
#include <oox/crypto/Standard2007Engine.hxx>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io { class XStream; }
-} } }
+}
-namespace oox { namespace ole { class OleStorage; } }
+namespace oox::ole { class OleStorage; }
namespace oox {
namespace core {
diff --git a/include/oox/drawingml/chart/chartconverter.hxx
b/include/oox/drawingml/chart/chartconverter.hxx
index d4371c6f9c7b..a950cbcb789e 100644
--- a/include/oox/drawingml/chart/chartconverter.hxx
+++ b/include/oox/drawingml/chart/chartconverter.hxx
@@ -24,16 +24,16 @@
#include <oox/dllapi.h>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt { struct Point; }
namespace awt { struct Size; }
namespace drawing { class XShapes; }
namespace chart2 { class XChartDocument; }
- namespace chart2 { namespace data { class XDataProvider; } }
- namespace chart2 { namespace data { class XDataSequence; } }
-} } }
+ namespace chart2::data { class XDataProvider; }
+ namespace chart2::data { class XDataSequence; }
+}
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
namespace oox {
namespace drawingml {
diff --git a/include/oox/drawingml/clrscheme.hxx
b/include/oox/drawingml/clrscheme.hxx
index 80c932b44a1e..21553aafe2fe 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -31,7 +31,7 @@
#include <rtl/ustring.hxx>
#include <tools/color.hxx>
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
enum PredefinedClrSchemeId {
//dk1,
@@ -90,7 +90,7 @@ public:
::Color& rColor) const;
};
-} }
+}
#endif // INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX
diff --git a/include/oox/drawingml/connectorshapecontext.hxx
b/include/oox/drawingml/connectorshapecontext.hxx
index 4b897942394e..1efdd2e40611 100644
--- a/include/oox/drawingml/connectorshapecontext.hxx
+++ b/include/oox/drawingml/connectorshapecontext.hxx
@@ -27,9 +27,9 @@
#include <sal/types.h>
namespace oox { class AttributeList; }
-namespace oox { namespace core { class ContextHandler2Helper; } }
+namespace oox::core { class ContextHandler2Helper; }
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
class OOX_DLLPUBLIC ConnectorShapeContext final : public ShapeContext
{
@@ -39,7 +39,7 @@ public:
virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32
Element, const ::oox::AttributeList& rAttribs ) override;
};
-} }
+}
#endif // INCLUDED_OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
diff --git a/include/oox/drawingml/diagram/diagram.hxx
b/include/oox/drawingml/diagram/diagram.hxx
index a5f69b4d56bd..77cef9a88323 100644
--- a/include/oox/drawingml/diagram/diagram.hxx
+++ b/include/oox/drawingml/diagram/diagram.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/xml/dom/XDocument.hpp>
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
class DiagramData;
typedef std::shared_ptr<DiagramData> DiagramDataPtr;
@@ -56,7 +56,7 @@ void loadDiagram(ShapePtr const& pShape,
OOX_DLLPUBLIC void reloadDiagram(SdrObject* pObj, core::XmlFilterBase&
rFilter);
-} }
+}
#endif
diff --git a/include/oox/drawingml/drawingmltypes.hxx
b/include/oox/drawingml/drawingmltypes.hxx
index 5e3517b58524..0aac648ad5a4 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -35,10 +35,10 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace drawing { struct Hatch; }
- namespace xml { namespace sax { class XFastAttributeList; } }
-} } }
+ namespace xml::sax { class XFastAttributeList; }
+}
namespace oox {
namespace drawingml {
diff --git a/include/oox/drawingml/graphicshapecontext.hxx
b/include/oox/drawingml/graphicshapecontext.hxx
index 655e15a31ea3..4813d5fc9aed 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -28,10 +28,10 @@
#include <sal/types.h>
namespace oox { class AttributeList; }
-namespace oox { namespace core { class ContextHandler2Helper; } }
-namespace oox { namespace vml { struct OleObjectInfo; } }
+namespace oox::core { class ContextHandler2Helper; }
+namespace oox::vml { struct OleObjectInfo; }
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
class OOX_DLLPUBLIC GraphicShapeContext : public ShapeContext
{
@@ -103,7 +103,7 @@ private:
};
-} }
+}
#endif // INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 53290f0cbbdb..b1f15e5b6ece 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -39,22 +39,22 @@
namespace basegfx { class B2DHomMatrix; }
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt { struct Rectangle; }
namespace drawing { class XShape; }
namespace drawing { class XShapes; }
namespace uno { class Any; }
-} } }
+}
-namespace oox { namespace core {
+namespace oox::core {
class XmlFilterBase;
-} }
+}
-namespace oox { namespace vml {
+namespace oox::vml {
struct OleObjectInfo;
-} }
+}
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
class Theme;
struct EffectProperties;
@@ -379,7 +379,7 @@ private:
bool mbUseBgFill = false;
};
-} }
+}
#endif // INCLUDED_OOX_DRAWINGML_SHAPE_HXX
diff --git a/include/oox/drawingml/shapecontext.hxx
b/include/oox/drawingml/shapecontext.hxx
index 15684323ca9f..170f50403d0a 100644
--- a/include/oox/drawingml/shapecontext.hxx
+++ b/include/oox/drawingml/shapecontext.hxx
@@ -28,7 +28,7 @@
namespace oox { class AttributeList; }
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
class OOX_DLLPUBLIC ShapeContext : public ::oox::core::ContextHandler2
{
@@ -46,7 +46,7 @@ protected:
ShapePtr mpShapePtr;
};
-} }
+}
#endif // INCLUDED_OOX_DRAWINGML_SHAPECONTEXT_HXX
diff --git a/include/oox/drawingml/shapegroupcontext.hxx
b/include/oox/drawingml/shapegroupcontext.hxx
index 4fa313493d3e..3e458927d9d5 100644
--- a/include/oox/drawingml/shapegroupcontext.hxx
+++ b/include/oox/drawingml/shapegroupcontext.hxx
@@ -28,7 +28,7 @@
namespace oox { class AttributeList; }
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
class OOX_DLLPUBLIC ShapeGroupContext : public ::oox::core::FragmentHandler2
{
@@ -41,7 +41,7 @@ protected:
ShapePtr mpGroupShapePtr;
};
-} }
+}
#endif // INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx
index bde25e748ba8..3d43cca9af80 100644
--- a/include/oox/drawingml/theme.hxx
+++ b/include/oox/drawingml/theme.hxx
@@ -31,9 +31,9 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace dom { class XDocument; } }
-} } }
+namespace com::sun::star {
+ namespace xml::dom { class XDocument; }
+}
namespace oox {
namespace drawingml {
diff --git a/include/oox/drawingml/themefragmenthandler.hxx
b/include/oox/drawingml/themefragmenthandler.hxx
index b83541e7d154..56db23f6929c 100644
--- a/include/oox/drawingml/themefragmenthandler.hxx
+++ b/include/oox/drawingml/themefragmenthandler.hxx
@@ -27,7 +27,7 @@
#include <sal/types.h>
namespace oox { class AttributeList; }
-namespace oox { namespace core { class XmlFilterBase; } }
+namespace oox::core { class XmlFilterBase; }
namespace oox {
namespace drawingml {
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 5ad5f948f4cf..44bca5476b2e 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -42,20 +42,20 @@
#ifdef DBG_UTIL
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io { class XInputStream; }
namespace io { class XOutputStream; }
namespace io { class XTextOutputStream2; }
namespace uno { class XComponentContext; }
-} } }
+}
namespace oox {
class TextInputStream;
}
-namespace oox { namespace core {
+namespace oox::core {
class FilterBase;
-} }
+}
namespace oox {
namespace dump {
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index 7dfe26dc24c9..bab5eb4a077f 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -34,9 +34,9 @@
#ifdef DBG_UTIL
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io { class XInputStream; }
-} } }
+}
namespace oox {
namespace dump {
diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx
index 158834077dc0..01cda8e6bd0f 100644
--- a/include/oox/dump/pptxdumper.hxx
+++ b/include/oox/dump/pptxdumper.hxx
@@ -26,12 +26,12 @@
#ifdef DBG_UTIL
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io { class XInputStream; }
namespace uno { class XComponentContext; }
-} } }
+}
-namespace oox { namespace core { class FilterBase; } }
+namespace oox::core { class FilterBase; }
namespace oox {
namespace dump {
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index 2b3353173520..7709cf46213f 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -27,17 +27,17 @@
#ifdef DBG_UTIL
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io { class XInputStream; }
namespace uno { class XComponentContext; }
-} } }
+}
namespace oox {
class BinaryInputStream;
class SequenceInputStream;
}
-namespace oox { namespace core { class FilterBase; } }
+namespace oox::core { class FilterBase; }
namespace oox {
namespace dump {
diff --git a/include/oox/export/chartexport.hxx
b/include/oox/export/chartexport.hxx
index c3ce9fd99a9d..39c446fac4aa 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -33,7 +33,7 @@
#include <sal/types.h>
#include <sax/fshelper.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans {
class XPropertySet;
}
@@ -60,14 +60,14 @@ namespace com { namespace sun { namespace star {
namespace frame {
class XModel;
}
-}}}
+}
namespace oox {
namespace core {
class XmlFilterBase;
}}
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
enum AxesType
{
@@ -231,7 +231,7 @@ public:
css::chart2::XChartDocument > & xChartDoc );
};
-}}
+}
#endif // INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index 7d71f6f3e02c..aedd408abe28 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -46,7 +46,7 @@
class Graphic;
class SdrObjCustomShape;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt {
struct FontDescriptor;
struct Gradient;
@@ -80,7 +80,7 @@ namespace uno {
namespace frame {
class XModel;
}
-}}}
+}
struct EscherConnectorListEntry;
class OutlinerParaObject;
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index a8ea2d5c6005..2dbbb658c036 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -36,7 +36,7 @@
#include <tools/fract.hxx>
#include <vcl/mapmod.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans {
class XPropertySet;
}
@@ -54,7 +54,7 @@ namespace uno {
class XComponentContext;
class XInterface;
}
-}}}
+}
namespace oox {
namespace core {
@@ -76,7 +76,7 @@ OOX_DLLPUBLIC css::uno::Reference<css::io::XInputStream>
GetOLEObjectStream(
}
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
class OOX_DLLPUBLIC ShapeExport : public DrawingML {
@@ -203,7 +203,7 @@ public:
static sal_Int32 GetShapeID( const css::uno::Reference<
css::drawing::XShape >& rShape, ShapeHashMap* pShapeMap );
};
-}}
+}
#endif // INCLUDED_OOX_EXPORT_SHAPES_HXX
diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 4e9fa9866341..510505aa3d84 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -66,9 +66,9 @@ OString write1000thOfAPercent(T number)
return OString::number( lround(number * 1000.0) );
}
-namespace oox { namespace drawingml {
+namespace oox::drawingml {
enum DocumentType { DOCUMENT_DOCX, DOCUMENT_PPTX, DOCUMENT_XLSX };
-} }
+}
#endif
diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx
index 83b5b91c0d41..61185e57d5de 100644
--- a/include/oox/export/vmlexport.hxx
+++ b/include/oox/export/vmlexport.hxx
@@ -31,11 +31,11 @@
#include <sax/fshelper.hxx>
#include <vcl/checksum.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace drawing {
class XShape;
}
-}}}
+}
namespace oox {
namespace drawingml {
diff --git a/include/oox/helper/attributelist.hxx
b/include/oox/helper/attributelist.hxx
index 0bf70a0f98ce..43808761c922 100644
--- a/include/oox/helper/attributelist.hxx
+++ b/include/oox/helper/attributelist.hxx
@@ -30,9 +30,9 @@
#include <sal/types.h>
#include <oox/drawingml/color.hxx>
-namespace com { namespace sun { namespace star {
- namespace xml { namespace sax { class XFastAttributeList; } }
-} } }
+namespace com::sun::star {
+ namespace xml::sax { class XFastAttributeList; }
+}
namespace sax_fastparser {
class FastAttributeList;
diff --git a/include/oox/helper/binaryinputstream.hxx
b/include/oox/helper/binaryinputstream.hxx
index af6a6240fffc..e27b2def9c9c 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -33,9 +33,9 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io { class XInputStream; }
-} } }
+}
namespace oox {
diff --git a/include/oox/helper/binaryoutputstream.hxx
b/include/oox/helper/binaryoutputstream.hxx
index cf3a964de8bd..571b23aa8c80 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -31,9 +31,9 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io { class XOutputStream; }
-} } }
+}
namespace oox {
diff --git a/include/oox/helper/binarystreambase.hxx
b/include/oox/helper/binarystreambase.hxx
index f5302d470738..8e93d1458620 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -25,9 +25,9 @@
#include <oox/dllapi.h>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace io { class XSeekable; }
-} } }
+}
namespace oox {
diff --git a/include/oox/helper/containerhelper.hxx
b/include/oox/helper/containerhelper.hxx
index 81fb69a009d3..1bc5ee17f0d8 100644
--- a/include/oox/helper/containerhelper.hxx
+++ b/include/oox/helper/containerhelper.hxx
@@ -29,11 +29,11 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace container { class XNameAccess; }
namespace container { class XNameContainer; }
namespace uno { class Any; }
-} } }
+}
namespace oox {
diff --git a/include/oox/helper/grabbagstack.hxx
b/include/oox/helper/grabbagstack.hxx
index de6802ecc1b5..bd03535c9aa6 100644
--- a/include/oox/helper/grabbagstack.hxx
+++ b/include/oox/helper/grabbagstack.hxx
@@ -19,9 +19,9 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace uno { class Any; }
-} } }
+}
namespace oox {
diff --git a/include/oox/helper/graphichelper.hxx
b/include/oox/helper/graphichelper.hxx
index 4854985d1014..301bc37e27af 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -34,7 +34,7 @@
struct WmfExternal;
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt { struct Point; }
namespace awt { struct Size; }
namespace awt { class XUnitConversion; }
@@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star {
namespace graphic { class XGraphicObject; }
namespace graphic { class XGraphicProvider; }
namespace uno { class XComponentContext; }
-} } }
+}
namespace oox {
diff --git a/include/oox/helper/modelobjecthelper.hxx
b/include/oox/helper/modelobjecthelper.hxx
index 2b9e1d2cfd51..dd6100b33311 100644
--- a/include/oox/helper/modelobjecthelper.hxx
+++ b/include/oox/helper/modelobjecthelper.hxx
@@ -26,7 +26,7 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace awt { struct Gradient;
class XBitmap; }
namespace graphic { class XGraphic; }
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
namespace drawing { struct Hatch; }
namespace drawing { struct PolyPolygonBezierCoords; }
namespace lang { class XMultiServiceFactory; }
-} } }
+}
namespace oox {
diff --git a/include/oox/helper/progressbar.hxx
b/include/oox/helper/progressbar.hxx
index a19696b7596c..e1c5c0a99699 100644
--- a/include/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
@@ -26,9 +26,9 @@
#include <oox/dllapi.h>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace task { class XStatusIndicator; }
-} } }
+}
namespace oox {
diff --git a/include/oox/helper/propertymap.hxx
b/include/oox/helper/propertymap.hxx
index 30d77ec0bfa4..db7b0297d680 100644
--- a/include/oox/helper/propertymap.hxx
+++ b/include/oox/helper/propertymap.hxx
@@ -30,10 +30,10 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
-namespace com { namespace sun { namespace star { namespace beans {
+namespace com::sun::star::beans {
struct PropertyValue;
class XPropertySet;
-} } } }
+}
namespace oox {
diff --git a/include/oox/helper/propertyset.hxx
b/include/oox/helper/propertyset.hxx
index 11d044e5ff3a..f729a29fb17b 100644
--- a/include/oox/helper/propertyset.hxx
+++ b/include/oox/helper/propertyset.hxx
@@ -28,11 +28,11 @@
#include <sal/types.h>
#include <tools/color.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans { class XMultiPropertySet; }
namespace beans { class XPropertySet; }
namespace beans { class XPropertySetInfo; }
-} } }
+}
namespace oox {
diff --git a/include/oox/helper/storagebase.hxx
b/include/oox/helper/storagebase.hxx
index 537517fbff73..2722ed80bc3a 100644
--- a/include/oox/helper/storagebase.hxx
+++ b/include/oox/helper/storagebase.hxx
@@ -29,12 +29,12 @@
#include <oox/helper/refmap.hxx>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace embed { class XStorage; }
namespace io { class XInputStream; }
namespace io { class XOutputStream; }
namespace io { class XStream; }
-} } }
+}
namespace oox {
diff --git a/include/oox/helper/textinputstream.hxx
b/include/oox/helper/textinputstream.hxx
index d059c88e8839..4a5bcdbfe994 100644
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
