summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basctl/source/basicide/documentenumeration.cxx4
-rw-r--r--desktop/source/deployment/manager/dp_managerfac.cxx2
-rw-r--r--desktop/source/deployment/registry/component/dp_compbackenddb.cxx2
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx2
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configuration.cxx2
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx2
-rw-r--r--desktop/source/deployment/registry/dp_backenddb.cxx2
-rw-r--r--desktop/source/deployment/registry/executable/dp_executable.cxx2
-rw-r--r--desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx2
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx2
-rw-r--r--desktop/source/deployment/registry/help/dp_helpbackenddb.cxx2
-rw-r--r--desktop/source/deployment/registry/package/dp_extbackenddb.cxx2
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx2
-rw-r--r--desktop/source/deployment/registry/script/dp_script.cxx2
-rw-r--r--desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx2
-rw-r--r--desktop/source/deployment/registry/sfwk/dp_sfwk.cxx2
-rw-r--r--drawinglayer/source/primitive2d/polygonprimitive2d.cxx5
-rw-r--r--drawinglayer/source/primitive2d/primitivetools2d.cxx3
-rw-r--r--drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx1
-rw-r--r--drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx3
-rw-r--r--emfio/source/emfuno/xemfparser.cxx21
-rw-r--r--extensions/source/config/ldap/ldapaccess.cxx4
-rw-r--r--extensions/source/config/ldap/ldapuserprofilebe.cxx4
-rw-r--r--filter/source/config/cache/basecontainer.cxx6
-rw-r--r--filter/source/config/cache/cacheitem.cxx6
-rw-r--r--filter/source/config/cache/cacheupdatelistener.cxx6
-rw-r--r--filter/source/config/cache/configflush.cxx6
-rw-r--r--filter/source/config/cache/contenthandlerfactory.cxx6
-rw-r--r--filter/source/config/cache/filtercache.cxx4
-rw-r--r--filter/source/config/cache/filterfactory.cxx4
-rw-r--r--filter/source/config/cache/frameloaderfactory.cxx6
-rw-r--r--filter/source/config/cache/querytokenizer.cxx6
-rw-r--r--filter/source/config/cache/registration.cxx6
-rw-r--r--filter/source/config/cache/typedetection.cxx4
-rw-r--r--filter/source/msfilter/msvbahelper.cxx4
-rw-r--r--filter/source/msfilter/rtfutil.cxx5
-rw-r--r--filter/source/msfilter/util.cxx4
-rw-r--r--filter/source/odfflatxml/OdfFlatXml.cxx4
-rw-r--r--forms/source/resource/frm_resource.cxx5
-rw-r--r--forms/source/xforms/xformsevent.cxx7
-rw-r--r--forms/source/xforms/xpathlib/extension.cxx4
-rw-r--r--registry/tools/fileurl.cxx7
-rw-r--r--registry/tools/options.cxx7
-rw-r--r--sal/osl/unx/file_url.cxx4
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx4
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx4
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx4
-rw-r--r--sal/qa/rtl/strings/test_ostring_concat.cxx4
-rw-r--r--sal/qa/rtl/strings/test_ostring_stringliterals.cxx4
-rw-r--r--sal/qa/rtl/strings/test_oustring_compare.cxx4
-rw-r--r--sal/qa/rtl/strings/test_oustring_concat.cxx4
-rw-r--r--sal/qa/rtl/strings/test_oustring_convert.cxx4
-rw-r--r--sal/qa/rtl/strings/test_oustring_endswith.cxx4
-rw-r--r--sal/qa/rtl/strings/test_oustring_startswith.cxx4
-rw-r--r--sal/qa/rtl/strings/test_oustring_stringliterals.cxx4
-rw-r--r--sal/qa/rtl/strings/test_strings_valuex.cxx4
-rw-r--r--scaddins/source/analysis/analysishelper.cxx4
-rw-r--r--scaddins/source/analysis/bessel.cxx6
-rw-r--r--scaddins/source/pricing/black_scholes.cxx8
-rw-r--r--sdext/source/presenter/PresenterAccessibility.cxx4
-rw-r--r--sdext/source/presenter/PresenterBitmapContainer.cxx4
-rw-r--r--sdext/source/presenter/PresenterButton.cxx4
-rw-r--r--sdext/source/presenter/PresenterCanvasHelper.cxx4
-rw-r--r--sdext/source/presenter/PresenterComponent.cxx4
-rw-r--r--sdext/source/presenter/PresenterConfigurationAccess.cxx4
-rw-r--r--sdext/source/presenter/PresenterController.cxx4
-rw-r--r--sdext/source/presenter/PresenterCurrentSlideObserver.cxx4
-rw-r--r--sdext/source/presenter/PresenterFrameworkObserver.cxx4
-rw-r--r--sdext/source/presenter/PresenterGeometryHelper.cxx4
-rw-r--r--sdext/source/presenter/PresenterHelpView.cxx4
-rw-r--r--sdext/source/presenter/PresenterHelper.cxx4
-rw-r--r--sdext/source/presenter/PresenterNotesView.cxx4
-rw-r--r--sdext/source/presenter/PresenterPaintManager.cxx4
-rw-r--r--sdext/source/presenter/PresenterPane.cxx4
-rw-r--r--sdext/source/presenter/PresenterPaneBase.cxx4
-rw-r--r--sdext/source/presenter/PresenterPaneBorderPainter.cxx4
-rw-r--r--sdext/source/presenter/PresenterPaneContainer.cxx4
-rw-r--r--sdext/source/presenter/PresenterPaneFactory.cxx4
-rw-r--r--sdext/source/presenter/PresenterProtocolHandler.cxx4
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx4
-rw-r--r--sdext/source/presenter/PresenterScrollBar.cxx4
-rw-r--r--sdext/source/presenter/PresenterSlidePreview.cxx4
-rw-r--r--sdext/source/presenter/PresenterSlideShowView.cxx4
-rw-r--r--sdext/source/presenter/PresenterSlideSorter.cxx4
-rw-r--r--sdext/source/presenter/PresenterSprite.cxx4
-rw-r--r--sdext/source/presenter/PresenterSpritePane.cxx4
-rw-r--r--sdext/source/presenter/PresenterTextView.cxx4
-rw-r--r--sdext/source/presenter/PresenterTheme.cxx4
-rw-r--r--sdext/source/presenter/PresenterTimer.cxx4
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx4
-rw-r--r--sdext/source/presenter/PresenterUIPainter.cxx4
-rw-r--r--sdext/source/presenter/PresenterViewFactory.cxx4
-rw-r--r--sdext/source/presenter/PresenterWindowManager.cxx4
-rw-r--r--sfx2/source/doc/sfxbasemodel.cxx4
-rw-r--r--sfx2/source/sidebar/Accessible.cxx4
-rw-r--r--sfx2/source/sidebar/AccessibleTitleBar.cxx4
-rw-r--r--sfx2/source/sidebar/AsynchronousCall.cxx4
-rw-r--r--sfx2/source/sidebar/Context.cxx4
-rw-r--r--sfx2/source/sidebar/ContextChangeBroadcaster.cxx4
-rw-r--r--sfx2/source/sidebar/ContextList.cxx4
-rw-r--r--sfx2/source/sidebar/ControlFactory.cxx4
-rw-r--r--sfx2/source/sidebar/ControllerFactory.cxx4
-rw-r--r--sfx2/source/sidebar/ControllerItem.cxx4
-rw-r--r--sfx2/source/sidebar/Deck.cxx4
-rw-r--r--sfx2/source/sidebar/DeckDescriptor.cxx4
-rw-r--r--sfx2/source/sidebar/DeckLayouter.cxx4
-rw-r--r--sfx2/source/sidebar/DeckTitleBar.cxx4
-rw-r--r--sfx2/source/sidebar/DrawHelper.cxx4
-rw-r--r--sfx2/source/sidebar/FocusManager.cxx4
-rw-r--r--sfx2/source/sidebar/IContextChangeReceiver.cxx4
-rw-r--r--sfx2/source/sidebar/ILayoutableWindow.cxx4
-rw-r--r--sfx2/source/sidebar/MenuButton.cxx4
-rw-r--r--sfx2/source/sidebar/Paint.cxx4
-rw-r--r--sfx2/source/sidebar/Panel.cxx4
-rw-r--r--sfx2/source/sidebar/PanelDescriptor.cxx4
-rw-r--r--sfx2/source/sidebar/PanelTitleBar.cxx4
-rw-r--r--sfx2/source/sidebar/ResourceManager.cxx4
-rw-r--r--sfx2/source/sidebar/Sidebar.cxx4
-rw-r--r--sfx2/source/sidebar/SidebarChildWindow.cxx4
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx4
-rw-r--r--sfx2/source/sidebar/SidebarDockingWindow.cxx4
-rw-r--r--sfx2/source/sidebar/SidebarModelUpdate.cxx4
-rw-r--r--sfx2/source/sidebar/SidebarPanelBase.cxx4
-rw-r--r--sfx2/source/sidebar/SidebarToolBox.cxx4
-rw-r--r--sfx2/source/sidebar/TabBar.cxx4
-rw-r--r--sfx2/source/sidebar/TabItem.cxx4
-rw-r--r--sfx2/source/sidebar/Theme.cxx4
-rw-r--r--sfx2/source/sidebar/TitleBar.cxx4
-rw-r--r--sfx2/source/sidebar/Tools.cxx4
-rw-r--r--shell/source/sessioninstall/SyncDbusSessionHelper.cxx4
-rw-r--r--slideshow/source/engine/activities/activitiesfactory.cxx4
-rw-r--r--slideshow/source/engine/activities/activitybase.cxx5
-rw-r--r--slideshow/source/engine/activities/continuousactivitybase.cxx5
-rw-r--r--slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx5
-rw-r--r--slideshow/source/engine/activities/discreteactivitybase.cxx5
-rw-r--r--slideshow/source/engine/activities/simplecontinuousactivitybase.cxx5
-rw-r--r--slideshow/source/engine/activitiesqueue.cxx5
-rw-r--r--slideshow/source/engine/animatedsprite.cxx5
-rw-r--r--slideshow/source/engine/animationfactory.cxx5
-rw-r--r--slideshow/source/engine/animationnodes/animationaudionode.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/animationbasenode.cxx4
-rw-r--r--slideshow/source/engine/animationnodes/animationcolornode.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/animationcommandnode.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/animationnodefactory.cxx4
-rw-r--r--slideshow/source/engine/animationnodes/animationpathmotionnode.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/animationsetnode.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/animationtransformnode.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/basecontainernode.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/basenode.cxx4
-rw-r--r--slideshow/source/engine/animationnodes/generateevent.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/nodetools.cxx5
-rw-r--r--slideshow/source/engine/animationnodes/paralleltimecontainer.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/propertyanimationnode.cxx6
-rw-r--r--slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx6
-rw-r--r--slideshow/source/engine/attributemap.cxx5
-rw-r--r--slideshow/source/engine/color.cxx5
-rw-r--r--slideshow/source/engine/delayevent.cxx6
-rw-r--r--slideshow/source/engine/effectrewinder.cxx4
-rw-r--r--slideshow/source/engine/eventmultiplexer.cxx4
-rw-r--r--slideshow/source/engine/eventqueue.cxx5
-rw-r--r--slideshow/source/engine/expressionnodefactory.cxx5
-rw-r--r--slideshow/source/engine/pointersymbol.cxx6
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.cxx4
-rw-r--r--slideshow/source/engine/screenupdater.cxx7
-rw-r--r--slideshow/source/engine/shapeattributelayer.cxx5
-rw-r--r--slideshow/source/engine/shapes/appletshape.cxx5
-rw-r--r--slideshow/source/engine/shapes/backgroundshape.cxx5
-rw-r--r--slideshow/source/engine/shapes/drawinglayeranimation.cxx4
-rw-r--r--slideshow/source/engine/shapes/drawshape.cxx5
-rw-r--r--slideshow/source/engine/shapes/drawshapesubsetting.cxx5
-rw-r--r--slideshow/source/engine/shapes/externalshapebase.cxx5
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx5
-rw-r--r--slideshow/source/engine/shapes/intrinsicanimationactivity.cxx5
-rw-r--r--slideshow/source/engine/shapes/mediashape.cxx5
-rw-r--r--slideshow/source/engine/shapes/shapeimporter.cxx4
-rw-r--r--slideshow/source/engine/shapes/viewappletshape.cxx5
-rw-r--r--slideshow/source/engine/shapes/viewbackgroundshape.cxx5
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx5
-rw-r--r--slideshow/source/engine/shapes/viewshape.cxx5
-rw-r--r--slideshow/source/engine/shapesubset.cxx5
-rw-r--r--slideshow/source/engine/slide/layer.cxx5
-rw-r--r--slideshow/source/engine/slide/layermanager.cxx5
-rw-r--r--slideshow/source/engine/slide/shapemanagerimpl.cxx6
-rw-r--r--slideshow/source/engine/slide/slideanimations.cxx5
-rw-r--r--slideshow/source/engine/slide/slideimpl.cxx5
-rw-r--r--slideshow/source/engine/slide/targetpropertiescreator.cxx7
-rw-r--r--slideshow/source/engine/slide/userpaintoverlay.cxx5
-rw-r--r--slideshow/source/engine/slidebitmap.cxx5
-rw-r--r--slideshow/source/engine/slideshowcontext.cxx7
-rw-r--r--slideshow/source/engine/slideview.cxx4
-rw-r--r--slideshow/source/engine/smilfunctionparser.cxx5
-rw-r--r--slideshow/source/engine/soundplayer.cxx5
-rw-r--r--slideshow/source/engine/tools.cxx5
-rw-r--r--slideshow/source/engine/transitions/barndoorwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/barwipepolypolygon.cxx4
-rw-r--r--slideshow/source/engine/transitions/boxwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/checkerboardwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/clippingfunctor.cxx5
-rw-r--r--slideshow/source/engine/transitions/clockwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/combtransition.cxx6
-rw-r--r--slideshow/source/engine/transitions/doublediamondwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/ellipsewipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/fanwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/figurewipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/fourboxwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/iriswipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx5
-rw-r--r--slideshow/source/engine/transitions/pinwheelwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/randomwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/shapetransitionfactory.cxx4
-rw-r--r--slideshow/source/engine/transitions/slidechangebase.cxx4
-rw-r--r--slideshow/source/engine/transitions/slidetransitionfactory.cxx4
-rw-r--r--slideshow/source/engine/transitions/snakewipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/spiralwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/sweepwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/transitionfactorytab.cxx4
-rw-r--r--slideshow/source/engine/transitions/transitiontools.cxx4
-rw-r--r--slideshow/source/engine/transitions/veewipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/waterfallwipe.cxx4
-rw-r--r--slideshow/source/engine/transitions/zigzagwipe.cxx4
-rw-r--r--slideshow/source/engine/unoviewcontainer.cxx5
-rw-r--r--slideshow/source/engine/usereventqueue.cxx4
-rw-r--r--slideshow/source/engine/waitsymbol.cxx6
-rw-r--r--slideshow/source/engine/wakeupevent.cxx5
-rw-r--r--stoc/source/typeconv/convert.cxx2
-rw-r--r--svgio/source/svgreader/svganode.cxx7
-rw-r--r--svgio/source/svgreader/svgcharacternode.cxx26
-rw-r--r--svgio/source/svgreader/svgcirclenode.cxx7
-rw-r--r--svgio/source/svgreader/svgclippathnode.cxx7
-rw-r--r--svgio/source/svgreader/svgdocument.cxx7
-rw-r--r--svgio/source/svgreader/svgdocumenthandler.cxx5
-rw-r--r--svgio/source/svgreader/svgellipsenode.cxx7
-rw-r--r--svgio/source/svgreader/svggnode.cxx7
-rw-r--r--svgio/source/svgreader/svggradientnode.cxx7
-rw-r--r--svgio/source/svgreader/svggradientstopnode.cxx7
-rw-r--r--svgio/source/svgreader/svgimagenode.cxx7
-rw-r--r--svgio/source/svgreader/svglinenode.cxx7
-rw-r--r--svgio/source/svgreader/svgmarkernode.cxx7
-rw-r--r--svgio/source/svgreader/svgmasknode.cxx7
-rw-r--r--svgio/source/svgreader/svgnode.cxx5
-rw-r--r--svgio/source/svgreader/svgpathnode.cxx7
-rw-r--r--svgio/source/svgreader/svgpatternnode.cxx7
-rw-r--r--svgio/source/svgreader/svgpolynode.cxx7
-rw-r--r--svgio/source/svgreader/svgrectnode.cxx7
-rw-r--r--svgio/source/svgreader/svgstyleattributes.cxx5
-rw-r--r--svgio/source/svgreader/svgstylenode.cxx7
-rw-r--r--svgio/source/svgreader/svgsvgnode.cxx5
-rw-r--r--svgio/source/svgreader/svgsymbolnode.cxx7
-rw-r--r--svgio/source/svgreader/svgtextnode.cxx7
-rw-r--r--svgio/source/svgreader/svgtextpathnode.cxx12
-rw-r--r--svgio/source/svgreader/svgtitledescnode.cxx7
-rw-r--r--svgio/source/svgreader/svgtoken.cxx5
-rw-r--r--svgio/source/svgreader/svgtools.cxx7
-rw-r--r--svgio/source/svgreader/svgtrefnode.cxx7
-rw-r--r--svgio/source/svgreader/svgtspannode.cxx7
-rw-r--r--svgio/source/svgreader/svgusenode.cxx7
-rw-r--r--svgio/source/svgreader/svgvisitor.cxx5
-rw-r--r--svgio/source/svguno/xsvgparser.cxx21
-rw-r--r--svl/qa/unit/test_URIHelper.cxx4
-rw-r--r--svl/source/crypto/cryptosign.cxx6
-rw-r--r--svl/source/undo/undo.cxx4
-rw-r--r--svl/source/uno/pathservice.cxx4
-rw-r--r--svtools/source/misc/imageresourceaccess.cxx7
-rw-r--r--svtools/source/table/defaultinputhandler.cxx4
-rw-r--r--svtools/source/table/gridtablerenderer.cxx4
-rw-r--r--svtools/source/table/mousefunction.cxx4
-rw-r--r--svtools/source/table/tablecontrol.cxx4
-rw-r--r--svtools/source/table/tablecontrol_impl.cxx4
-rw-r--r--svtools/source/table/tabledatawindow.cxx4
-rw-r--r--svtools/source/table/tablegeometry.cxx4
-rw-r--r--svtools/source/uno/unocontroltablemodel.cxx4
-rw-r--r--svtools/source/uno/unogridcolumnfacade.cxx4
-rw-r--r--svtools/source/uno/wizard/wizardpagecontroller.cxx4
-rw-r--r--svtools/source/uno/wizard/wizardshell.cxx4
-rw-r--r--svx/source/table/cell.cxx4
-rw-r--r--test/source/helper/form.cxx10
-rw-r--r--test/source/helper/shape.cxx10
-rw-r--r--test/source/helper/transferable.cxx10
-rw-r--r--testtools/source/bridgetest/multi.cxx4
-rw-r--r--ucb/source/ucp/ext/ucpext_content.cxx4
-rw-r--r--ucb/source/ucp/ext/ucpext_datasupplier.cxx4
-rw-r--r--ucb/source/ucp/ext/ucpext_provider.cxx4
-rw-r--r--ucb/source/ucp/ext/ucpext_resultset.cxx4
-rw-r--r--ucb/source/ucp/ext/ucpext_services.cxx4
-rw-r--r--ucb/source/ucp/tdoc/tdoc_contentcaps.cxx4
-rw-r--r--unodevtools/source/skeletonmaker/cppcompskeleton.cxx4
-rw-r--r--unodevtools/source/skeletonmaker/cpptypemaker.cxx4
-rw-r--r--unodevtools/source/skeletonmaker/javacompskeleton.cxx4
-rw-r--r--unodevtools/source/skeletonmaker/javatypemaker.cxx4
-rw-r--r--unoidl/source/legacyprovider.cxx4
-rw-r--r--unoidl/source/sourcefileprovider.cxx4
-rw-r--r--unoidl/source/sourcetreeprovider.cxx4
-rw-r--r--unoidl/source/unoidlprovider.cxx4
-rw-r--r--unotest/source/cpp/getargument.cxx6
-rw-r--r--unoxml/source/events/event.cxx4
-rw-r--r--unoxml/source/events/eventdispatcher.cxx4
-rw-r--r--unoxml/source/events/mouseevent.cxx4
-rw-r--r--unoxml/source/events/mutationevent.cxx4
-rw-r--r--unoxml/source/events/uievent.cxx4
-rw-r--r--vbahelper/source/vbahelper/vbahelper.cxx5
-rw-r--r--vcl/backendtest/outputdevice/bitmap.cxx5
-rw-r--r--vcl/backendtest/outputdevice/common.cxx5
-rw-r--r--vcl/backendtest/outputdevice/gradient.cxx5
-rw-r--r--vcl/backendtest/outputdevice/line.cxx5
-rw-r--r--vcl/backendtest/outputdevice/outputdevice.cxx5
-rw-r--r--vcl/backendtest/outputdevice/pixel.cxx5
-rw-r--r--vcl/backendtest/outputdevice/polygon.cxx5
-rw-r--r--vcl/backendtest/outputdevice/polyline.cxx5
-rw-r--r--vcl/backendtest/outputdevice/polyline_b2d.cxx5
-rw-r--r--vcl/backendtest/outputdevice/polypolygon.cxx5
-rw-r--r--vcl/backendtest/outputdevice/polypolygon_b2d.cxx5
-rw-r--r--vcl/backendtest/outputdevice/rectangle.cxx5
-rw-r--r--vcl/qa/cppunit/canvasbitmaptest.cxx4
-rw-r--r--vcl/source/app/svapp.cxx4
-rw-r--r--vcl/source/app/unohelp2.cxx4
-rw-r--r--vcl/source/bitmap/BitmapTools.cxx7
-rw-r--r--vcl/source/filter/ipdf/pdfdocument.cxx5
-rw-r--r--vcl/source/font/Feature.cxx7
-rw-r--r--vcl/source/font/FeatureCollector.cxx7
-rw-r--r--vcl/source/font/FeatureParser.cxx8
-rw-r--r--vcl/source/font/OpenTypeFeatureDefinitonList.cxx7
-rw-r--r--vcl/source/gdi/pdfbuildin_fonts.cxx5
-rw-r--r--vcl/source/graphic/GraphicLoader.cxx5
-rw-r--r--vcl/source/graphic/GraphicObject.cxx6
-rw-r--r--vcl/source/graphic/Manager.cxx5
-rw-r--r--vcl/source/helper/canvastools.cxx6
-rw-r--r--vcl/source/helper/commandinfoprovider.cxx4
-rw-r--r--vcl/unx/gtk3/gtk3gtkprintwrapper.cxx5
-rw-r--r--writerfilter/source/dmapper/BorderHandler.cxx7
-rw-r--r--writerfilter/source/dmapper/CellColorHandler.cxx4
-rw-r--r--writerfilter/source/dmapper/CellMarginHandler.cxx6
-rw-r--r--writerfilter/source/dmapper/ConversionHelper.cxx6
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx5
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/DomainMapperTableManager.cxx5
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx5
-rw-r--r--writerfilter/source/dmapper/FFDataHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/FontTable.cxx6
-rw-r--r--writerfilter/source/dmapper/FormControlHelper.cxx5
-rw-r--r--writerfilter/source/dmapper/GraphicHelpers.cxx5
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx5
-rw-r--r--writerfilter/source/dmapper/LatentStyleHandler.cxx7
-rw-r--r--writerfilter/source/dmapper/MeasureHandler.cxx6
-rw-r--r--writerfilter/source/dmapper/ModelEventListener.cxx6
-rw-r--r--writerfilter/source/dmapper/NumberingManager.cxx4
-rw-r--r--writerfilter/source/dmapper/OLEHandler.cxx6
-rw-r--r--writerfilter/source/dmapper/PageBordersHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/PropertyIds.cxx4
-rw-r--r--writerfilter/source/dmapper/PropertyMap.cxx4
-rw-r--r--writerfilter/source/dmapper/PropertyMapHelper.cxx5
-rw-r--r--writerfilter/source/dmapper/SdtHelper.cxx7
-rw-r--r--writerfilter/source/dmapper/SectionColumnHandler.cxx6
-rw-r--r--writerfilter/source/dmapper/SmartTagHandler.cxx7
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx4
-rw-r--r--writerfilter/source/dmapper/TDefTableHandler.cxx4
-rw-r--r--writerfilter/source/dmapper/TableManager.cxx6
-rw-r--r--writerfilter/source/dmapper/TablePositionHandler.cxx7
-rw-r--r--writerfilter/source/dmapper/TablePropertiesHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/TblStylePrHandler.cxx5
-rw-r--r--writerfilter/source/dmapper/TextEffectsHandler.cxx6
-rw-r--r--writerfilter/source/dmapper/ThemeTable.cxx4
-rw-r--r--writerfilter/source/dmapper/TrackChangesHandler.cxx6
-rw-r--r--writerfilter/source/dmapper/domainmapperfactory.cxx7
-rw-r--r--writerfilter/source/dmapper/util.cxx6
-rw-r--r--writerfilter/source/ooxml/Handler.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLDocumentImpl.cxx4
-rw-r--r--writerfilter/source/ooxml/OOXMLFactory.cxx4
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLParserState.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLPropertySet.cxx5
-rw-r--r--writerfilter/source/ooxml/OOXMLStreamImpl.cxx5
-rw-r--r--writerfilter/source/rtftok/rtfcharsets.cxx7
-rw-r--r--writerfilter/source/rtftok/rtfcontrolwords.cxx5
-rw-r--r--writerfilter/source/rtftok/rtfdispatchdestination.cxx5
-rw-r--r--writerfilter/source/rtftok/rtfdispatchflag.cxx5
-rw-r--r--writerfilter/source/rtftok/rtfdispatchsymbol.cxx7
-rw-r--r--writerfilter/source/rtftok/rtfdocumentfactory.cxx7
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx5
-rw-r--r--writerfilter/source/rtftok/rtflookahead.cxx18
-rw-r--r--writerfilter/source/rtftok/rtfreferenceproperties.cxx7
-rw-r--r--writerfilter/source/rtftok/rtfreferencetable.cxx7
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.cxx5
-rw-r--r--writerfilter/source/rtftok/rtfskipdestination.cxx7
-rw-r--r--writerfilter/source/rtftok/rtfsprm.cxx7
-rw-r--r--writerfilter/source/rtftok/rtftokenizer.cxx7
-rw-r--r--writerfilter/source/rtftok/rtfvalue.cxx7
-rw-r--r--writerperfect/qa/unit/WpftFilterFixture.cxx5
-rw-r--r--writerperfect/qa/unit/WpftFilterTestBase.cxx5
-rw-r--r--writerperfect/qa/unit/WpftLoader.cxx5
-rw-r--r--writerperfect/source/writer/exp/XMLBase64ImportContext.cxx7
-rw-r--r--writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx7
-rw-r--r--writerperfect/source/writer/exp/XMLSectionContext.cxx7
-rw-r--r--writerperfect/source/writer/exp/XMLTextFrameContext.cxx7
-rw-r--r--writerperfect/source/writer/exp/XMLTextListContext.cxx7
-rw-r--r--writerperfect/source/writer/exp/XMLTextListItemContext.cxx7
-rw-r--r--writerperfect/source/writer/exp/txtparai.cxx5
-rw-r--r--writerperfect/source/writer/exp/txtstyli.cxx7
-rw-r--r--writerperfect/source/writer/exp/xmlfmt.cxx7
-rw-r--r--writerperfect/source/writer/exp/xmlictxt.cxx7
-rw-r--r--writerperfect/source/writer/exp/xmlimp.cxx5
-rw-r--r--writerperfect/source/writer/exp/xmlmetai.cxx7
-rw-r--r--writerperfect/source/writer/exp/xmltbli.cxx7
-rw-r--r--writerperfect/source/writer/exp/xmltext.cxx7
-rw-r--r--xmloff/source/chart/ColorPropertySet.cxx7
-rw-r--r--xmloff/source/core/xmltoken.cxx3
-rw-r--r--xmloff/source/draw/EnhancedCustomShapeToken.cxx3
-rw-r--r--xmloff/source/forms/property_meta_data.cxx4
-rw-r--r--xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx4
-rw-r--r--xmlsecurity/source/pdfio/pdfdocument.cxx7
412 files changed, 692 insertions, 1391 deletions
diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx
index 9d00474efa00..e3acf9d4587a 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -29,7 +29,7 @@
#include <tools/diagnose_ex.h>
-namespace basctl { namespace docs {
+namespace basctl::docs {
using ::com::sun::star::uno::Exception;
using ::com::sun::star::uno::Reference;
@@ -164,6 +164,6 @@ namespace basctl { namespace docs {
}
}
-} } // namespace basctl::docs
+} // namespace basctl::docs
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index f7feac323c90..6263922d7997 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -160,6 +160,6 @@ PackageManagerFactoryImpl::getPackageManager( OUString const & context )
return xRet;
}
-} // namespace
+} // namespace dp_manager::factory
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
index b00b9f0c6fc8..05f265404f55 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx
@@ -126,6 +126,6 @@ ComponentBackendDb::Data ComponentBackendDb::getEntry(OUString const & url)
}
-} // namespace
+} // namespace dp_registry::backend::component
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 7709d1c48eae..997eb4106c8b 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -1699,7 +1699,7 @@ sdecl::ServiceDecl const serviceDecl(
IMPLEMENTATION_NAME,
BACKEND_SERVICE_NAME );
-} // namespace
+} // namespace dp_registry
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index d95a8c5f0766..68f11e41ea3b 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -794,6 +794,6 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.configuration.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace
+} // namespace dp_registry
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
index 9c9feabf5884..eb8775be9efa 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
@@ -156,6 +156,6 @@ std::vector<OUString> ConfigurationBackendDb::getAllDataUrls()
}
}
-} // namespace
+} // namespace dp_registry::backend::configuration
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index bb47161ec846..8ee51be6bc28 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -651,6 +651,6 @@ void RegisteredDb::addEntry(OUString const & url)
}
}
-} // namespace
+} // namespace dp_registry
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index ca403d8d113a..9769051afaca 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -308,7 +308,7 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.executable.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace
+} // namespace dp_registry::backend::executable
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
index 16d7ed865720..19790e9bc110 100644
--- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx
@@ -59,6 +59,6 @@ OUString ExecutableBackendDb::getKeyElementName()
}
-} // namespace
+} // namespace dp_registry::backend::executable
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index cb76be1d987c..013c0648a49e 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -596,6 +596,6 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.help.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace
+} // namespace dp_registry
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
index 937609e7bd7a..cd8f65b749c0 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
@@ -121,6 +121,6 @@ std::vector<OUString> HelpBackendDb::getAllDataUrls()
return getOneChildFromAllEntries("data-url");
}
-} // namespace
+} // namespace dp_registry::backend::help
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
index 95904470fcce..c96d1466b51f 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx
@@ -106,6 +106,6 @@ ExtensionBackendDb::Data ExtensionBackendDb::getEntry(OUString const & url)
}
}
-} // namespace
+} // namespace dp_registry::backend::bundle
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index d55ea3319ffd..013955e0f168 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -1591,6 +1591,6 @@ Reference<deployment::XPackageRegistry> create(
return new BackendImpl( args, xComponentContext, xRootRegistry );
}
-} // namespace
+} // namespace dp_registry
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 48b0c15fd507..39de39f2b624 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -454,6 +454,6 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.script.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace
+} // namespace dp_registry::backend::script
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
index 1f9c7fad19a5..a669f1b58b60 100644
--- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
+++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx
@@ -59,6 +59,6 @@ OUString ScriptBackendDb::getKeyElementName()
}
-} // namespace
+} // namespace dp_registry::backend::script
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 5268bdf4c042..58c72b6ca943 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -353,6 +353,6 @@ sdecl::ServiceDecl const serviceDecl(
"com.sun.star.comp.deployment.sfwk.PackageRegistryBackend",
BACKEND_SERVICE_NAME );
-} // namespace
+} // namespace dp_registry::backend::sfwk
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
index 2769bf23eb03..2410f2158555 100644
--- a/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/polygonprimitive2d.cxx
@@ -379,12 +379,8 @@ namespace drawinglayer
// provide unique ID
ImplPrimitive2DIDBlock(PolygonStrokePrimitive2D, PRIMITIVE2D_ID_POLYGONSTROKEPRIMITIVE2D)
- } // end of namespace primitive2d
-} // end of namespace drawinglayer
-namespace drawinglayer::primitive2d
-{
void PolygonWavePrimitive2D::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const
{
if(getB2DPolygon().count())
@@ -604,6 +600,7 @@ namespace drawinglayer::primitive2d
// provide unique ID
ImplPrimitive2DIDBlock(PolygonStrokeArrowPrimitive2D, PRIMITIVE2D_ID_POLYGONSTROKEARROWPRIMITIVE2D)
+ }
} // end of namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/primitive2d/primitivetools2d.cxx b/drawinglayer/source/primitive2d/primitivetools2d.cxx
index 54c4efcd0a27..da0a378a0089 100644
--- a/drawinglayer/source/primitive2d/primitivetools2d.cxx
+++ b/drawinglayer/source/primitive2d/primitivetools2d.cxx
@@ -48,6 +48,9 @@ namespace drawinglayer::primitive2d
BufferedDecompositionPrimitive2D::get2DDecomposition(rVisitor, rViewInformation);
}
+
+
+
void ViewportDependentPrimitive2D::get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
index 16e3974c941f..77f7f659739c 100644
--- a/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/texthierarchyprimitive2d.cxx
@@ -59,6 +59,7 @@ namespace drawinglayer::primitive2d
ImplPrimitive2DIDBlock(TextHierarchyParagraphPrimitive2D, PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D)
+
TextHierarchyBulletPrimitive2D::TextHierarchyBulletPrimitive2D(const Primitive2DContainer& rChildren)
: GroupPrimitive2D(rChildren)
{
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index e6907e77de9d..3c7d945a8491 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -782,6 +782,5 @@ using namespace com::sun::star;
// provide unique ID
ImplPrimitive3DIDBlock(PolygonTubePrimitive3D, PRIMITIVE3D_ID_POLYGONTUBEPRIMITIVE3D)
-} // end of namespace
-
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx
index e80dc5631dbd..3297dea8f30a 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -40,10 +40,8 @@
using namespace ::com::sun::star;
-namespace emfio
+namespace emfio::emfreader
{
- namespace emfreader
- {
namespace {
class XEmfParser : public ::cppu::WeakAggImplHelper2< graphic::XEmfParser, lang::XServiceInfo >
@@ -71,14 +69,11 @@ namespace emfio
};
}
- } // end of namespace emfreader
-} // end of namespace emfio
+} // end of namespace emfio::emfreader
// uno functions
-namespace emfio
+namespace emfio::emfreader
{
- namespace emfreader
- {
uno::Sequence< OUString > XEmfParser_getSupportedServiceNames()
{
return uno::Sequence< OUString > { "com.sun.star.graphic.EmfTools" };
@@ -93,13 +88,10 @@ namespace emfio
{
return static_cast< ::cppu::OWeakObject* >(new XEmfParser(context));
}
- } // end of namespace emfreader
-} // end of namespace emfio
+} // end of namespace emfio::emfreader
-namespace emfio
+namespace emfio::emfreader
{
- namespace emfreader
- {
XEmfParser::XEmfParser(
uno::Reference< uno::XComponentContext > const & context):
context_(context)
@@ -229,7 +221,6 @@ namespace emfio
return XEmfParser_getSupportedServiceNames();
}
- } // end of namespace emfreader
-} // end of namespace emfio
+} // end of namespace emfio::emfreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 5f9c6820b6cc..afc36c106b11 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -26,7 +26,7 @@
#include <o3tl/char16_t2wchar_t.hxx>
-namespace extensions { namespace config { namespace ldap {
+namespace extensions::config::ldap {
typedef int LdapErrCode;
@@ -284,6 +284,6 @@ void LdapConnection::initConnection()
}
-} } } // extensions.config.ldap
+} // extensions::config::ldap
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index ccec13a6365e..a6baa51b0505 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -37,7 +37,7 @@
#include <osl/security.hxx>
-namespace extensions { namespace config { namespace ldap {
+namespace extensions::config::ldap {
LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContext>& xContext)
: LdapProfileMutexHolder(),
@@ -230,7 +230,7 @@ SAL_CALL LdapUserProfileBe::getSupportedServiceNames()
return getLdapUserProfileBeServiceNames() ;
}
-}}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index 31fb9e89c149..60b8332314c2 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -30,8 +30,7 @@
#define LOAD_IMPLICIT
-namespace filter{
- namespace config{
+namespace filter::config{
BaseContainer::BaseContainer()
: BaseLock ( )
@@ -493,7 +492,6 @@ void SAL_CALL BaseContainer::removeFlushListener(const css::uno::Reference< css:
m_lListener.removeInterface(cppu::UnoType<css::util::XFlushListener>::get(), xListener);
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index b77b3af760b1..fd8af23fe3ce 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -30,8 +30,7 @@
#include <comphelper/sequence.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
CacheItem::CacheItem()
: SequenceAsHashMap()
@@ -331,7 +330,6 @@ bool CacheItem::dontHaveProps(const CacheItem& lProps) const
FlatDetectionInfo::FlatDetectionInfo() :
bMatchByExtension(false), bMatchByPattern(false), bPreselectedByDocumentService(false) {}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx
index 22d7b1bae25c..4a20d29dcb14 100644
--- a/filter/source/config/cache/cacheupdatelistener.cxx
+++ b/filter/source/config/cache/cacheupdatelistener.cxx
@@ -28,8 +28,7 @@
#include <comphelper/processfactory.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
CacheUpdateListener::CacheUpdateListener(FilterCache &rFilterCache,
const css::uno::Reference< css::uno::XInterface >& xConfigAccess,
@@ -180,7 +179,6 @@ void SAL_CALL CacheUpdateListener::disposing(const css::lang::EventObject& aEven
// <- SAFE
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx
index 03cb95442abd..f9193712c7dd 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -21,8 +21,7 @@
#include <cppuhelper/supportsservice.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
ConfigFlush::ConfigFlush()
: BaseLock ( )
@@ -118,7 +117,6 @@ css::uno::Reference< css::uno::XInterface > ConfigFlush::impl_createInstance(con
return css::uno::Reference< css::uno::XInterface >(static_cast< css::util::XRefreshable* >(pNew), css::uno::UNO_QUERY);
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx
index 8a4a1e7e5993..0a17930e7828 100644
--- a/filter/source/config/cache/contenthandlerfactory.cxx
+++ b/filter/source/config/cache/contenthandlerfactory.cxx
@@ -25,8 +25,7 @@
#include <comphelper/sequence.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
ContentHandlerFactory::ContentHandlerFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext)
: m_xContext(rxContext)
@@ -112,7 +111,6 @@ css::uno::Reference< css::uno::XInterface > ContentHandlerFactory::impl_createIn
return css::uno::Reference< css::uno::XInterface >(static_cast< css::lang::XMultiServiceFactory* >(pNew), css::uno::UNO_QUERY);
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 28d0826fb51d..bb928a784c37 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -53,8 +53,7 @@
#include <officecfg/Setup.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
FilterCache::FilterCache()
: BaseLock ( )
@@ -2213,7 +2212,6 @@ bool FilterCache::impl_isModuleInstalled(const OUString& sModule)
return false;
}
- } // namespace config
} // namespace filter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 2473dc537949..80ec0225a94a 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -29,8 +29,7 @@
#include <officecfg/TypeDetection/UISort.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
/** @short define all possible parts of a filter query.
@@ -518,7 +517,6 @@ css::uno::Reference< css::uno::XInterface > FilterFactory::impl_createInstance(c
return css::uno::Reference< css::uno::XInterface >(static_cast< css::lang::XMultiServiceFactory* >(pNew), css::uno::UNO_QUERY);
}
- } // namespace config
} // namespace filter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx
index 8f34feed7cd4..00924aa22638 100644
--- a/filter/source/config/cache/frameloaderfactory.cxx
+++ b/filter/source/config/cache/frameloaderfactory.cxx
@@ -25,8 +25,7 @@
#include <comphelper/sequence.hxx>
-namespace filter{
- namespace config{
+namespace filter::config{
FrameLoaderFactory::FrameLoaderFactory(const css::uno::Reference< css::uno::XComponentContext >& rxContext)
: m_xContext(rxContext)
@@ -110,7 +109,6 @@ css::uno::Reference< css::uno::XInterface > FrameLoaderFactory::impl_createInsta
return css::uno::Reference< css::uno::XInterface >(static_cast< css::lang::XMultiServiceFactory* >(pNew), css::uno::UNO_QUERY);
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx
index 6d6e9d5e504a..9b64f68fe6d8 100644
--- a/filter/source/config/cache/querytokenizer.cxx
+++ b/filter/source/config/cache/querytokenizer.cxx
@@ -22,8 +22,7 @@
#include <osl/diagnose.h>
-namespace filter{
- namespace config{
+namespace filter::config{
QueryTokenizer::QueryTokenizer(const OUString& sQuery)
@@ -64,7 +63,6 @@ bool QueryTokenizer::valid() const
return m_bValid;
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx
index edc79b52081e..cd5c1ccad8a6 100644
--- a/filter/source/config/cache/registration.cxx
+++ b/filter/source/config/cache/registration.cxx
@@ -29,8 +29,7 @@
#include "configflush.hxx"
-namespace filter{
- namespace config{
+namespace filter::config{
extern "C" SAL_DLLPUBLIC_EXPORT void*
@@ -86,7 +85,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void*
return nullptr;
}
- } // namespace config
-} // namespace filter
+} // namespace filter::config
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 38e010dc47d9..b552483e22c2 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -47,8 +47,7 @@ using std::endl;
using namespace com::sun::star;
-namespace filter{
- namespace config{
+namespace filter::config{
TypeDetection::TypeDetection(const css::uno::Reference< css::uno::XComponentContext >& rxContext)
: m_xContext(rxContext)
@@ -1218,7 +1217,6 @@ css::uno::Reference< css::uno::XInterface > TypeDetection::impl_createInstance(c
return css::uno::Reference< css::uno::XInterface >(static_cast< css::document::XTypeDetection* >(pNew), css::uno::UNO_QUERY);
}
- } // namespace config
} // namespace filter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 8abe76511549..92e53386fcb3 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -46,8 +46,7 @@
using namespace ::com::sun::star;
-namespace ooo {
-namespace vba {
+namespace ooo::vba {
const OUString sUrlPart0( "vnd.sun.star.script:" );
const OUString sUrlPart1( "?language=Basic&location=document" );
@@ -775,7 +774,6 @@ void applyShortCutKeyBinding ( const uno::Reference< frame::XModel >& rxModel, c
}
-} // namespace vba
} // namespace ooo
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/rtfutil.cxx b/filter/source/msfilter/rtfutil.cxx
index 63f6476597a4..ccce7609820c 100644
--- a/filter/source/msfilter/rtfutil.cxx
+++ b/filter/source/msfilter/rtfutil.cxx
@@ -15,9 +15,7 @@
#include <rtl/character.hxx>
#include <tools/stream.hxx>
-namespace msfilter
-{
-namespace rtfutil
+namespace msfilter::rtfutil
{
OString OutHex(sal_uLong nHex, sal_uInt8 nLen)
{
@@ -305,6 +303,5 @@ bool StripMetafileHeader(const sal_uInt8*& rpGraphicAry, sal_uInt64& rSize)
return false;
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index b80056658924..d5bee1968f88 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -18,8 +18,7 @@
#include <memory>
#include <unordered_map>
-namespace msfilter {
-namespace util {
+namespace msfilter::util {
rtl_TextEncoding getBestTextEncodingFromLocale(const css::lang::Locale &rLocale)
{
@@ -1325,6 +1324,5 @@ sal_uInt8 TransColToIco( const Color& rCol )
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx
index e385099c7049..3ac579fc087a 100644
--- a/filter/source/odfflatxml/OdfFlatXml.cxx
+++ b/filter/source/odfflatxml/OdfFlatXml.cxx
@@ -47,8 +47,7 @@ using namespace ::com::sun::star::registry;
using namespace ::com::sun::star::xml;
using namespace ::com::sun::star::xml::sax;
-namespace filter {
- namespace odfflatxml {
+namespace filter::odfflatxml {
namespace {
/*
@@ -103,7 +102,6 @@ namespace filter {
};
}
- }
}
using namespace ::filter::odfflatxml;
diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx
index 3375ce4ceae6..362c41974192 100644
--- a/forms/source/resource/frm_resource.cxx
+++ b/forms/source/resource/frm_resource.cxx
@@ -20,15 +20,12 @@
#include <frm_resource.hxx>
#include <unotools/resmgr.hxx>
-namespace frm
+namespace frm::ResourceManager
{
- namespace ResourceManager
- {
OUString loadString(const char* pResId)
{
return Translate::get(pResId, Translate::Create("frm"));
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/xformsevent.cxx b/forms/source/xforms/xformsevent.cxx
index a3943d945dbd..fb9758f1ff54 100644
--- a/forms/source/xforms/xformsevent.cxx
+++ b/forms/source/xforms/xformsevent.cxx
@@ -20,10 +20,7 @@
#include "xformsevent.hxx"
-namespace com {
-namespace sun {
-namespace star {
-namespace xforms {
+namespace com::sun::star::xforms {
void SAL_CALL XFormsEventConcrete::initXFormsEvent(const OUString& typeArg,
sal_Bool canBubbleArg, sal_Bool cancelableArg)
@@ -81,6 +78,6 @@ void SAL_CALL XFormsEventConcrete::initEvent(const OUString& eventTypeArg, sal_B
m_cancelable = cancelableArg;
}
-} } } }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/xforms/xpathlib/extension.cxx b/forms/source/xforms/xpathlib/extension.cxx
index 914e3b8010e7..10725ae3a990 100644
--- a/forms/source/xforms/xpathlib/extension.cxx
+++ b/forms/source/xforms/xpathlib/extension.cxx
@@ -24,9 +24,9 @@
#include "xpathlib.hxx"
#include <services.hxx>
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
class XComponentContext;
-} } } }
+}
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
diff --git a/registry/tools/fileurl.cxx b/registry/tools/fileurl.cxx
index 8495b1fce226..dec3be5e5b0d 100644
--- a/registry/tools/fileurl.cxx
+++ b/registry/tools/fileurl.cxx
@@ -34,9 +34,7 @@
using osl::FileBase;
-namespace registry
-{
-namespace tools
+namespace registry::tools
{
OUString convertToFileUrl(char const * filename, sal_Int32 length)
@@ -76,7 +74,6 @@ OUString convertToFileUrl(char const * filename, sal_Int32 length)
return uFileUrl;
}
-} // namespace tools
-} // namespace registry
+} // namespace registry::tools
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/tools/options.cxx b/registry/tools/options.cxx
index e9b9c23950bf..81d1131f75c2 100644
--- a/registry/tools/options.cxx
+++ b/registry/tools/options.cxx
@@ -23,9 +23,7 @@
#include <stdio.h>
-namespace registry
-{
-namespace tools
+namespace registry::tools
{
Options::Options (char const * program)
@@ -141,7 +139,6 @@ bool Options::printUsage() const
return false;
}
-} // namespace tools
-} // namespace registry
+} // namespace registry::tools
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 011998838db2..9dade1c3f09a 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -743,8 +743,7 @@ oslFileError osl_getAbsoluteFileURL(
return rc;
}
-namespace osl {
-namespace detail {
+namespace osl::detail {
/**
No separate error code if unicode to text conversion or getenv fails because for the
@@ -762,7 +761,6 @@ namespace detail {
return bfound;
}
}
-}
namespace
{
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
index 80ce83b1d2d0..f5168b60da89 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
@@ -16,7 +16,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include <rtl/ustrbuf.hxx>
-namespace test { namespace oustringbuffer {
+namespace test::oustringbuffer {
class AppendChar: public CppUnit::TestFixture {
private:
@@ -36,7 +36,7 @@ void AppendChar::testAppendChar() {
CPPUNIT_ASSERT_EQUAL(u'a', s[0]);
}
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::AppendChar);
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
index 139b87bd4295..66231d8b856f 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_tostring.cxx
@@ -24,7 +24,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.hxx>
-namespace test { namespace oustringbuffer {
+namespace test::oustringbuffer {
class ToString: public CppUnit::TestFixture {
private:
@@ -35,7 +35,7 @@ private:
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::ToString);
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
index 53f738285761..80643df2eba0 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_utf32.cxx
@@ -26,7 +26,7 @@
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
-namespace test { namespace oustringbuffer {
+namespace test::oustringbuffer {
class Utf32: public CppUnit::TestFixture {
private:
@@ -40,7 +40,7 @@ private:
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustringbuffer::Utf32);
diff --git a/sal/qa/rtl/strings/test_ostring_concat.cxx b/sal/qa/rtl/strings/test_ostring_concat.cxx
index fc310dbb58bd..bcb4a3e3bb23 100644
--- a/sal/qa/rtl/strings/test_ostring_concat.cxx
+++ b/sal/qa/rtl/strings/test_ostring_concat.cxx
@@ -37,7 +37,7 @@ template<> struct assertion_traits<std::type_info>
};
} // namespace
-namespace test { namespace ostring {
+namespace test::ostring {
class StringConcat : public CppUnit::TestFixture
{
@@ -176,7 +176,7 @@ void test::ostring::StringConcat::checkInvalid()
#endif
}
-}} // namespace
+} // namespace
CPPUNIT_TEST_SUITE_REGISTRATION(test::ostring::StringConcat);
diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
index 96272cdc9844..e513d56a5d8f 100644
--- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
@@ -21,7 +21,7 @@ bool rtl_string_unittest_const_literal;
bool rtl_string_unittest_const_literal_function;
static bool rtl_string_unittest_non_const_literal_function;
-namespace test { namespace ostring {
+namespace test::ostring {
class StringLiterals: public CppUnit::TestFixture
{
@@ -256,7 +256,7 @@ void test::ostring::StringLiterals::checkBuffer()
#undef CONST_CTOR_USED
-}} // namespace
+} // namespace
CPPUNIT_TEST_SUITE_REGISTRATION(test::ostring::StringLiterals);
diff --git a/sal/qa/rtl/strings/test_oustring_compare.cxx b/sal/qa/rtl/strings/test_oustring_compare.cxx
index 2f4172e51493..c06d40c4d653 100644
--- a/sal/qa/rtl/strings/test_oustring_compare.cxx
+++ b/sal/qa/rtl/strings/test_oustring_compare.cxx
@@ -23,7 +23,7 @@
#include <rtl/string.h>
#include <rtl/ustring.hxx>
-namespace test { namespace oustring {
+namespace test::oustring {
class Compare: public CppUnit::TestFixture
{
@@ -39,7 +39,7 @@ CPPUNIT_TEST(compareTo);
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::Compare);
diff --git a/sal/qa/rtl/strings/test_oustring_concat.cxx b/sal/qa/rtl/strings/test_oustring_concat.cxx
index b67a2938ea36..bae7b65bee7e 100644
--- a/sal/qa/rtl/strings/test_oustring_concat.cxx
+++ b/sal/qa/rtl/strings/test_oustring_concat.cxx
@@ -36,7 +36,7 @@ template<> struct assertion_traits<std::type_info>
};
} // namespace
-namespace test { namespace oustring {
+namespace test::oustring {
class StringConcat : public CppUnit::TestFixture
{
@@ -187,7 +187,7 @@ void test::oustring::StringConcat::checkInvalid()
#endif
}
-}} // namespace
+} // namespace
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::StringConcat);
diff --git a/sal/qa/rtl/strings/test_oustring_convert.cxx b/sal/qa/rtl/strings/test_oustring_convert.cxx
index 20d3a9221c79..cfae69f0012a 100644
--- a/sal/qa/rtl/strings/test_oustring_convert.cxx
+++ b/sal/qa/rtl/strings/test_oustring_convert.cxx
@@ -25,7 +25,7 @@
#include <rtl/ustring.hxx>
#include <sal/macros.h>
-namespace test { namespace oustring {
+namespace test::oustring {
class Convert: public CppUnit::TestFixture
{
@@ -37,7 +37,7 @@ private:
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::Convert);
diff --git a/sal/qa/rtl/strings/test_oustring_endswith.cxx b/sal/qa/rtl/strings/test_oustring_endswith.cxx
index 33858e12ae23..7649de312f81 100644
--- a/sal/qa/rtl/strings/test_oustring_endswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_endswith.cxx
@@ -27,7 +27,7 @@
#include <rtl/ustring.hxx>
#include <sal/macros.h>
-namespace test { namespace oustring {
+namespace test::oustring {
class EndsWith: public CppUnit::TestFixture
{
@@ -39,7 +39,7 @@ private:
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::EndsWith);
diff --git a/sal/qa/rtl/strings/test_oustring_startswith.cxx b/sal/qa/rtl/strings/test_oustring_startswith.cxx
index 43d4c9e921c4..a74671e6eef1 100644
--- a/sal/qa/rtl/strings/test_oustring_startswith.cxx
+++ b/sal/qa/rtl/strings/test_oustring_startswith.cxx
@@ -12,7 +12,7 @@
#include <cppunit/extensions/HelperMacros.h>
#include <rtl/ustring.hxx>
-namespace test { namespace oustring {
+namespace test::oustring {
class StartsWith: public CppUnit::TestFixture
{
@@ -24,7 +24,7 @@ private:
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::StartsWith);
diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 9c7116ef5edb..9a014557ff59 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -26,7 +26,7 @@
extern bool rtl_string_unittest_const_literal;
bool rtl_string_unittest_invalid_conversion;
-namespace test { namespace oustring {
+namespace test::oustring {
class StringLiterals: public CppUnit::TestFixture
{
@@ -424,7 +424,7 @@ void test::oustring::StringLiterals::checkUtf16() {
CPPUNIT_ASSERT_EQUAL(sal_Int32(5), b.lastIndexOf(u"ab"));
}
-}} // namespace
+} // namespace
CPPUNIT_TEST_SUITE_REGISTRATION(test::oustring::StringLiterals);
diff --git a/sal/qa/rtl/strings/test_strings_valuex.cxx b/sal/qa/rtl/strings/test_strings_valuex.cxx
index 85fee5f00dd8..6c9c836442e1 100644
--- a/sal/qa/rtl/strings/test_strings_valuex.cxx
+++ b/sal/qa/rtl/strings/test_strings_valuex.cxx
@@ -13,7 +13,7 @@
#include <rtl/ustring.hxx>
#include <iostream>
-namespace test { namespace strings {
+namespace test::strings {
class valueX : public CppUnit::TestFixture {
public:
@@ -34,7 +34,7 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-} }
+}
CPPUNIT_TEST_SUITE_REGISTRATION(test::strings::valueX);
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 55520469728c..3206b650b30b 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -156,7 +156,7 @@ const FuncDataBase pFuncDatas[] =
};
#undef FUNCDATA
-namespace sca { namespace analysis {
+namespace sca::analysis {
sal_uInt16 DaysInMonth( sal_uInt16 nMonth, sal_uInt16 nYear )
{
@@ -2808,6 +2808,6 @@ sal_Int32 ScaAnyConverter::getInt32(
return nResult;
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/analysis/bessel.cxx b/scaddins/source/analysis/bessel.cxx
index ab87ca0e10ce..bb6023a4f2f9 100644
--- a/scaddins/source/analysis/bessel.cxx
+++ b/scaddins/source/analysis/bessel.cxx
@@ -27,8 +27,7 @@
using ::com::sun::star::lang::IllegalArgumentException;
using ::com::sun::star::sheet::NoConvergenceException;
-namespace sca {
-namespace analysis {
+namespace sca::analysis {
const double f_PI = 3.1415926535897932385;
const double f_PI_DIV_2 = f_PI / 2.0;
@@ -452,7 +451,6 @@ double BesselY( double fNum, sal_Int32 nOrder )
}
}
-} // namespace analysis
-} // namespace sca
+} // namespace sca::analysis
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/pricing/black_scholes.cxx b/scaddins/source/pricing/black_scholes.cxx
index 126901ad5c20..57344d85cbec 100644
--- a/scaddins/source/pricing/black_scholes.cxx
+++ b/scaddins/source/pricing/black_scholes.cxx
@@ -78,10 +78,7 @@
// underruns, accuracy, etc
-namespace sca {
-namespace pricing {
-
-namespace bs {
+namespace sca::pricing::bs {
// helper functions
@@ -937,9 +934,6 @@ double prob_in_money(double S, double vol, double mu,
return val;
}
-} // namespace bs
-
-} // namespace pricing
} // namespace sca
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 59397990458e..35d094d8bf87 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::drawing::framework;
//===== PresenterAccessibleObject =============================================
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
typedef ::cppu::WeakComponentImplHelper <
@@ -1837,6 +1837,6 @@ void AccessibleFocusManager::FocusObject (
rpObject->SetIsFocused(true);
}
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx
index 5fecfe01ca1b..1ddaaff8e671 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::std;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterBitmapContainer ==============================================
@@ -406,6 +406,6 @@ void PresenterBitmapContainer::BitmapDescriptor::SetBitmap (
}
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index 099a99411d47..f663e97e943c 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -32,7 +32,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
const static double gnHorizontalBorder (15);
const static double gnVerticalBorder (5);
@@ -448,6 +448,6 @@ void PresenterButton::ThrowIfDisposed() const
}
}
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterCanvasHelper.cxx b/sdext/source/presenter/PresenterCanvasHelper.cxx
index 115f8304ecd1..d2dbf5741dd8 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.cxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.cxx
@@ -26,7 +26,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
PresenterCanvasHelper::PresenterCanvasHelper()
: maDefaultViewState(
@@ -283,6 +283,6 @@ css::geometry::RealSize2D PresenterCanvasHelper::GetTextSize (
return css::geometry::RealSize2D(aTextBBox.X2 - aTextBBox.X1, aTextBBox.Y2 - aTextBBox.Y1);
}
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
index 2d8fb4ce6353..943270928d9e 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star::uno;
using namespace cppu;
using namespace osl;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
static const struct ImplementationEntry gServiceEntries[] =
{
@@ -53,6 +53,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * presenter_component_getFactory(
return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries);
}
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index c83376fab5a8..b5f063eb7778 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -31,7 +31,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
const OUString PresenterConfigurationAccess::msPresenterScreenRootName =
"/org.openoffice.Office.PresenterScreen/";
@@ -274,6 +274,6 @@ Any PresenterConfigurationAccess::GetProperty (
return Any();
}
-} } // end of namespace sdext::tools
+} // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 7012e0ae177a..8d378d15f2f7 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -65,7 +65,7 @@ namespace {
const sal_Int32 ConfigurationUpdateEndEventType = 2;
}
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
IPresentationTime::~IPresentationTime()
{
@@ -1157,6 +1157,6 @@ void PresenterController::SwitchMonitors()
pScreen->SwitchMonitors();
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
index 4e74e070113c..b7769219c7fe 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.cxx
@@ -22,7 +22,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterCurrentSlideObserver =========================================
@@ -122,6 +122,6 @@ void SAL_CALL PresenterCurrentSlideObserver::disposing (
mxSlideShowController = nullptr;
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterFrameworkObserver.cxx b/sdext/source/presenter/PresenterFrameworkObserver.cxx
index 1bdfd979eaf0..0f56da0b0566 100644
--- a/sdext/source/presenter/PresenterFrameworkObserver.cxx
+++ b/sdext/source/presenter/PresenterFrameworkObserver.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
PresenterFrameworkObserver::PresenterFrameworkObserver (
const css::uno::Reference<css::drawing::framework::XConfigurationController>&rxController,
@@ -104,6 +104,6 @@ void SAL_CALL PresenterFrameworkObserver::notifyConfigurationChange (
dispose();
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterGeometryHelper.cxx b/sdext/source/presenter/PresenterGeometryHelper.cxx
index afa401988c8a..3d59f259ea7b 100644
--- a/sdext/source/presenter/PresenterGeometryHelper.cxx
+++ b/sdext/source/presenter/PresenterGeometryHelper.cxx
@@ -49,7 +49,7 @@ sal_Int32 Height (const sal_Int32 nTop, const sal_Int32 nBottom)
} // end of anonymous namespace
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
sal_Int32 PresenterGeometryHelper::Floor (const double nValue)
{
@@ -246,6 +246,6 @@ Reference<rendering::XPolyPolygon2D> PresenterGeometryHelper::CreatePolygon(
return xPolygon;
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index b9e2c45f8651..9f0a55de4068 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
using ::std::vector;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
const static sal_Int32 gnHorizontalGap (20);
@@ -749,6 +749,6 @@ void Block::Update (
} // end of anonymous namespace
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx
index a177811f6b0f..889739da0ac6 100644
--- a/sdext/source/presenter/PresenterHelper.cxx
+++ b/sdext/source/presenter/PresenterHelper.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::presentation;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
const OUString PresenterHelper::msPaneURLPrefix( "private:resource/pane/");
const OUString PresenterHelper::msCenterPaneURL( msPaneURLPrefix + "CenterPane");
@@ -62,6 +62,6 @@ Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowContr
return xSlideShowController;
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index 62e054c4e94d..c271875fe14a 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -46,7 +46,7 @@ static const sal_Int32 gnSpaceBelowSeparator (10);
static const sal_Int32 gnSpaceAboveSeparator (10);
static const double gnLineScrollFactor (1.2);
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterNotesView ====================================================
@@ -656,6 +656,6 @@ void PresenterNotesView::UpdateScrollBar()
mpScrollBar->CheckValues();
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaintManager.cxx b/sdext/source/presenter/PresenterPaintManager.cxx
index b7b55fb1ddbd..812b7249aea2 100644
--- a/sdext/source/presenter/PresenterPaintManager.cxx
+++ b/sdext/source/presenter/PresenterPaintManager.cxx
@@ -26,7 +26,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
PresenterPaintManager::PresenterPaintManager (
const css::uno::Reference<css::awt::XWindow>& rxParentWindow,
@@ -136,6 +136,6 @@ void PresenterPaintManager::Invalidate (
}
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx
index b7e0436294b8..88628e72cd5e 100644
--- a/sdext/source/presenter/PresenterPane.cxx
+++ b/sdext/source/presenter/PresenterPane.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterPane =========================================================
@@ -165,6 +165,6 @@ void PresenterPane::UpdateBoundingBox()
maBoundingBox = awt::Rectangle();
}
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index dcd7a651688b..29e7e4b046d8 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -27,7 +27,7 @@ using namespace css;
using namespace css::uno;
using namespace css::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterPaneBase =====================================================
@@ -346,6 +346,6 @@ void PresenterPaneBase::ThrowIfDisposed()
}
}
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 34565b7343ea..966306268a0b 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -35,7 +35,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
class BorderSize
@@ -895,6 +895,6 @@ SharedBitmapDescriptor RendererPaneStyle::GetBitmap(
} // end of anonymous namespace
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index e7f91f879a6a..7c9c1a5fc2e9 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
PresenterPaneContainer::PresenterPaneContainer (
const Reference<XComponentContext>& rxContext)
@@ -328,6 +328,6 @@ void PresenterPaneContainer::PaneDescriptor::SetActivationState (const bool bIsA
mbIsActive = bIsActive;
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index f7e6d3b0106f..a22bfa246c1b 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
const OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL(
"private:resource/pane/Presenter/Pane1");
@@ -299,6 +299,6 @@ void PresenterPaneFactory::ThrowIfDisposed() const
}
}
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index fc07441e673f..4cf211598811 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
class Command
@@ -730,6 +730,6 @@ Any NotesFontSizeCommand::GetState() const
return Any();
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index a0ddd7fe9b4d..bbb754050e8f 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::presentation;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
typedef ::cppu::WeakComponentImplHelper <
@@ -794,6 +794,6 @@ void PresenterScreen::SetupView(
rViewInitialization);
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index cf54dee57562..58a34d0f73f7 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
const static double gnScrollBarGap (10);
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterScrollBar::MousePressRepeater ================================
@@ -833,6 +833,6 @@ void PresenterScrollBar::MousePressRepeater::Execute()
}
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index 106b2ac265df..9e22850de7cc 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -36,7 +36,7 @@ namespace
const sal_Int16 gnSuperSampleFactor = 2;
}
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterSlidePreview =================================================
@@ -352,6 +352,6 @@ void PresenterSlidePreview::ThrowIfDisposed()
}
}
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 2a74192875b8..609b2d8566eb 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterSlideShowView ================================================
@@ -964,6 +964,6 @@ void PresenterSlideShowView::impl_addAndConfigureView()
mxSlideShow->setProperty(aProperty);
}
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sd::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 41ad2304c4f0..681eb55a1cc6 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -61,7 +61,7 @@ namespace {
const static sal_Int32 gnVerticalButtonPadding (gnVerticalGap);
}
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
sal_Int32 round (const double nValue) { return sal::static_int_cast<sal_Int32>(0.5 + nValue); }
@@ -1955,6 +1955,6 @@ void PresenterSlideSorter::CurrentSlideFrameRenderer::PaintBitmapTiled(
}
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSprite.cxx b/sdext/source/presenter/PresenterSprite.cxx
index 819fb82daa90..d58eefd21412 100644
--- a/sdext/source/presenter/PresenterSprite.cxx
+++ b/sdext/source/presenter/PresenterSprite.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::UNO_QUERY;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
PresenterSprite::PresenterSprite()
: mxSpriteFactory(),
@@ -160,6 +160,6 @@ void PresenterSprite::DisposeSprite()
}
}
-} } //end of namespace sdext::presenter
+} //end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx
index 719224997b90..8ce72a66a3f7 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -24,7 +24,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterSpritePane =========================================================
@@ -168,6 +168,6 @@ void PresenterSpritePane::CreateCanvases (
UpdateCanvases();
}
-} } // end of namespace ::sd::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index f56c5ed812d2..c6ef1a0c08bc 100644
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -58,7 +58,7 @@ namespace {
}
}
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterTextView =====================================================
@@ -1199,6 +1199,6 @@ void PresenterTextParagraph::Line::ProvideLayoutedLine (
}
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 23cf19e515b7..282cdbf8a2e5 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::std;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
@@ -1075,6 +1075,6 @@ void StyleAssociationContainer::ProcessStyleAssociation(
} // end of anonymous namespace
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterTimer.cxx b/sdext/source/presenter/PresenterTimer.cxx
index 55916b1bae38..a08c3e6b8275 100644
--- a/sdext/source/presenter/PresenterTimer.cxx
+++ b/sdext/source/presenter/PresenterTimer.cxx
@@ -34,7 +34,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
namespace {
class TimerTask
@@ -575,6 +575,6 @@ void SAL_CALL PresenterClockTimer::notify (const css::uno::Any&)
}
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 226c8283afaf..206034c7ee7e 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
static const sal_Int32 gnGapSize (20);
@@ -1924,6 +1924,6 @@ bool HorizontalSeparator::IsFilling() const
} // end of anonymous namespace
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterUIPainter.cxx b/sdext/source/presenter/PresenterUIPainter.cxx
index 75ef2838879a..7b37736ff39d 100644
--- a/sdext/source/presenter/PresenterUIPainter.cxx
+++ b/sdext/source/presenter/PresenterUIPainter.cxx
@@ -29,7 +29,7 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
void PresenterUIPainter::PaintHorizontalBitmapComposite (
const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
@@ -236,6 +236,6 @@ void PresenterUIPainter::PaintVerticalBitmapComposite (
}
}
-} } // end of namespace sdext::presenter
+} // end of namespace sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 71b3a24e0625..bed41bddc978 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
const OUString PresenterViewFactory::msCurrentSlidePreviewViewURL(
"private:resource/view/Presenter/CurrentSlidePreview");
@@ -514,6 +514,6 @@ void CachablePresenterView::ReleaseView()
{
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index b4b262c1f761..0a4479882050 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-namespace sdext { namespace presenter {
+namespace sdext::presenter {
//===== PresenterWindowManager ================================================
@@ -1034,6 +1034,6 @@ void PresenterWindowManager::ThrowIfDisposed() const
}
}
-} } // end of namespace ::sdext::presenter
+} // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 2767c5d0d9d2..5e363821be93 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -4090,7 +4090,7 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createDefaultViewControl
}
-namespace sfx { namespace intern {
+namespace sfx::intern {
/** a class which, in its dtor, cleans up various objects (well, at the moment only the frame) collected during
the creation of a document view, unless the creation was successful.
@@ -4128,7 +4128,7 @@ namespace sfx { namespace intern {
bool m_bSuccess;
SfxFrameWeakRef m_aWeakFrame;
};
-} }
+}
SfxViewFrame* SfxBaseModel::FindOrCreateViewFrame_Impl( const Reference< XFrame >& i_rFrame, ::sfx::intern::ViewCreationGuard& i_rGuard ) const
diff --git a/sfx2/source/sidebar/Accessible.cxx b/sfx2/source/sidebar/Accessible.cxx
index 6cb4dd4a87a5..bae5ac590cd6 100644
--- a/sfx2/source/sidebar/Accessible.cxx
+++ b/sfx2/source/sidebar/Accessible.cxx
@@ -22,7 +22,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Accessible::Accessible (
const Reference<accessibility::XAccessibleContext>& rxContext)
@@ -47,6 +47,6 @@ Reference<accessibility::XAccessibleContext> SAL_CALL Accessible::getAccessibleC
return mxContext;
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.cxx b/sfx2/source/sidebar/AccessibleTitleBar.cxx
index c827194054c9..f6343d1c795b 100644
--- a/sfx2/source/sidebar/AccessibleTitleBar.cxx
+++ b/sfx2/source/sidebar/AccessibleTitleBar.cxx
@@ -28,7 +28,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Reference<accessibility::XAccessible> AccessibleTitleBar::Create (TitleBar& rTitleBar)
{
@@ -55,6 +55,6 @@ void AccessibleTitleBar::FillAccessibleStateSet (utl::AccessibleStateSetHelper&
rStateSet.AddState(accessibility::AccessibleStateType::FOCUSABLE);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/AsynchronousCall.cxx b/sfx2/source/sidebar/AsynchronousCall.cxx
index 0013ea5e5ceb..151accc5d543 100644
--- a/sfx2/source/sidebar/AsynchronousCall.cxx
+++ b/sfx2/source/sidebar/AsynchronousCall.cxx
@@ -20,7 +20,7 @@
#include <sfx2/sidebar/AsynchronousCall.hxx>
#include <vcl/svapp.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
AsynchronousCall::AsynchronousCall()
: maAction(),
@@ -72,6 +72,6 @@ IMPL_LINK_NOARG(AsynchronousCall, HandleUserCall, void*, void )
maAction();
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Context.cxx b/sfx2/source/sidebar/Context.cxx
index 2452dd63aeb0..b2bfd68a3791 100644
--- a/sfx2/source/sidebar/Context.cxx
+++ b/sfx2/source/sidebar/Context.cxx
@@ -22,7 +22,7 @@
#define AnyApplicationName "any"
#define AnyContextName "any"
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
const sal_Int32 Context::NoMatch = 4;
const sal_Int32 Context::ApplicationWildcardMatch = 1;
@@ -80,6 +80,6 @@ bool Context::operator!= (const Context& rOther) const
|| ( msContext != rOther.msContext);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
index 3a182d14f368..8e213e68b71b 100644
--- a/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
+++ b/sfx2/source/sidebar/ContextChangeBroadcaster.cxx
@@ -30,7 +30,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
ContextChangeBroadcaster::ContextChangeBroadcaster()
: msContextName(),
@@ -125,6 +125,6 @@ OUString ContextChangeBroadcaster::GetModuleName (const css::uno::Reference<css:
return OUString();
}
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ContextList.cxx b/sfx2/source/sidebar/ContextList.cxx
index 8f0c82783f60..2d77cd7a4c47 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -19,7 +19,7 @@
#include <sfx2/sidebar/ContextList.hxx>
#include <sfx2/sidebar/Context.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
ContextList::ContextList()
: maEntries()
@@ -99,6 +99,6 @@ void ContextList::ToggleVisibilityForContext( const Context &rContext, const boo
pEntry->mbIsInitiallyVisible = bVisible;
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ControlFactory.cxx b/sfx2/source/sidebar/ControlFactory.cxx
index 317f552fe438..b65f0b9c1779 100644
--- a/sfx2/source/sidebar/ControlFactory.cxx
+++ b/sfx2/source/sidebar/ControlFactory.cxx
@@ -21,7 +21,7 @@
#include <sfx2/sidebar/MenuButton.hxx>
#include <sfx2/sidebar/TabItem.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
VclPtr<CheckBox> ControlFactory::CreateMenuButton (vcl::Window* pParentWindow)
{
@@ -33,6 +33,6 @@ VclPtr<ImageRadioButton> ControlFactory::CreateTabItem (vcl::Window* pParentWind
return VclPtr<TabItem>::Create(pParentWindow);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx b/sfx2/source/sidebar/ControllerFactory.cxx
index 49b67cbf6e07..98d39395d26b 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -35,7 +35,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Reference<frame::XToolbarController> ControllerFactory::CreateToolBoxController(
ToolBox* pToolBox,
@@ -258,6 +258,6 @@ Reference<frame::XToolbarController> ControllerFactory::CreateToolBarController(
return nullptr;
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx
index 7e1a0ae88925..1459d154689c 100644
--- a/sfx2/source/sidebar/ControllerItem.cxx
+++ b/sfx2/source/sidebar/ControllerItem.cxx
@@ -26,7 +26,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
ControllerItem::ControllerItem (
const sal_uInt16 nSlotId,
@@ -61,6 +61,6 @@ ControllerItem::ItemUpdateReceiverInterface::~ItemUpdateReceiverInterface()
{
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 520a39418a91..0967468e3879 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -41,7 +41,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Deck::Deck(const DeckDescriptor& rDeckDescriptor, vcl::Window* pParentWindow,
const std::function<void()>& rCloserAction)
@@ -439,6 +439,6 @@ void Deck::ScrollContainerWindow::SetSeparators (const ::std::vector<sal_Int32>&
Invalidate();
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DeckDescriptor.cxx b/sfx2/source/sidebar/DeckDescriptor.cxx
index 6a55dfbd202c..0f38e335dca2 100644
--- a/sfx2/source/sidebar/DeckDescriptor.cxx
+++ b/sfx2/source/sidebar/DeckDescriptor.cxx
@@ -19,7 +19,7 @@
#include <sfx2/sidebar/DeckDescriptor.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
DeckDescriptor::DeckDescriptor()
: msTitle(),
@@ -57,6 +57,6 @@ DeckDescriptor::~DeckDescriptor()
{
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index bc1bf6e93986..e96a068a2b5f 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -38,7 +38,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
namespace {
static const sal_Int32 MinimalPanelHeight (25);
@@ -629,6 +629,6 @@ void UpdateFiller (
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx
index a3bad46ff40b..8ba8c95bd627 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -30,7 +30,7 @@
#include <sfx2/sidebar/Tools.hxx>
#endif
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
namespace
{
@@ -140,6 +140,6 @@ void DeckTitleBar::MouseMove (const MouseEvent& rMouseEvent)
Window::MouseMove( rMouseEvent );
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/DrawHelper.cxx b/sfx2/source/sidebar/DrawHelper.cxx
index 17c352a3d76c..9b5c16bc6c3f 100644
--- a/sfx2/source/sidebar/DrawHelper.cxx
+++ b/sfx2/source/sidebar/DrawHelper.cxx
@@ -22,7 +22,7 @@
#include <tools/svborder.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
void DrawHelper::DrawBorder(vcl::RenderContext& rRenderContext, const tools::Rectangle& rBox, const SvBorder& rBorderSize,
const Paint& rHorizontalPaint, const Paint& rVerticalPaint)
@@ -122,6 +122,6 @@ void DrawHelper::DrawRoundedRectangle(vcl::RenderContext& rRenderContext, const
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index 2b478e918d89..d39c26d70820 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -28,7 +28,7 @@
#include <vcl/svapp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
FocusManager::FocusLocation::FocusLocation (const PanelComponent eComponent, const sal_Int32 nIndex)
: meComponent(eComponent),
@@ -628,6 +628,6 @@ IMPL_LINK(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void)
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/IContextChangeReceiver.cxx b/sfx2/source/sidebar/IContextChangeReceiver.cxx
index 8a4ad0f6701d..6fc053921b1a 100644
--- a/sfx2/source/sidebar/IContextChangeReceiver.cxx
+++ b/sfx2/source/sidebar/IContextChangeReceiver.cxx
@@ -18,12 +18,12 @@
*/
#include <sfx2/sidebar/IContextChangeReceiver.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
IContextChangeReceiver::~IContextChangeReceiver()
{
}
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ILayoutableWindow.cxx b/sfx2/source/sidebar/ILayoutableWindow.cxx
index c8d740947d2f..6a24cadbfacb 100644
--- a/sfx2/source/sidebar/ILayoutableWindow.cxx
+++ b/sfx2/source/sidebar/ILayoutableWindow.cxx
@@ -18,12 +18,12 @@
*/
#include <sfx2/sidebar/ILayoutableWindow.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
ILayoutableWindow::~ILayoutableWindow()
{
}
-} } // end of namespace ::sd::sidebar
+} // end of namespace ::sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/MenuButton.cxx b/sfx2/source/sidebar/MenuButton.cxx
index 7b5b7bedd677..76ab0dc162e0 100644
--- a/sfx2/source/sidebar/MenuButton.cxx
+++ b/sfx2/source/sidebar/MenuButton.cxx
@@ -26,7 +26,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
MenuButton::MenuButton (vcl::Window* pParentWindow)
: CheckBox(pParentWindow),
@@ -97,6 +97,6 @@ void MenuButton::MouseButtonUp (const MouseEvent& rMouseEvent)
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx
index 817bd0e54f00..9c6e7344c96b 100644
--- a/sfx2/source/sidebar/Paint.cxx
+++ b/sfx2/source/sidebar/Paint.cxx
@@ -22,7 +22,7 @@
using namespace css;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Paint::Paint()
: meType(NoPaint)
@@ -97,6 +97,6 @@ Wallpaper Paint::GetWallpaper() const
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index d83f2d16af04..c1d98be5f36f 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -42,7 +42,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Panel::Panel(const PanelDescriptor& rPanelDescriptor,
vcl::Window* pParentWindow,
@@ -186,6 +186,6 @@ Reference<awt::XWindow> Panel::GetElementWindow()
return nullptr;
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/PanelDescriptor.cxx b/sfx2/source/sidebar/PanelDescriptor.cxx
index 90d4183ae4b2..853d2c445ff5 100644
--- a/sfx2/source/sidebar/PanelDescriptor.cxx
+++ b/sfx2/source/sidebar/PanelDescriptor.cxx
@@ -19,7 +19,7 @@
#include <sfx2/sidebar/PanelDescriptor.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
PanelDescriptor::PanelDescriptor()
: msTitle(),
@@ -57,6 +57,6 @@ PanelDescriptor::~PanelDescriptor()
{
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/PanelTitleBar.cxx b/sfx2/source/sidebar/PanelTitleBar.cxx
index 5b3a3d63dbf2..deb501e43d07 100644
--- a/sfx2/source/sidebar/PanelTitleBar.cxx
+++ b/sfx2/source/sidebar/PanelTitleBar.cxx
@@ -35,7 +35,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
static const sal_Int32 gaLeftIconPadding (5);
static const sal_Int32 gaRightIconPadding (5);
@@ -202,6 +202,6 @@ void PanelTitleBar::DataChanged (const DataChangedEvent& rEvent)
TitleBar::DataChanged(rEvent);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index aa1422dffef3..455ddcf14fb4 100644
--- a/sfx2/source/sidebar/ResourceManager.cxx
+++ b/sfx2/source/sidebar/ResourceManager.cxx
@@ -42,7 +42,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
namespace
{
@@ -783,6 +783,6 @@ void ResourceManager::disposeDecks()
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Sidebar.cxx b/sfx2/source/sidebar/Sidebar.cxx
index ed12c0829302..eea91f9b9dad 100644
--- a/sfx2/source/sidebar/Sidebar.cxx
+++ b/sfx2/source/sidebar/Sidebar.cxx
@@ -24,7 +24,7 @@
using namespace css;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
void Sidebar::ShowPanel (
const OUString& rsPanelId,
@@ -88,6 +88,6 @@ bool Sidebar::IsPanelVisible(
return pController->IsDeckVisible(xPanelDescriptor->msDeckId);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx
index 14078245e0ef..e75687dfea43 100644
--- a/sfx2/source/sidebar/SidebarChildWindow.cxx
+++ b/sfx2/source/sidebar/SidebarChildWindow.cxx
@@ -25,7 +25,7 @@
#include <helpids.h>
#include <comphelper/lok.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
SFX_IMPL_DOCKINGWINDOW_WITHID(SidebarChildWindow, SID_SIDEBAR);
@@ -90,6 +90,6 @@ sal_Int32 SidebarChildWindow::GetDefaultWidth(vcl::Window const* pWindow)
return 0;
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index bc33163c64f8..9ce9193fa6f3 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -98,7 +98,7 @@ namespace
}
}
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
namespace {
enum MenuId
@@ -1616,6 +1616,6 @@ void SidebarController::saveDeckState()
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index e8172495ffed..fe4548655c81 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -37,7 +37,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
class SidebarNotifyIdle : public Idle
{
@@ -307,6 +307,6 @@ bool SidebarDockingWindow::EventNotify(NotifyEvent& rEvent)
return SfxDockingWindow::EventNotify(rEvent);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarModelUpdate.cxx b/sfx2/source/sidebar/SidebarModelUpdate.cxx
index 91c423b1020f..2f81b01f6cc7 100644
--- a/sfx2/source/sidebar/SidebarModelUpdate.cxx
+++ b/sfx2/source/sidebar/SidebarModelUpdate.cxx
@@ -9,12 +9,12 @@
#include <sfx2/sidebar/SidebarModelUpdate.hxx>
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
SidebarModelUpdate::~SidebarModelUpdate()
{
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarPanelBase.cxx b/sfx2/source/sidebar/SidebarPanelBase.cxx
index 0321b9bca3e5..0ada01c391cb 100644
--- a/sfx2/source/sidebar/SidebarPanelBase.cxx
+++ b/sfx2/source/sidebar/SidebarPanelBase.cxx
@@ -30,7 +30,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Reference<ui::XUIElement> SidebarPanelBase::Create (
const OUString& rsResourceURL,
@@ -195,6 +195,6 @@ void SAL_CALL SidebarPanelBase::updateModel(const css::uno::Reference<css::frame
pModelUpdate->updateModel(xModel);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx
index 03f66a98c0f8..70be2424f276 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -53,7 +53,7 @@ namespace {
}
}
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
SidebarToolBox::SidebarToolBox (vcl::Window* pParentWindow)
: ToolBox(pParentWindow, 0),
@@ -344,6 +344,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void makeNotebookbarToolBox(VclPtr<vcl::Window>
rRet = pBox;
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx
index 1acd7e10f619..61b2f6559b46 100644
--- a/sfx2/source/sidebar/TabBar.cxx
+++ b/sfx2/source/sidebar/TabBar.cxx
@@ -41,7 +41,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
TabBar::TabBar(vcl::Window* pParentWindow,
const Reference<frame::XFrame>& rxFrame,
@@ -411,6 +411,6 @@ void TabBar::EnableMenuButton(const bool bEnable)
mpMenuButton->Enable(bEnable);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/TabItem.cxx b/sfx2/source/sidebar/TabItem.cxx
index d2535b583acf..160bec8a2075 100644
--- a/sfx2/source/sidebar/TabItem.cxx
+++ b/sfx2/source/sidebar/TabItem.cxx
@@ -28,7 +28,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
TabItem::TabItem (vcl::Window* pParentWindow)
: ImageRadioButton(pParentWindow),
@@ -104,6 +104,6 @@ void TabItem::MouseButtonUp(const MouseEvent& rMouseEvent)
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index 9f5b067d9f8e..51d55f067fc1 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -31,7 +31,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Theme& Theme::GetCurrentTheme()
{
@@ -1042,6 +1042,6 @@ void Theme::ProcessNewValue (
}
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/TitleBar.cxx b/sfx2/source/sidebar/TitleBar.cxx
index df58d0d346ff..b793d3a879fd 100644
--- a/sfx2/source/sidebar/TitleBar.cxx
+++ b/sfx2/source/sidebar/TitleBar.cxx
@@ -29,7 +29,7 @@ namespace
const static sal_Int32 gnRightIconSpace (3);
}
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
TitleBar::TitleBar(const OUString& rsTitle,
vcl::Window* pParentWindow,
@@ -167,6 +167,6 @@ IMPL_LINK(TitleBar, SelectionHandler, ToolBox*, pToolBox, void)
HandleToolBoxItemClick(nItemId);
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Tools.cxx b/sfx2/source/sidebar/Tools.cxx
index 191b9b047035..27064e58af85 100644
--- a/sfx2/source/sidebar/Tools.cxx
+++ b/sfx2/source/sidebar/Tools.cxx
@@ -32,7 +32,7 @@
using namespace css;
using namespace css::uno;
-namespace sfx2 { namespace sidebar {
+namespace sfx2::sidebar {
Image Tools::GetImage (
const OUString& rsImageURL,
@@ -135,6 +135,6 @@ OUString Tools::GetModuleName (
return OUString();
}
-} } // end of namespace sfx2::sidebar
+} // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index cfe971af958b..acd6ecacd8eb 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -90,7 +90,7 @@ void request(
}
-namespace shell { namespace sessioninstall
+namespace shell::sessioninstall
{
SyncDbusSessionHelper::SyncDbusSessionHelper(Reference<XComponentContext> const&)
{
@@ -181,6 +181,6 @@ void SAL_CALL SyncDbusSessionHelper::IsInstalled( const OUString& sPackagename,
o_isInstalled = bool(g_variant_get_boolean(g_variant_get_child_value(result.get(),0)));
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index 63b39d2d23d5..6f5a05b197cb 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -43,8 +43,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
@@ -1011,7 +1010,6 @@ AnimationActivitySharedPtr ActivitiesFactory::createSimpleActivity(
return std::make_shared<SimpleActivity<0>>( aActivityParms, rAnim );
}
-} // namespace internal
} // namespace presentation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx
index e256b269611c..82a117f8a6d2 100644
--- a/slideshow/source/engine/activities/activitybase.cxx
+++ b/slideshow/source/engine/activities/activitybase.cxx
@@ -26,10 +26,8 @@
#include "activitybase.hxx"
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
// TODO(P1): Elide some virtual function calls, by templifying this
// static hierarchy
@@ -231,7 +229,6 @@ namespace slideshow
return nT;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/continuousactivitybase.cxx b/slideshow/source/engine/activities/continuousactivitybase.cxx
index 0928fd1bdd03..64e2377f9ab6 100644
--- a/slideshow/source/engine/activities/continuousactivitybase.cxx
+++ b/slideshow/source/engine/activities/continuousactivitybase.cxx
@@ -21,10 +21,8 @@
#include "continuousactivitybase.hxx"
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
ContinuousActivityBase::ContinuousActivityBase( const ActivityParameters& rParms ) :
SimpleContinuousActivityBase( rParms )
{
@@ -36,7 +34,6 @@ namespace slideshow
perform( calcAcceleratedTime( nSimpleTime ),
nRepeatCount );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
index 0369c22851ca..38d3590da3b6 100644
--- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
+++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
@@ -24,10 +24,8 @@
#include <tuple>
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
ContinuousKeyTimeActivityBase::ContinuousKeyTimeActivityBase( const ActivityParameters& rParms ) :
SimpleContinuousActivityBase( rParms ),
maLerper( rParms.maDiscreteTimes )
@@ -56,7 +54,6 @@ namespace slideshow
fAlpha,
nRepeatCount );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/discreteactivitybase.cxx b/slideshow/source/engine/activities/discreteactivitybase.cxx
index 2ce8286767d9..2fe0935b698a 100644
--- a/slideshow/source/engine/activities/discreteactivitybase.cxx
+++ b/slideshow/source/engine/activities/discreteactivitybase.cxx
@@ -23,10 +23,8 @@
#include "discreteactivitybase.hxx"
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
DiscreteActivityBase::DiscreteActivityBase( const ActivityParameters& rParms ) :
ActivityBase( rParms ),
mpWakeupEvent( rParms.mpWakeupEvent ),
@@ -189,7 +187,6 @@ namespace slideshow
ActivityBase::dispose();
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
index 5566b5883f78..9e23fc2c76c8 100644
--- a/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
+++ b/slideshow/source/engine/activities/simplecontinuousactivitybase.cxx
@@ -24,10 +24,8 @@
#include <sal/log.hxx>
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
SimpleContinuousActivityBase::SimpleContinuousActivityBase(
const ActivityParameters& rParms ) :
ActivityBase( rParms ),
@@ -244,7 +242,6 @@ namespace slideshow
return isActive();
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/activitiesqueue.cxx b/slideshow/source/engine/activitiesqueue.cxx
index 3181e92175ff..ba982385356e 100644
--- a/slideshow/source/engine/activitiesqueue.cxx
+++ b/slideshow/source/engine/activitiesqueue.cxx
@@ -32,10 +32,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
ActivitiesQueue::ActivitiesQueue(
const std::shared_ptr< ::canvas::tools::ElapsedTime >& pPresTimer ) :
mpTimer( pPresTimer ),
@@ -178,7 +176,6 @@ namespace slideshow
pActivity->dequeued();
ActivityQueue().swap( maCurrentActivitiesReinsert );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx
index 82d5e5e4624b..94ee9e313ec9 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -34,10 +34,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
AnimatedSprite::AnimatedSprite( const ViewLayerSharedPtr& rViewLayer,
const ::basegfx::B2DSize& rSpriteSizePixel,
double nSpritePrio ) :
@@ -196,7 +194,6 @@ namespace slideshow
mpSprite->show();
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index ce831d2a4aaf..9996924880ac 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -39,10 +39,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
namespace
{
// attention, there is a similar implementation of Animation in
@@ -1233,7 +1231,6 @@ namespace slideshow
nFlags );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx
index f407456b35ef..c6eb61d17e3c 100644
--- a/slideshow/source/engine/animationnodes/animationaudionode.cxx
+++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx
@@ -27,8 +27,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
AnimationAudioNode::AnimationAudioNode(
const uno::Reference< animations::XAnimationNode >& xNode,
@@ -199,7 +198,6 @@ void AnimationAudioNode::checkPlayingStatus()
"AnimationAudioNode::deactivate with delay") );
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index ef12aa97e104..01059ec39b77 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -35,8 +35,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
AnimationBaseNode::AnimationBaseNode(
const uno::Reference< animations::XAnimationNode >& xNode,
@@ -485,7 +484,6 @@ AttributableShapeSharedPtr const & AnimationBaseNode::getShape() const
return mpShape; // nope, plain shape always
}
-} // namespace internal
} // namespace slideshow
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationcolornode.cxx b/slideshow/source/engine/animationnodes/animationcolornode.cxx
index ac3450ea55e3..39ca961c478f 100644
--- a/slideshow/source/engine/animationnodes/animationcolornode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcolornode.cxx
@@ -28,8 +28,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
/** Little wrapper for HSL to RGB mapping.
@@ -117,7 +116,6 @@ AnimationActivitySharedPtr AnimationColorNode::createActivity() const
return AnimationActivitySharedPtr();
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
index 9d8e476e091b..2e8507e3a5f5 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
@@ -28,8 +28,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace EffectCommands = css::presentation::EffectCommands;
@@ -113,7 +112,6 @@ bool AnimationCommandNode::hasPendingAnimation() const
return mxCommandNode->getCommand() == EffectCommands::STOPAUDIO || mpShape;
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
index e39b268991ee..f9fa01b2f1fd 100644
--- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx
+++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
@@ -45,8 +45,7 @@
using namespace ::com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
@@ -588,7 +587,6 @@ void AnimationNodeFactory::showTree( AnimationNodeSharedPtr const & pRootNode )
}
#endif
-} // namespace internal
} // namespace slideshow
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx
index a78583290441..2490b6e2cbc8 100644
--- a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx
@@ -21,8 +21,7 @@
#include "animationpathmotionnode.hxx"
#include <animationfactory.hxx>
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
void AnimationPathMotionNode::dispose()
{
@@ -48,7 +47,6 @@ AnimationActivitySharedPtr AnimationPathMotionNode::createActivity() const
true );
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationsetnode.cxx b/slideshow/source/engine/animationnodes/animationsetnode.cxx
index c2eda0ddc990..350e80fbcfe7 100644
--- a/slideshow/source/engine/animationnodes/animationsetnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationsetnode.cxx
@@ -27,8 +27,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
AnimationActivitySharedPtr AnimationSetNode::createActivity() const
{
@@ -187,7 +186,6 @@ AnimationActivitySharedPtr AnimationSetNode::createActivity() const
return AnimationActivitySharedPtr();
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx
index d40f9400bf7d..b8019d77e6a1 100644
--- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx
@@ -26,8 +26,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
void AnimationTransformNode::dispose()
{
@@ -93,7 +92,6 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const
}
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx b/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx
index 6a54d16a6650..13a62d89b7a1 100644
--- a/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx
+++ b/slideshow/source/engine/animationnodes/animationtransitionfilternode.cxx
@@ -21,8 +21,7 @@
#include "animationtransitionfilternode.hxx"
#include <transitionfactory.hxx>
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
void AnimationTransitionFilterNode::dispose()
{
@@ -41,7 +40,6 @@ AnimationTransitionFilterNode::createActivity() const
mxTransitionFilterNode );
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index e1044a1a364a..cde434f3d7bd 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -31,8 +31,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
bool isRepeatIndefinite(const uno::Reference<animations::XAnimationNode>& xNode)
{
@@ -217,7 +216,6 @@ void BaseContainerNode::showState() const
}
#endif
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index 12f3610f1165..1b8a6d7fde02 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -41,8 +41,7 @@
using namespace ::com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
@@ -747,7 +746,6 @@ const char* BaseNode::getDescription() const
#endif
-} // namespace internal
} // namespace slideshow
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx b/slideshow/source/engine/animationnodes/generateevent.cxx
index adfed30885b7..475b1c18edc9 100644
--- a/slideshow/source/engine/animationnodes/generateevent.cxx
+++ b/slideshow/source/engine/animationnodes/generateevent.cxx
@@ -32,8 +32,7 @@
#include <slideshowcontext.hxx>
#include <delayevent.hxx>
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
using namespace com::sun::star;
@@ -228,7 +227,6 @@ EventSharedPtr generateEvent(
return pEvent;
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/nodetools.cxx b/slideshow/source/engine/animationnodes/nodetools.cxx
index abad7f24eb27..f509e680c04b 100644
--- a/slideshow/source/engine/animationnodes/nodetools.cxx
+++ b/slideshow/source/engine/animationnodes/nodetools.cxx
@@ -25,10 +25,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
#if defined(DBG_UTIL)
static sal_Int32 lcl_nOffset = 0;
@@ -81,7 +79,6 @@ namespace slideshow
return (rAny >>= eTiming) && eTiming == animations::Timing_INDEFINITE;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx b/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx
index a20bab788f84..f4c0637163e2 100644
--- a/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/paralleltimecontainer.cxx
@@ -23,8 +23,7 @@
#include <functional>
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
void ParallelTimeContainer::activate_st()
{
@@ -54,7 +53,6 @@ void ParallelTimeContainer::notifyDeactivating(
notifyDeactivatedChild( pChildNode );
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx
index c893bb027f36..2643c44036d8 100644
--- a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx
+++ b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx
@@ -23,8 +23,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const
{
@@ -96,7 +95,6 @@ AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const
return AnimationActivitySharedPtr();
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
index d48fe1c45238..9a4737dd9784 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
@@ -23,8 +23,7 @@
#include <usereventqueue.hxx>
#include "sequentialtimecontainer.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
void SequentialTimeContainer::activate_st()
{
@@ -124,7 +123,6 @@ void SequentialTimeContainer::notifyDeactivating(
}
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx
index ae01a3023976..202ce1880ee7 100644
--- a/slideshow/source/engine/attributemap.cxx
+++ b/slideshow/source/engine/attributemap.cxx
@@ -24,10 +24,8 @@
#include <sal/log.hxx>
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
typedef ::canvas::tools::ValueMap< AttributeType > AnimateAttributeMap;
AttributeType mapAttributeName( const OUString& rAttrName )
@@ -84,7 +82,6 @@ namespace slideshow
return eAttributeType;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx
index a7a957e7f423..4ae8b17ca6fb 100644
--- a/slideshow/source/engine/color.cxx
+++ b/slideshow/source/engine/color.cxx
@@ -27,10 +27,8 @@
#include <algorithm>
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
namespace
{
// helper functions
@@ -344,7 +342,6 @@ namespace slideshow
(1.0-t)*rFrom.getGreen() + t*rTo.getGreen(),
(1.0-t)*rFrom.getBlue() + t*rTo.getBlue() );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/delayevent.cxx b/slideshow/source/engine/delayevent.cxx
index 810f99ac328d..1690123100af 100644
--- a/slideshow/source/engine/delayevent.cxx
+++ b/slideshow/source/engine/delayevent.cxx
@@ -21,8 +21,7 @@
#include <osl/diagnose.h>
#include <delayevent.hxx>
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
bool Delay::fire()
{
@@ -54,7 +53,6 @@ void Delay::dispose()
}
}
-} // namespace internal
-} // namespace presentation
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index 729dc2198db1..79b1f9159a29 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -34,7 +34,7 @@
using ::com::sun::star::uno::Reference;
using namespace ::com::sun::star;
-namespace slideshow { namespace internal {
+namespace slideshow::internal {
namespace {
@@ -436,6 +436,6 @@ void EffectRewinder::asynchronousRewindToPreviousSlide (
}
-} } // end of namespace ::slideshow::internal
+} // end of namespace ::slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 3fd5a336234c..888f9039fd12 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -123,8 +123,7 @@ struct slideshow::internal::ListenerOperations<ViewEventHandlerWeakPtrWrapper>
}
};
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
@@ -1238,7 +1237,6 @@ void EventMultiplexer::notifyHyperlinkClicked(
{ return pHandler.getHandler()->handleHyperlink( hyperLink ); } );
}
-} // namespace internal
} // namespace presentation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index 8184dc92ed32..5ed44f0efd44 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -31,10 +31,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
bool EventQueue::EventEntry::operator<( const EventEntry& rEvent ) const
{
// negate comparison, we want priority queue to be sorted
@@ -294,7 +292,6 @@ namespace slideshow
maNextEvents.clear();
maNextNextEvents = ImplQueueType();
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/expressionnodefactory.cxx b/slideshow/source/engine/expressionnodefactory.cxx
index f82e09ac2f7e..e8f933632587 100644
--- a/slideshow/source/engine/expressionnodefactory.cxx
+++ b/slideshow/source/engine/expressionnodefactory.cxx
@@ -25,10 +25,8 @@
/* Implementation of ExpressionNodeFactory class */
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
namespace
{
class ConstantValueExpression : public ExpressionNode
@@ -236,7 +234,6 @@ namespace slideshow
return std::make_shared<MaxExpression>(rOuterFunction, rInnerFunction);
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx
index 3421d6d1cca3..4bc230154ed6 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -37,8 +37,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
PointerSymbolSharedPtr PointerSymbol::create( const uno::Reference<rendering::XBitmap>& xBitmap,
ScreenUpdater& rScreenUpdater,
@@ -193,7 +192,6 @@ void PointerSymbol::viewsChanged(const geometry::RealPoint2D pos)
}
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 48920bae0e51..595cc19086b9 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -47,8 +47,7 @@
using namespace com::sun::star;
using namespace com::sun::star::uno;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
class RehearseTimingsActivity::WakeupEvent : public Event
{
@@ -541,7 +540,6 @@ bool RehearseTimingsActivity::MouseHandler::handleMouseMoved(
return false;
}
-} // namespace internal
} // namespace presentation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/screenupdater.cxx b/slideshow/source/engine/screenupdater.cxx
index 1053770d5b5c..72768628d211 100644
--- a/slideshow/source/engine/screenupdater.cxx
+++ b/slideshow/source/engine/screenupdater.cxx
@@ -40,9 +40,7 @@ namespace {
};
}
-namespace slideshow
-{
-namespace internal
+namespace slideshow::internal
{
typedef std::vector<
std::pair<UnoViewSharedPtr,bool> > UpdateRequestVector;
@@ -217,8 +215,7 @@ namespace internal
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
namespace {
diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx
index 383a0cbc3a2a..d96952f780ca 100644
--- a/slideshow/source/engine/shapeattributelayer.cxx
+++ b/slideshow/source/engine/shapeattributelayer.cxx
@@ -32,10 +32,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
/** Update state ids
This method updates all state IDs from possible
@@ -809,7 +807,6 @@ namespace slideshow
mnVisibilityState;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
index 37f7b22be047..20d9a08b52e7 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -29,10 +29,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
namespace {
/** Represents an applet shape.
@@ -282,7 +280,6 @@ namespace slideshow
nNumPropEntries,
rContext);
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx
index dde159ca477f..88d48b7e72e9 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -35,10 +35,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
namespace {
/** Representation of a draw document's background shape.
@@ -293,7 +291,6 @@ namespace slideshow
xMasterPage,
rContext );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 46bbb7efd2cb..9d61fb383e42 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -899,8 +899,7 @@ void ActivityImpl::end()
} // anon namespace
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
std::shared_ptr<Activity> createDrawingLayerAnimActivity(
SlideShowContext const& rContext,
@@ -928,7 +927,6 @@ std::shared_ptr<Activity> createDrawingLayerAnimActivity(
return pActivity;
}
-} // namespace internal
} // namespace presentation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index f4a541ecd907..e8fcd0299ab3 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -49,10 +49,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
// Private methods
@@ -1197,7 +1195,6 @@ namespace slideshow
{
return maSubsetting.getSubsetTreeNode( rParentNode, nNodeIndex, eNodeType );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index 4bc51e2dc08d..05cc539c1cd0 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -35,10 +35,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
// Private methods
@@ -805,7 +803,6 @@ namespace slideshow
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx
index 52b617ebf8c3..aeff0f412cc9 100644
--- a/slideshow/source/engine/shapes/externalshapebase.cxx
+++ b/slideshow/source/engine/shapes/externalshapebase.cxx
@@ -32,10 +32,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
class ExternalShapeBase::ExternalShapeBaseListener : public ViewEventHandler,
public IntrinsicAnimationEventHandler
{
@@ -207,7 +205,6 @@ namespace slideshow
return true;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 3a06b8002dd7..247206adcd36 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -45,9 +45,7 @@ using namespace ::com::sun::star;
// free support functions
// ======================
-namespace slideshow
-{
-namespace internal
+namespace slideshow::internal
{
// TODO(E2): Detect the case when svx/drawing layer is not
// in-process, or even not on the same machine, and
@@ -426,6 +424,5 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect,
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
index 3fe1d59ce8d7..a8a46f7ba050 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
@@ -27,10 +27,8 @@
#include <memory>
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
namespace {
/** Activity for intrinsic shape animations
@@ -246,7 +244,6 @@ namespace slideshow
rTimeouts,
nNumLoops);
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx
index bd2522899156..55c302bc683c 100644
--- a/slideshow/source/engine/shapes/mediashape.cxx
+++ b/slideshow/source/engine/shapes/mediashape.cxx
@@ -33,10 +33,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
namespace {
/** Represents a media shape.
@@ -244,7 +242,6 @@ namespace slideshow
return std::make_shared<MediaShape>(xShape, nPrio, rContext);
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 06ac4275af1d..b1b1b3417269 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -47,8 +47,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
@@ -533,7 +532,6 @@ ShapeImporter::ShapeImporter( uno::Reference<drawing::XDrawPage> const&
maShapesStack.push( XShapesEntry(xShapes) );
}
-} // namespace internal
} // namespace presentation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx
index 756ac85d7637..736cb9d94c65 100644
--- a/slideshow/source/engine/shapes/viewappletshape.cxx
+++ b/slideshow/source/engine/shapes/viewappletshape.cxx
@@ -49,10 +49,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
ViewAppletShape::ViewAppletShape( const ViewLayerSharedPtr& rViewLayer,
const uno::Reference< drawing::XShape >& rxShape,
const OUString& rServiceName,
@@ -255,7 +253,6 @@ namespace slideshow
return true;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
index 97e861e9e445..e0ca333adee2 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
@@ -40,10 +40,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
bool ViewBackgroundShape::prefetch( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
const GDIMetaFileSharedPtr& rMtf ) const
@@ -185,7 +183,6 @@ namespace slideshow
return true;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 3e8056fa8539..d2a92580aeef 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -51,10 +51,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
ViewMediaShape::ViewMediaShape( const ViewLayerSharedPtr& rViewLayer,
const uno::Reference< drawing::XShape >& rxShape,
const uno::Reference< uno::XComponentContext >& rxContext ) :
@@ -469,7 +467,6 @@ namespace slideshow
TOOLS_WARN_EXCEPTION( "slideshow", "" );
}
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index 5df9650b4cc7..4b69c4320c45 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -42,10 +42,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
// TODO(F2): Provide sensible setup for mtf-related attributes (fill mode,
// char rotation etc.). Do that via mtf argument at this object
@@ -853,7 +851,6 @@ namespace slideshow
bIsVisible );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx
index 4f5c797775af..5525195fe81f 100644
--- a/slideshow/source/engine/shapesubset.cxx
+++ b/slideshow/source/engine/shapesubset.cxx
@@ -25,10 +25,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
ShapeSubset::ShapeSubset( const AttributableShapeSharedPtr& rOriginalShape,
const DocTreeNode& rTreeNode,
const SubsettableShapeManagerSharedPtr& rShapeManager ) :
@@ -118,7 +116,6 @@ namespace slideshow
return maTreeNode;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx
index c8ec5f5f57f8..01ce4efa4bcd 100644
--- a/slideshow/source/engine/slide/layer.cxx
+++ b/slideshow/source/engine/slide/layer.cxx
@@ -29,10 +29,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
Layer::Layer( Dummy ) :
maViewEntries(),
maBounds(),
@@ -269,7 +267,6 @@ namespace slideshow
return LayerSharedPtr( new Layer );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index eb97b32da11d..e7890641da4f 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -40,10 +40,8 @@ namespace
}
}
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
template<typename LayerFunc,
typename ShapeFunc> void LayerManager::manageViews(
LayerFunc layerFunc,
@@ -826,7 +824,6 @@ namespace slideshow
mbLayerAssociationDirty = false;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx
index f9480ef51403..7863f7e7412b 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.cxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx
@@ -38,8 +38,7 @@ using namespace css::uno;
using namespace css::drawing;
using namespace css::system;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
ShapeManagerImpl::ShapeManagerImpl( EventMultiplexer& rMultiplexer,
LayerManagerSharedPtr const& rLayerManager,
@@ -421,7 +420,6 @@ void ShapeManagerImpl::notifyIntrinsicAnimationsDisabled()
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx
index a6d526ba5a55..d433b7af1409 100644
--- a/slideshow/source/engine/slide/slideanimations.cxx
+++ b/slideshow/source/engine/slide/slideanimations.cxx
@@ -25,10 +25,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
SlideAnimations::SlideAnimations( const SlideShowContext& rContext,
const ::basegfx::B2DVector& rSlideSize ) :
maContext( rContext ),
@@ -103,7 +101,6 @@ namespace slideshow
mpRootNode->end();
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index ebd16911d2c0..3a1039a004ed 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -51,9 +51,7 @@
using namespace ::com::sun::star;
-namespace slideshow
-{
-namespace internal
+namespace slideshow::internal
{
namespace
{
@@ -1102,7 +1100,6 @@ SlideSharedPtr createSlide( const uno::Reference< drawing::XDrawPage >&
return pRet;
}
-} // namespace internal
} // namespace slideshow
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index 0701526937b5..89ef8c835a83 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -30,9 +30,7 @@
#include "targetpropertiescreator.hxx"
#include <tools.hxx>
-namespace slideshow
-{
-namespace internal
+namespace slideshow::internal
{
namespace
{
@@ -366,7 +364,6 @@ namespace internal
return aRes;
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 179b937d874a..045c455e69fe 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -39,10 +39,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
class PaintOverlayHandler : public MouseEventHandler,
public ViewEventHandler,
public UserPaintEventHandler
@@ -482,7 +480,6 @@ namespace slideshow
TOOLS_WARN_EXCEPTION("slideshow", "");
}
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx
index b59d4813ab9a..368cb070c15d 100644
--- a/slideshow/source/engine/slidebitmap.cxx
+++ b/slideshow/source/engine/slidebitmap.cxx
@@ -33,10 +33,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
SlideBitmap::SlideBitmap( const ::cppcanvas::BitmapSharedPtr& rBitmap ) :
maOutputPos(),
@@ -109,7 +107,6 @@ namespace slideshow
return mxBitmap;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slideshowcontext.cxx b/slideshow/source/engine/slideshowcontext.cxx
index 94d8c83cd96b..8c0811e9ecf7 100644
--- a/slideshow/source/engine/slideshowcontext.cxx
+++ b/slideshow/source/engine/slideshowcontext.cxx
@@ -32,9 +32,7 @@
using namespace ::com::sun::star;
-namespace slideshow
-{
-namespace internal
+namespace slideshow::internal
{
SlideShowContext::SlideShowContext( SubsettableShapeManagerSharedPtr& rSubsettableShapeManager,
@@ -65,7 +63,6 @@ void SlideShowContext::dispose()
mxComponentContext.clear();
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 21f382220eb9..f470b90b81ab 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -58,8 +58,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
@@ -1194,7 +1193,6 @@ UnoViewSharedPtr createSlideView( uno::Reference< presentation::XSlideShowView>
return that;
}
-} // namespace internal
} // namespace slideshow
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx
index 4953ccde2fcc..6f67f8ac0487 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -46,10 +46,8 @@
/* Implementation of SmilFunctionParser class */
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
namespace
{
typedef const char* StringIteratorT;
@@ -604,7 +602,6 @@ namespace slideshow
return pContext->maOperandStack.top();
}
- }
}
#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx
index 0b411d292f9f..c9386192e8d6 100644
--- a/slideshow/source/engine/soundplayer.cxx
+++ b/slideshow/source/engine/soundplayer.cxx
@@ -34,10 +34,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
// TODO(Q3): Move the whole SoundPlayer class to avmedia.
std::shared_ptr<SoundPlayer> SoundPlayer::create(
@@ -169,7 +167,6 @@ namespace slideshow
{
return mxPlayer->isPlaying();
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx
index 8afcc9739650..1fbb673ff61e 100644
--- a/slideshow/source/engine/tools.cxx
+++ b/slideshow/source/engine/tools.cxx
@@ -52,10 +52,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
namespace
{
class NamedValueComparator
@@ -766,7 +764,6 @@ namespace slideshow
basegfx::fround( aTmpRect.getRange().getX() ) + 1,
basegfx::fround( aTmpRect.getRange().getY() ) + 1 );
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/barndoorwipe.cxx b/slideshow/source/engine/transitions/barndoorwipe.cxx
index ffe799dd1bb3..c2621f9318cd 100644
--- a/slideshow/source/engine/transitions/barndoorwipe.cxx
+++ b/slideshow/source/engine/transitions/barndoorwipe.cxx
@@ -24,8 +24,7 @@
#include "barndoorwipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon BarnDoorWipe::operator () ( double t )
{
@@ -51,6 +50,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/barwipepolypolygon.cxx b/slideshow/source/engine/transitions/barwipepolypolygon.cxx
index 5a7a381bfc37..d2f28df7d3d0 100644
--- a/slideshow/source/engine/transitions/barwipepolypolygon.cxx
+++ b/slideshow/source/engine/transitions/barwipepolypolygon.cxx
@@ -22,8 +22,7 @@
#include "barwipepolypolygon.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon BarWipePolyPolygon::operator () ( double t )
{
@@ -42,6 +41,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/boxwipe.cxx b/slideshow/source/engine/transitions/boxwipe.cxx
index dabcc47e5ac3..0844a905cb56 100644
--- a/slideshow/source/engine/transitions/boxwipe.cxx
+++ b/slideshow/source/engine/transitions/boxwipe.cxx
@@ -22,8 +22,7 @@
#include "boxwipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon BoxWipe::operator () ( double t )
{
@@ -43,6 +42,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/checkerboardwipe.cxx b/slideshow/source/engine/transitions/checkerboardwipe.cxx
index 8512e398efa7..a88224a33215 100644
--- a/slideshow/source/engine/transitions/checkerboardwipe.cxx
+++ b/slideshow/source/engine/transitions/checkerboardwipe.cxx
@@ -22,8 +22,7 @@
#include "checkerboardwipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon CheckerBoardWipe::operator () ( double t )
{
@@ -51,6 +50,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx
index 5aa3857a7712..ae64b8e6731f 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.cxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.cxx
@@ -26,10 +26,8 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
ClippingFunctor::ClippingFunctor(const ParametricPolyPolygonSharedPtr& rPolygon,
const TransitionInfo& rTransitionInfo,
bool bDirectionForward,
@@ -211,7 +209,6 @@ namespace slideshow
return aClipPoly;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/clockwipe.cxx b/slideshow/source/engine/transitions/clockwipe.cxx
index cd4360b3672c..bba29bfca4fa 100644
--- a/slideshow/source/engine/transitions/clockwipe.cxx
+++ b/slideshow/source/engine/transitions/clockwipe.cxx
@@ -24,8 +24,7 @@
#include "clockwipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolygon ClockWipe::calcCenteredClock( double t, double e )
{
@@ -59,6 +58,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/combtransition.cxx b/slideshow/source/engine/transitions/combtransition.cxx
index 90a2f56fa0ca..d1dbe9b15db5 100644
--- a/slideshow/source/engine/transitions/combtransition.cxx
+++ b/slideshow/source/engine/transitions/combtransition.cxx
@@ -25,8 +25,7 @@
#include "combtransition.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
@@ -174,7 +173,6 @@ bool CombTransition::operator()( double t )
return true;
}
-} // namespace internal
-} // namespace presentation
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/doublediamondwipe.cxx b/slideshow/source/engine/transitions/doublediamondwipe.cxx
index 220f3ec8c6f8..9c482000d636 100644
--- a/slideshow/source/engine/transitions/doublediamondwipe.cxx
+++ b/slideshow/source/engine/transitions/doublediamondwipe.cxx
@@ -22,8 +22,7 @@
#include "doublediamondwipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon DoubleDiamondWipe::operator () ( double t )
{
@@ -51,6 +50,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/ellipsewipe.cxx b/slideshow/source/engine/transitions/ellipsewipe.cxx
index f8647b3becb7..7a5001efd70b 100644
--- a/slideshow/source/engine/transitions/ellipsewipe.cxx
+++ b/slideshow/source/engine/transitions/ellipsewipe.cxx
@@ -23,8 +23,7 @@
#include "ellipsewipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon EllipseWipe::operator () ( double t )
{
@@ -48,6 +47,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/fanwipe.cxx b/slideshow/source/engine/transitions/fanwipe.cxx
index fb61ee9402a7..b86b0def2d5b 100644
--- a/slideshow/source/engine/transitions/fanwipe.cxx
+++ b/slideshow/source/engine/transitions/fanwipe.cxx
@@ -25,8 +25,7 @@
#include "fanwipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon FanWipe::operator () ( double t )
{
@@ -57,6 +56,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/figurewipe.cxx b/slideshow/source/engine/transitions/figurewipe.cxx
index caf573bfda6a..1445eeb25139 100644
--- a/slideshow/source/engine/transitions/figurewipe.cxx
+++ b/slideshow/source/engine/transitions/figurewipe.cxx
@@ -25,8 +25,7 @@
#include "figurewipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon FigureWipe::operator () ( double t )
{
@@ -114,6 +113,5 @@ FigureWipe * FigureWipe::createStarWipe( sal_Int32 nPoints )
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/fourboxwipe.cxx b/slideshow/source/engine/transitions/fourboxwipe.cxx
index 49106916950a..74833c2e05ae 100644
--- a/slideshow/source/engine/transitions/fourboxwipe.cxx
+++ b/slideshow/source/engine/transitions/fourboxwipe.cxx
@@ -25,8 +25,7 @@
#include "fourboxwipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon FourBoxWipe::operator () ( double t )
{
@@ -71,6 +70,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/iriswipe.cxx b/slideshow/source/engine/transitions/iriswipe.cxx
index 02a9cd333161..72d3e5a61bdf 100644
--- a/slideshow/source/engine/transitions/iriswipe.cxx
+++ b/slideshow/source/engine/transitions/iriswipe.cxx
@@ -23,8 +23,7 @@
#include "iriswipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon IrisWipe::operator () ( double t )
{
@@ -38,6 +37,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx
index 94ee99cecd48..f95d4e3f72fc 100644
--- a/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx
+++ b/slideshow/source/engine/transitions/parametricpolypolygonfactory.cxx
@@ -47,10 +47,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
ParametricPolyPolygonSharedPtr
ParametricPolyPolygonFactory::createClipPolyPolygon(
sal_Int16 nType, sal_Int16 nSubType )
@@ -271,7 +269,6 @@ namespace slideshow
return ParametricPolyPolygonSharedPtr();
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/pinwheelwipe.cxx b/slideshow/source/engine/transitions/pinwheelwipe.cxx
index 646d3a04afa1..74522a8e6dfc 100644
--- a/slideshow/source/engine/transitions/pinwheelwipe.cxx
+++ b/slideshow/source/engine/transitions/pinwheelwipe.cxx
@@ -23,8 +23,7 @@
#include "pinwheelwipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon PinWheelWipe::operator () ( double t )
{
@@ -43,6 +42,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/randomwipe.cxx b/slideshow/source/engine/transitions/randomwipe.cxx
index 4dd16f3f9278..58047a676f82 100644
--- a/slideshow/source/engine/transitions/randomwipe.cxx
+++ b/slideshow/source/engine/transitions/randomwipe.cxx
@@ -26,8 +26,7 @@
#include <tools.hxx>
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars )
: m_positions( new ::basegfx::B2DPoint[ nElements ] ),
@@ -79,6 +78,5 @@ RandomWipe::RandomWipe( sal_Int32 nElements, bool randomBars )
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index ce4da4cb1611..d0ff5325e252 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -33,8 +33,7 @@
using namespace ::com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
/***************************************************
*** ***
@@ -366,6 +365,5 @@ AnimationActivitySharedPtr TransitionFactory::createShapeTransition(
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx
index e0ef0b060b1f..a3edf1a8e882 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
@@ -30,8 +30,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
SlideChangeBase::SlideChangeBase( o3tl::optional<SlideSharedPtr> const & leavingSlide,
const SlideSharedPtr& pEnteringSlide,
@@ -506,7 +505,6 @@ void SlideChangeBase::clearViewEntry( ViewEntry& rEntry )
rEntry.mpOutSprite.reset();
}
-} // namespace internal
} // namespace presentation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index 52b2bdc0b105..6c12603836f1 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -45,8 +45,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
@@ -1102,7 +1101,6 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition(
return NumberAnimationSharedPtr();
}
-} // namespace internal
} // namespace presentation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/snakewipe.cxx b/slideshow/source/engine/transitions/snakewipe.cxx
index efa8960bbfd1..ceaa1d00192b 100644
--- a/slideshow/source/engine/transitions/snakewipe.cxx
+++ b/slideshow/source/engine/transitions/snakewipe.cxx
@@ -31,8 +31,7 @@
#include "transitiontools.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
: m_sqrtElements( static_cast<sal_Int32>(
@@ -235,6 +234,5 @@ SnakeWipe::SnakeWipe( sal_Int32 nElements, bool diagonal, bool flipOnYAxis )
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/spiralwipe.cxx b/slideshow/source/engine/transitions/spiralwipe.cxx
index a00c95b0984e..3d1dc0282ea1 100644
--- a/slideshow/source/engine/transitions/spiralwipe.cxx
+++ b/slideshow/source/engine/transitions/spiralwipe.cxx
@@ -27,8 +27,7 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis )
: m_elements(nElements),
@@ -117,6 +116,5 @@ SpiralWipe::SpiralWipe( sal_Int32 nElements, bool flipOnYAxis )
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/sweepwipe.cxx b/slideshow/source/engine/transitions/sweepwipe.cxx
index bb6a3e40e69e..e6fcb8c2d028 100644
--- a/slideshow/source/engine/transitions/sweepwipe.cxx
+++ b/slideshow/source/engine/transitions/sweepwipe.cxx
@@ -25,8 +25,7 @@
#include "transitiontools.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon SweepWipe::operator () ( double t )
{
@@ -69,6 +68,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx
index 15cd451d0a0b..6ec5a57f56aa 100644
--- a/slideshow/source/engine/transitions/transitionfactorytab.cxx
+++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx
@@ -29,8 +29,7 @@
using namespace ::com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
@@ -2130,7 +2129,6 @@ const TransitionInfo* getRandomTransitionInfo()
- 1 /* exclude random transition at end of table */ );
}
-} // namespace internal
} // namespace presentation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/transitiontools.cxx b/slideshow/source/engine/transitions/transitiontools.cxx
index adadaa57eb70..e930028f60a1 100644
--- a/slideshow/source/engine/transitions/transitiontools.cxx
+++ b/slideshow/source/engine/transitions/transitiontools.cxx
@@ -24,8 +24,7 @@
#include <basegfx/matrix/b2dhommatrixtools.hxx>
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
// TODO(Q2): Move this to basegfx
::basegfx::B2DPolygon createUnitRect()
@@ -54,6 +53,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/veewipe.cxx b/slideshow/source/engine/transitions/veewipe.cxx
index 8b1f123f957a..48fc4304b6e6 100644
--- a/slideshow/source/engine/transitions/veewipe.cxx
+++ b/slideshow/source/engine/transitions/veewipe.cxx
@@ -22,8 +22,7 @@
#include "veewipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
::basegfx::B2DPolyPolygon VeeWipe::operator () ( double t )
{
@@ -39,6 +38,5 @@ namespace internal {
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/waterfallwipe.cxx b/slideshow/source/engine/transitions/waterfallwipe.cxx
index a1743993d049..c3ef81ca5f7c 100644
--- a/slideshow/source/engine/transitions/waterfallwipe.cxx
+++ b/slideshow/source/engine/transitions/waterfallwipe.cxx
@@ -25,8 +25,7 @@
#include "transitiontools.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
WaterfallWipe::WaterfallWipe( sal_Int32 nElements, bool flipOnYAxis )
: m_flipOnYAxis( flipOnYAxis )
@@ -62,6 +61,5 @@ WaterfallWipe::WaterfallWipe( sal_Int32 nElements, bool flipOnYAxis )
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/transitions/zigzagwipe.cxx b/slideshow/source/engine/transitions/zigzagwipe.cxx
index 0e2e64c62b64..9b1f14221175 100644
--- a/slideshow/source/engine/transitions/zigzagwipe.cxx
+++ b/slideshow/source/engine/transitions/zigzagwipe.cxx
@@ -25,8 +25,7 @@
#include "zigzagwipe.hxx"
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
ZigZagWipe::ZigZagWipe( sal_Int32 nZigs ) : m_zigEdge( 1.0 / nZigs )
{
@@ -67,6 +66,5 @@ ZigZagWipe::ZigZagWipe( sal_Int32 nZigs ) : m_zigEdge( 1.0 / nZigs )
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx
index 8306085ab5cc..69537433ae9b 100644
--- a/slideshow/source/engine/unoviewcontainer.cxx
+++ b/slideshow/source/engine/unoviewcontainer.cxx
@@ -28,10 +28,8 @@
using namespace ::com::sun::star;
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
UnoViewContainer::UnoViewContainer() :
maViews()
{
@@ -96,7 +94,6 @@ namespace slideshow
pView->_dispose();
maViews.clear();
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index 51a725fa7de7..2dfeba8221ff 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -38,8 +38,7 @@ using namespace com::sun::star;
/* Implementation of UserEventQueue class */
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
namespace {
@@ -792,7 +791,6 @@ void UserEventQueue::callSkipEffectEventHandler()
pHandler->skipEffect();
}
-} // namespace internal
} // namespace presentation
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx
index c7f31906b7f5..83f1858e9294 100644
--- a/slideshow/source/engine/waitsymbol.cxx
+++ b/slideshow/source/engine/waitsymbol.cxx
@@ -37,8 +37,7 @@
using namespace com::sun::star;
-namespace slideshow {
-namespace internal {
+namespace slideshow::internal {
const sal_Int32 LEFT_BORDER_SPACE = 10;
const sal_Int32 LOWER_BORDER_SPACE = 10;
@@ -177,7 +176,6 @@ void WaitSymbol::viewsChanged()
}
}
-} // namespace internal
-} // namespace slideshow
+} // namespace slideshow::internal
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx
index 9f114b4ae227..9658661dc785 100644
--- a/slideshow/source/engine/wakeupevent.cxx
+++ b/slideshow/source/engine/wakeupevent.cxx
@@ -24,10 +24,8 @@
#include <wakeupevent.hxx>
-namespace slideshow
+namespace slideshow::internal
{
- namespace internal
- {
WakeupEvent::WakeupEvent(
std::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase,
ActivitiesQueue& rActivityQueue ) :
@@ -82,7 +80,6 @@ namespace slideshow
{
mpActivity = rActivity;
}
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 07e2d859c045..933e89c24d87 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -41,7 +41,7 @@
#include <com/sun/star/script/XTypeConverter.hpp>
#include <com/sun/star/script/FailReason.hpp>
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
using namespace css::uno;
using namespace css::lang;
diff --git a/svgio/source/svgreader/svganode.cxx b/svgio/source/svgreader/svganode.cxx
index d2d64d04c359..35e5e290b4fd 100644
--- a/svgio/source/svgreader/svganode.cxx
+++ b/svgio/source/svgreader/svganode.cxx
@@ -19,10 +19,8 @@
#include <svganode.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgANode::SvgANode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -99,7 +97,6 @@ namespace svgio
}
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx
index ac91ade8094f..bc4e739eccb8 100644
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@@ -25,10 +25,8 @@
#include <drawinglayer/primitive2d/textbreakuphelper.hxx>
#include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgTextPositions::SvgTextPositions()
: maX(),
maY(),
@@ -145,14 +143,11 @@ namespace svgio
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
namespace {
class localTextBreakupHelper : public drawinglayer::primitive2d::TextBreakupHelper
@@ -193,14 +188,11 @@ namespace svgio
return true;
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgCharacterNode::SvgCharacterNode(
SvgDocument& rDocument,
SvgNode* pParent,
@@ -575,14 +567,11 @@ namespace svgio
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgTextPosition::SvgTextPosition(
SvgTextPosition* pParent,
const InfoProvider& rInfoProvider,
@@ -761,7 +750,6 @@ namespace svgio
return fRetval;
}
- } // end of namespace svgreader
} // end of namespace svgio
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgcirclenode.cxx b/svgio/source/svgreader/svgcirclenode.cxx
index c63ef0866901..2841107492c0 100644
--- a/svgio/source/svgreader/svgcirclenode.cxx
+++ b/svgio/source/svgreader/svgcirclenode.cxx
@@ -22,10 +22,8 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgCircleNode::SvgCircleNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -140,7 +138,6 @@ namespace svgio
pStyle->add_postProcess(rTarget, aNewTarget, getTransform());
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx
index 8d09b51db7ca..e321e6511a07 100644
--- a/svgio/source/svgreader/svgclippathnode.cxx
+++ b/svgio/source/svgreader/svgclippathnode.cxx
@@ -26,10 +26,8 @@
#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgClipPathNode::SvgClipPathNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -256,7 +254,6 @@ namespace svgio
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgdocument.cxx b/svgio/source/svgreader/svgdocument.cxx
index 716db822a83c..458f4d1ceff9 100644
--- a/svgio/source/svgreader/svgdocument.cxx
+++ b/svgio/source/svgreader/svgdocument.cxx
@@ -19,10 +19,8 @@
#include <svgdocument.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgDocument::SvgDocument(const OUString& rAbsolutePath)
: maNodes(),
maAbsolutePath(rAbsolutePath),
@@ -93,7 +91,6 @@ namespace svgio
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgdocumenthandler.cxx b/svgio/source/svgreader/svgdocumenthandler.cxx
index 7ab843dfa906..6b925c03745e 100644
--- a/svgio/source/svgreader/svgdocumenthandler.cxx
+++ b/svgio/source/svgreader/svgdocumenthandler.cxx
@@ -131,10 +131,8 @@ namespace
}
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgDocHdl::SvgDocHdl(const OUString& aAbsolutePath)
: maDocument(aAbsolutePath),
mpTarget(nullptr),
@@ -640,7 +638,6 @@ namespace svgio
void SvgDocHdl::setDocumentLocator(const uno::Reference< xml::sax::XLocator >& /*xLocator*/)
{
}
- } // end of namespace svgreader
} // end of namespace svgio
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx
index fbf507ad86cf..59b635981015 100644
--- a/svgio/source/svgreader/svgellipsenode.cxx
+++ b/svgio/source/svgreader/svgellipsenode.cxx
@@ -22,10 +22,8 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgEllipseNode::SvgEllipseNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -155,7 +153,6 @@ namespace svgio
pStyle->add_postProcess(rTarget, aNewTarget, getTransform());
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx
index c33bab1939c4..03eba690829c 100644
--- a/svgio/source/svgreader/svggnode.cxx
+++ b/svgio/source/svgreader/svggnode.cxx
@@ -19,10 +19,8 @@
#include <svggnode.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgGNode::SvgGNode(
SVGToken aType,
SvgDocument& rDocument,
@@ -115,7 +113,6 @@ namespace svgio
}
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svggradientnode.cxx b/svgio/source/svgreader/svggradientnode.cxx
index 0677544ba775..639467b929fe 100644
--- a/svgio/source/svgreader/svggradientnode.cxx
+++ b/svgio/source/svgreader/svggradientnode.cxx
@@ -21,10 +21,8 @@
#include <svgdocument.hxx>
#include <svggradientstopnode.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
void SvgGradientNode::tryToFindLink()
{
if(!mpXLink && !maXLink.isEmpty())
@@ -522,7 +520,6 @@ namespace svgio
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svggradientstopnode.cxx b/svgio/source/svgreader/svggradientstopnode.cxx
index 7035be0d2020..f271cddc83c3 100644
--- a/svgio/source/svgreader/svggradientstopnode.cxx
+++ b/svgio/source/svgreader/svggradientstopnode.cxx
@@ -19,10 +19,8 @@
#include <svggradientstopnode.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgGradientStopNode::SvgGradientStopNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -77,7 +75,6 @@ namespace svgio
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgimagenode.cxx b/svgio/source/svgreader/svgimagenode.cxx
index 63bf8539eb9e..8cb6f4a05917 100644
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@@ -33,10 +33,8 @@
#include <drawinglayer/geometry/viewinformation2d.hxx>
#include <comphelper/base64.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgImageNode::SvgImageNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -356,7 +354,6 @@ namespace svgio
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svglinenode.cxx b/svgio/source/svgreader/svglinenode.cxx
index 9555660e96e4..e0064764017d 100644
--- a/svgio/source/svgreader/svglinenode.cxx
+++ b/svgio/source/svgreader/svglinenode.cxx
@@ -21,10 +21,8 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgLineNode::SvgLineNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -150,7 +148,6 @@ namespace svgio
pStyle->add_postProcess(rTarget, aNewTarget, getTransform());
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgmarkernode.cxx b/svgio/source/svgreader/svgmarkernode.cxx
index 943a71cc5f36..89375c75691a 100644
--- a/svgio/source/svgreader/svgmarkernode.cxx
+++ b/svgio/source/svgreader/svgmarkernode.cxx
@@ -19,10 +19,8 @@
#include <svgmarkernode.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgMarkerNode::SvgMarkerNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -193,7 +191,6 @@ namespace svgio
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx
index 035678d09b57..543b8eede681 100644
--- a/svgio/source/svgreader/svgmasknode.cxx
+++ b/svgio/source/svgreader/svgmasknode.cxx
@@ -27,10 +27,8 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgMaskNode::SvgMaskNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -313,7 +311,6 @@ namespace svgio
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgnode.cxx b/svgio/source/svgreader/svgnode.cxx
index 8f2e203a879a..0d8b5c68a0a2 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -24,10 +24,8 @@
#include <tools/urlobj.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
/// #i125258#
bool SvgNode::supportsParentStyle() const
{
@@ -684,7 +682,6 @@ namespace svgio
{
rVisitor.visit(*this);
}
- } // end of namespace svgreader
} // end of namespace svgio
diff --git a/svgio/source/svgreader/svgpathnode.cxx b/svgio/source/svgreader/svgpathnode.cxx
index 9bb6cd6b82f1..4aaca4e8d620 100644
--- a/svgio/source/svgreader/svgpathnode.cxx
+++ b/svgio/source/svgreader/svgpathnode.cxx
@@ -20,10 +20,8 @@
#include <svgpathnode.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgPathNode::SvgPathNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -115,7 +113,6 @@ namespace svgio
}
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx
index d3ae1e609a9a..a72846aacd07 100644
--- a/svgio/source/svgreader/svgpatternnode.cxx
+++ b/svgio/source/svgreader/svgpatternnode.cxx
@@ -20,10 +20,8 @@
#include <svgpatternnode.hxx>
#include <svgdocument.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
void SvgPatternNode::tryToFindLink()
{
if(!mpXLink && !maXLink.isEmpty())
@@ -472,7 +470,6 @@ namespace svgio
return nullptr;
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgpolynode.cxx b/svgio/source/svgreader/svgpolynode.cxx
index ee7dc28d5162..86cbe164ff7f 100644
--- a/svgio/source/svgreader/svgpolynode.cxx
+++ b/svgio/source/svgreader/svgpolynode.cxx
@@ -22,10 +22,8 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgPolyNode::SvgPolyNode(
SvgDocument& rDocument,
SvgNode* pParent,
@@ -112,7 +110,6 @@ namespace svgio
}
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgrectnode.cxx b/svgio/source/svgreader/svgrectnode.cxx
index a434b605a1cc..dca3c3ad5e31 100644
--- a/svgio/source/svgreader/svgrectnode.cxx
+++ b/svgio/source/svgreader/svgrectnode.cxx
@@ -22,10 +22,8 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgRectNode::SvgRectNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -212,7 +210,6 @@ namespace svgio
pStyle->add_postProcess(rTarget, aNewTarget, getTransform());
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index c5ee322e7cdc..03c932405323 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -45,10 +45,8 @@
const int nStyleDepthLimit = 1024;
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
static basegfx::B2DLineJoin StrokeLinejoinToB2DLineJoin(StrokeLinejoin aStrokeLinejoin)
{
if(StrokeLinejoin_round == aStrokeLinejoin)
@@ -3008,7 +3006,6 @@ namespace svgio
return maBaselineShiftNumber;
}
- } // end of namespace svgreader
} // end of namespace svgio
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgstylenode.cxx b/svgio/source/svgreader/svgstylenode.cxx
index cb81941dbbda..995fa2919fd5 100644
--- a/svgio/source/svgreader/svgstylenode.cxx
+++ b/svgio/source/svgreader/svgstylenode.cxx
@@ -20,10 +20,8 @@
#include <svgstylenode.hxx>
#include <svgdocument.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgStyleNode::SvgStyleNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -226,7 +224,6 @@ namespace svgio
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx
index 49256d6a393f..d462e8001f57 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -28,10 +28,8 @@
#include <drawinglayer/primitive2d/hiddengeometryprimitive2d.hxx>
#include <svgdocument.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgSvgNode::SvgSvgNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -829,7 +827,6 @@ namespace svgio
}
}
- } // end of namespace svgreader
} // end of namespace svgio
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgsymbolnode.cxx b/svgio/source/svgreader/svgsymbolnode.cxx
index 46190b2b1a52..6de296b8e0d3 100644
--- a/svgio/source/svgreader/svgsymbolnode.cxx
+++ b/svgio/source/svgreader/svgsymbolnode.cxx
@@ -19,10 +19,8 @@
#include <svgsymbolnode.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgSymbolNode::SvgSymbolNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -74,7 +72,6 @@ namespace svgio
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgtextnode.cxx b/svgio/source/svgreader/svgtextnode.cxx
index fc6e2b3ab19c..aff56aa7f3ea 100644
--- a/svgio/source/svgreader/svgtextnode.cxx
+++ b/svgio/source/svgreader/svgtextnode.cxx
@@ -24,10 +24,8 @@
#include <svgtextpathnode.hxx>
#include <svgtspannode.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgTextNode::SvgTextNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -261,7 +259,6 @@ namespace svgio
{
return getCurrentFontSizeInherited();
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgtextpathnode.cxx b/svgio/source/svgreader/svgtextpathnode.cxx
index 9cd35599df60..7793e2634e5a 100644
--- a/svgio/source/svgreader/svgtextpathnode.cxx
+++ b/svgio/source/svgreader/svgtextpathnode.cxx
@@ -28,10 +28,8 @@
#include <basegfx/curve/b2dcubicbezier.hxx>
#include <basegfx/curve/b2dbeziertools.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
namespace {
class pathTextBreakupHelper : public drawinglayer::primitive2d::TextBreakupHelper
@@ -235,14 +233,11 @@ namespace svgio
return bRetval;
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgTextPathNode::SvgTextPathNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -442,7 +437,6 @@ namespace svgio
}
}
- } // end of namespace svgreader
} // end of namespace svgio
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgtitledescnode.cxx b/svgio/source/svgreader/svgtitledescnode.cxx
index f5722b616922..dbceb2b54134 100644
--- a/svgio/source/svgreader/svgtitledescnode.cxx
+++ b/svgio/source/svgreader/svgtitledescnode.cxx
@@ -20,10 +20,8 @@
#include <svgtitledescnode.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgTitleDescNode::SvgTitleDescNode(
SVGToken aType,
SvgDocument& rDocument,
@@ -42,7 +40,6 @@ namespace svgio
{
maText += rChars;
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx
index d73f037c4389..78c35888ac3e 100644
--- a/svgio/source/svgreader/svgtoken.cxx
+++ b/svgio/source/svgreader/svgtoken.cxx
@@ -20,10 +20,8 @@
#include <svgtoken.hxx>
#include <unordered_map>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
static const char aSVGStrWidth[] = "width";
static const char aSVGStrHeight[] = "height";
static const char aSVGStrViewBox[] = "viewBox";
@@ -359,7 +357,6 @@ namespace svgio
{
return aSVGStrDesc;
}
- } // end of namespace svgreader
} // end of namespace svgio
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx
index f64904b3d329..580ec0429313 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -26,10 +26,8 @@
#include <svgtoken.hxx>
#include <unordered_map>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
// common non-token strings
const OUString commonStrings::aStrUserSpaceOnUse("userSpaceOnUse");
const OUString commonStrings::aStrObjectBoundingBox("objectBoundingBox");
@@ -1687,7 +1685,6 @@ namespace svgio
return aRetval;
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgtrefnode.cxx b/svgio/source/svgreader/svgtrefnode.cxx
index 2c8c3a57a36f..b4b08d45c06e 100644
--- a/svgio/source/svgreader/svgtrefnode.cxx
+++ b/svgio/source/svgreader/svgtrefnode.cxx
@@ -20,10 +20,8 @@
#include <svgtrefnode.hxx>
#include <svgdocument.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgTrefNode::SvgTrefNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -80,7 +78,6 @@ namespace svgio
return dynamic_cast< const SvgTextNode* >(getDocument().findSvgNodeById(maXLink));
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgtspannode.cxx b/svgio/source/svgreader/svgtspannode.cxx
index 4122df8e3633..f9b298ddaa7c 100644
--- a/svgio/source/svgreader/svgtspannode.cxx
+++ b/svgio/source/svgreader/svgtspannode.cxx
@@ -19,10 +19,8 @@
#include <svgtspannode.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgTspanNode::SvgTspanNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -73,7 +71,6 @@ namespace svgio
return getCurrentFontSizeInherited();
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx
index 74b38a3e9b89..4d71af3cf527 100644
--- a/svgio/source/svgreader/svgusenode.cxx
+++ b/svgio/source/svgreader/svgusenode.cxx
@@ -21,10 +21,8 @@
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
#include <svgdocument.hxx>
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
SvgUseNode::SvgUseNode(
SvgDocument& rDocument,
SvgNode* pParent)
@@ -189,7 +187,6 @@ namespace svgio
}
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svgreader/svgvisitor.cxx b/svgio/source/svgreader/svgvisitor.cxx
index ee6102503b55..1f2ea975c4ca 100644
--- a/svgio/source/svgreader/svgvisitor.cxx
+++ b/svgio/source/svgreader/svgvisitor.cxx
@@ -18,9 +18,7 @@
#include <svgvisitor.hxx>
-namespace svgio
-{
-namespace svgreader
+namespace svgio::svgreader
{
SvgDrawVisitor::SvgDrawVisitor()
: mpDrawRoot(std::make_shared<gfx::DrawRoot>())
@@ -162,7 +160,6 @@ void SvgDrawVisitor::goToChildren(svgio::svgreader::SvgNode const& rNode)
rChild->accept(*this);
}
}
-}
} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx
index c96be4fb979d..f48d04cd1221 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -37,10 +37,8 @@
using namespace ::com::sun::star;
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
namespace {
class XSvgParser : public ::cppu::WeakAggImplHelper2< graphic::XSvgParser, lang::XServiceInfo >
@@ -73,14 +71,11 @@ namespace svgio
};
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
// uno functions
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
uno::Sequence< OUString > XSvgParser_getSupportedServiceNames()
{
return uno::Sequence< OUString > { "com.sun.star.graphic.SvgTools" };
@@ -95,13 +90,10 @@ namespace svgio
{
return static_cast< ::cppu::OWeakObject* >(new XSvgParser(context));
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
-namespace svgio
+namespace svgio::svgreader
{
- namespace svgreader
- {
XSvgParser::XSvgParser(
uno::Reference< uno::XComponentContext > const & context):
context_(context)
@@ -221,7 +213,6 @@ namespace svgio
return XSvgParser_getSupportedServiceNames();
}
- } // end of namespace svgreader
-} // end of namespace svgio
+} // end of namespace svgio::svgreader
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx
index e4dfbb9dd939..dcfd64b871f6 100644
--- a/svl/qa/unit/test_URIHelper.cxx
+++ b/svl/qa/unit/test_URIHelper.cxx
@@ -50,10 +50,10 @@
#include <svl/urihelper.hxx>
#include <unotools/charclass.hxx>
-namespace com { namespace sun { namespace star { namespace ucb {
+namespace com::sun::star::ucb {
class XCommandEnvironment;
class XContentEventListener;
-} } } }
+}
namespace {
diff --git a/svl/source/crypto/cryptosign.cxx b/svl/source/crypto/cryptosign.cxx
index 34de60c3572c..483a9ee31638 100644
--- a/svl/source/crypto/cryptosign.cxx
+++ b/svl/source/crypto/cryptosign.cxx
@@ -880,9 +880,7 @@ bool CreateSigningCertificateAttribute(void const * pDerEncoded, int nDerEncoded
} // anonymous namespace
#endif //_WIN32
-namespace svl {
-
-namespace crypto {
+namespace svl::crypto {
static int AsHex(char ch)
{
@@ -2430,6 +2428,4 @@ bool Signing::Verify(SvStream& rStream,
}
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 98b15675c00e..868982813f98 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -189,7 +189,7 @@ struct SfxUndoManager_Data
SfxUndoManager_Data & operator= (const SfxUndoManager_Data &) = delete;
};
-namespace svl { namespace undo { namespace impl
+namespace svl::undo::impl
{
class LockGuard
{
@@ -335,7 +335,7 @@ namespace svl { namespace undo { namespace impl
::std::for_each( aListenersCopy.begin(), aListenersCopy.end(), notifier );
}
}
-} } }
+}
using namespace ::svl::undo::impl;
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 3b4e0c178b2c..c0b951f15046 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -26,9 +26,9 @@
#include <com/sun/star/frame/XConfigManager.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
class XComponentContext;
-} } } }
+}
namespace {
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index cd9cfba3b45a..24db4ae50ac3 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -31,9 +31,7 @@
#include <unotools/streamwrap.hxx>
#include <cppuhelper/implbase.hxx>
-namespace svt
-{
-namespace GraphicAccess
+namespace svt::GraphicAccess
{
using namespace ::utl;
@@ -164,7 +162,6 @@ uno::Reference<io::XInputStream> getImageXStream(uno::Reference<uno::XComponentC
return new OSeekableInputStreamWrapper(getImageStream(rxContext, rImageResourceURL).release(), true); // take ownership
}
-} // namespace GraphicAccess
-} // namespace svt
+} // namespace svt::GraphicAccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx
index 82cd1b6679df..099c8cc50c23 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -27,7 +27,7 @@
#include <osl/diagnose.h>
-namespace svt { namespace table
+namespace svt::table
{
@@ -195,7 +195,7 @@ namespace svt { namespace table
}
-} } // namespace svt::table
+} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index f30a8e9e719e..43257e3cbde6 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -33,7 +33,7 @@
#include <vcl/settings.hxx>
-namespace svt { namespace table
+namespace svt::table
{
using ::css::uno::Any;
using ::css::uno::Reference;
@@ -597,7 +597,7 @@ namespace svt { namespace table
}
-} } // namespace svt::table
+} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/table/mousefunction.cxx b/svtools/source/table/mousefunction.cxx
index ce294aae1f40..a21ee2644108 100644
--- a/svtools/source/table/mousefunction.cxx
+++ b/svtools/source/table/mousefunction.cxx
@@ -27,7 +27,7 @@
#include <vcl/ptrstyle.hxx>
-namespace svt { namespace table
+namespace svt::table
{
@@ -270,7 +270,7 @@ namespace svt { namespace table
}
-} } // namespace svt::table
+} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index dda4d974dabe..ce88591a5048 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::lang;
using namespace utl;
-namespace svt { namespace table
+namespace svt::table
{
@@ -640,7 +640,7 @@ namespace svt { namespace table
}
}
-}} // namespace svt::table
+} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index f2a7a3f8d856..db1aa7d384fb 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -46,7 +46,7 @@
#define MIN_COLUMN_WIDTH_PIXEL 4
-namespace svt { namespace table
+namespace svt::table
{
@@ -2547,7 +2547,7 @@ namespace svt { namespace table
}
-} } // namespace svt::table
+} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index 74bf17153c15..837097516eda 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -27,7 +27,7 @@
#include <vcl/settings.hxx>
#include <vcl/commandevent.hxx>
-namespace svt { namespace table
+namespace svt::table
{
using css::uno::Any;
@@ -194,7 +194,7 @@ namespace svt { namespace table
return bDone || Window::EventNotify( rNEvt );
}
-}} // namespace svt::table
+} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/table/tablegeometry.cxx b/svtools/source/table/tablegeometry.cxx
index f7376a14907c..5b18826c50f7 100644
--- a/svtools/source/table/tablegeometry.cxx
+++ b/svtools/source/table/tablegeometry.cxx
@@ -22,7 +22,7 @@
#include "tablecontrol_impl.hxx"
-namespace svt { namespace table
+namespace svt::table
{
@@ -148,7 +148,7 @@ namespace svt { namespace table
}
-} } // namespace svt::table
+} // namespace svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index 32785a32fd8d..0477b82ca53d 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -33,7 +33,7 @@
#include <tools/diagnose_ex.h>
-namespace svt { namespace table
+namespace svt::table
{
@@ -872,6 +872,6 @@ namespace svt { namespace table
}
-} } // svt::table
+} // svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index 87df92307e27..e73e4d958673 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -29,7 +29,7 @@
#include <cppuhelper/implbase.hxx>
-namespace svt { namespace table
+namespace svt::table
{
@@ -306,7 +306,7 @@ namespace svt { namespace table
}
-} } // svt::table
+} // svt::table
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx
index 3faf68258b10..ed988e20bd80 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.cxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx
@@ -27,7 +27,7 @@
#include <tools/diagnose_ex.h>
-namespace svt { namespace uno
+namespace svt::uno
{
@@ -128,7 +128,7 @@ namespace svt { namespace uno
}
-} } // namespace svt::uno
+} // namespace svt::uno
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index ea3007e502d5..7876e62ac65f 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -27,7 +27,7 @@
using vcl::RoadmapWizardTypes::WizardPath;
-namespace svt { namespace uno
+namespace svt::uno
{
@@ -251,7 +251,7 @@ namespace svt { namespace uno
}
-} } // namespace svt::uno
+} // namespace svt::uno
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index f4842d7d710d..a58957841d53 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -146,7 +146,7 @@ SdrText* CellTextProvider::getText(sal_Int32 nIndex) const
}
namespace sdr::properties
- {
+{
class CellProperties : public TextProperties
{
protected:
@@ -377,7 +377,7 @@ namespace sdr::properties
AttributeProperties::ItemChange( nWhich, pNewItem );
}
- } // end of namespace sdr
+} // end of namespace sdr::properties
namespace sdr::table {
diff --git a/test/source/helper/form.cxx b/test/source/helper/form.cxx
index 89e9fb1a9536..77e6b163524c 100644
--- a/test/source/helper/form.cxx
+++ b/test/source/helper/form.cxx
@@ -22,11 +22,7 @@
using namespace css;
-namespace apitest
-{
-namespace helper
-{
-namespace form
+namespace apitest::helper::form
{
uno::Reference<drawing::XControlShape>
OOO_DLLPUBLIC_TEST createCommandButton(const uno::Reference<lang::XComponent>& r_xComponent,
@@ -60,8 +56,6 @@ uno::Reference<drawing::XControlShape> OOO_DLLPUBLIC_TEST createControlShape(
return xControlShape;
}
-} // namespace form
-} // namespace helper
-} // namespace apitest
+} // namespace apitest::helper::form
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/test/source/helper/shape.cxx b/test/source/helper/shape.cxx
index abb86e39e1a9..4fafcc0c7e48 100644
--- a/test/source/helper/shape.cxx
+++ b/test/source/helper/shape.cxx
@@ -19,11 +19,7 @@
using namespace css;
-namespace apitest
-{
-namespace helper
-{
-namespace shape
+namespace apitest::helper::shape
{
uno::Reference<drawing::XShape>
OOO_DLLPUBLIC_TEST createEllipse(const uno::Reference<lang::XComponent>& r_xComponent,
@@ -70,8 +66,6 @@ uno::Reference<drawing::XShape>
return xShape;
}
-} // namespace shape
-} // namespace helper
-} // namespace apitest
+} // namespace apitest::helper::shape
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/test/source/helper/transferable.cxx b/test/source/helper/transferable.cxx
index febcb294242d..e8990d925d18 100644
--- a/test/source/helper/transferable.cxx
+++ b/test/source/helper/transferable.cxx
@@ -12,11 +12,7 @@
using namespace css;
-namespace apitest
-{
-namespace helper
-{
-namespace transferable
+namespace apitest::helper::transferable
{
OString OOO_DLLPUBLIC_TEST getTextSelection(
const css::uno::Reference<css::datatransfer::XTransferable>& xTransferable, OString mimeType)
@@ -80,8 +76,6 @@ OString OOO_DLLPUBLIC_TEST getTextSelection(
return aRet;
}
-} // namespace transferable
-} // namespace helper
-} // namespace apitest
+} // namespace apitest::helper::transferable
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx
index 27db3059c2c3..b9d6e9ed9468 100644
--- a/testtools/source/bridgetest/multi.cxx
+++ b/testtools/source/bridgetest/multi.cxx
@@ -49,7 +49,7 @@ template< typename T > void checkEqual(T const & value, T const & argument) {
}
-namespace testtools { namespace bridgetest {
+namespace testtools::bridgetest {
OUString testMulti( css::uno::Reference< test::testtools::bridgetest::XMulti > const & multi )
{
@@ -219,6 +219,6 @@ OUString testMulti( css::uno::Reference< test::testtools::bridgetest::XMulti >
return OUString();
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 07b59b983fc7..2d445acc2a3e 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -45,7 +45,7 @@
#include <algorithm>
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
{
@@ -628,7 +628,7 @@ namespace ucb { namespace ucp { namespace ext
}
-} } } // namespace ucp::ext
+} // namespace ucp::ext
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
index acb415f3d903..92d78142bc7e 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
@@ -37,7 +37,7 @@
#include <vector>
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
{
@@ -341,7 +341,7 @@ namespace ucb { namespace ucp { namespace ext
}
-} } } // namespace ucp::ext
+} // namespace ucb::ucp::ext
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx
index 253cbbb91d79..5af819c90f6f 100644
--- a/ucb/source/ucp/ext/ucpext_provider.cxx
+++ b/ucb/source/ucp/ext/ucpext_provider.cxx
@@ -26,7 +26,7 @@
#include <rtl/ustrbuf.hxx>
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
{
@@ -176,7 +176,7 @@ namespace ucb { namespace ucp { namespace ext
}
-} } } // namespace ucb::ucp::ext
+} // namespace ucb::ucp::ext
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx
index d2c5dc414d21..b810d2956149 100644
--- a/ucb/source/ucp/ext/ucpext_resultset.cxx
+++ b/ucb/source/ucp/ext/ucpext_resultset.cxx
@@ -24,7 +24,7 @@
#include <ucbhelper/resultset.hxx>
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
{
@@ -69,7 +69,7 @@ namespace ucb { namespace ucp { namespace ext
}
-} } } // namespace ucp::ext
+} // namespace ucb::ucp::ext
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index 0d38566336ea..b7ffde3d1b31 100644
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -22,7 +22,7 @@
#include <cppuhelper/implementationentry.hxx>
-namespace ucb { namespace ucp { namespace ext
+namespace ucb::ucp::ext
{
@@ -42,7 +42,7 @@ namespace ucb { namespace ucp { namespace ext
};
-} } } // namespace ucb::ucp::ext
+} // namespace ucb::ucp::ext
extern "C"
diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
index 32b06df90fec..8b19f9ec94b8 100644
--- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx
@@ -62,9 +62,9 @@
#include <sal/macros.h>
#include "tdoc_content.hxx"
-namespace com { namespace sun { namespace star { namespace embed {
+namespace com::sun::star::embed {
class XStorage;
-} } } }
+}
using namespace com::sun::star;
using namespace tdoc_ucp;
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 8ea19cbead94..2888af65f42e 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -29,7 +29,7 @@
using namespace ::codemaker::cpp;
-namespace skeletonmaker { namespace cpp {
+namespace skeletonmaker::cpp {
static void generateIncludes(std::ostream & o,
const std::set< OUString >& interfaces,
@@ -1218,7 +1218,7 @@ void generateCalcAddin(ProgramOptions const & options,
}
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
index 9b145f23ae71..14304c4761ff 100644
--- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
@@ -30,7 +30,7 @@
using namespace ::codemaker::cpp;
-namespace skeletonmaker { namespace cpp {
+namespace skeletonmaker::cpp {
static void printType(
std::ostream & o, ProgramOptions const & options,
@@ -969,7 +969,7 @@ void generateDocumentation(std::ostream & o,
}
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unodevtools/source/skeletonmaker/javacompskeleton.cxx b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
index 2cb684366431..ca4735747f13 100644
--- a/unodevtools/source/skeletonmaker/javacompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/javacompskeleton.cxx
@@ -30,7 +30,7 @@
using namespace ::codemaker::java;
-namespace skeletonmaker { namespace java {
+namespace skeletonmaker::java {
static void generatePackage(std::ostream & o, const OString & implname)
{
@@ -914,7 +914,7 @@ void generateSkeleton(ProgramOptions const & options,
}
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unodevtools/source/skeletonmaker/javatypemaker.cxx b/unodevtools/source/skeletonmaker/javatypemaker.cxx
index 4cf3fd677822..f88530ecb316 100644
--- a/unodevtools/source/skeletonmaker/javatypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/javatypemaker.cxx
@@ -29,7 +29,7 @@
#include "skeletoncommon.hxx"
#include "skeletonjava.hxx"
-namespace skeletonmaker { namespace java {
+namespace skeletonmaker::java {
static void printType(
std::ostream & o, ProgramOptions const & options,
@@ -854,7 +854,7 @@ void generateDocumentation(std::ostream & o,
}
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoidl/source/legacyprovider.cxx b/unoidl/source/legacyprovider.cxx
index 8e517e986f67..61e35e8cf952 100644
--- a/unoidl/source/legacyprovider.cxx
+++ b/unoidl/source/legacyprovider.cxx
@@ -22,7 +22,7 @@
#include "legacyprovider.hxx"
-namespace unoidl { namespace detail {
+namespace unoidl::detail {
namespace {
@@ -822,6 +822,6 @@ rtl::Reference< Entity > LegacyProvider::findEntity(OUString const & name)
LegacyProvider::~LegacyProvider() throw () {}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoidl/source/sourcefileprovider.cxx b/unoidl/source/sourcefileprovider.cxx
index c538f8553b90..c0fc695e4235 100644
--- a/unoidl/source/sourcefileprovider.cxx
+++ b/unoidl/source/sourcefileprovider.cxx
@@ -16,7 +16,7 @@
#include "sourcefileprovider.hxx"
#include "sourceprovider-scanner.hxx"
-namespace unoidl { namespace detail {
+namespace unoidl::detail {
namespace {
@@ -130,6 +130,6 @@ rtl::Reference<Entity> SourceFileProvider::findEntity(OUString const & name)
SourceFileProvider::~SourceFileProvider() throw () {}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoidl/source/sourcetreeprovider.cxx b/unoidl/source/sourcetreeprovider.cxx
index 0d88c8e0565a..fd780f8dfd5e 100644
--- a/unoidl/source/sourcetreeprovider.cxx
+++ b/unoidl/source/sourcetreeprovider.cxx
@@ -29,7 +29,7 @@
#include <osl/thread.h>
#endif
-namespace unoidl { namespace detail {
+namespace unoidl::detail {
namespace {
@@ -205,6 +205,6 @@ rtl::Reference<Entity> SourceTreeProvider::findEntity(OUString const & name)
SourceTreeProvider::~SourceTreeProvider() throw () {}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoidl/source/unoidlprovider.cxx b/unoidl/source/unoidlprovider.cxx
index bde4d74a6a12..be59087e3095 100644
--- a/unoidl/source/unoidlprovider.cxx
+++ b/unoidl/source/unoidlprovider.cxx
@@ -29,7 +29,7 @@
#include "unoidlprovider.hxx"
-namespace unoidl { namespace detail {
+namespace unoidl::detail {
class MappedFile: public salhelper::SimpleReferenceObject {
public:
@@ -1402,6 +1402,6 @@ rtl::Reference< Entity > UnoidlProvider::findEntity(OUString const & name) const
UnoidlProvider::~UnoidlProvider() throw () {}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotest/source/cpp/getargument.cxx b/unotest/source/cpp/getargument.cxx
index 5beaf5705a4b..61277f8a849a 100644
--- a/unotest/source/cpp/getargument.cxx
+++ b/unotest/source/cpp/getargument.cxx
@@ -26,9 +26,7 @@
#include "getargument.hxx"
-namespace test {
-
-namespace detail {
+namespace test::detail {
bool getArgument(OUString const & name, OUString * value) {
OSL_ASSERT(value != nullptr);
@@ -37,6 +35,4 @@ bool getArgument(OUString const & name, OUString * value) {
}
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/events/event.cxx b/unoxml/source/events/event.cxx
index ade1e56285db..bc12bb5f83c1 100644
--- a/unoxml/source/events/event.cxx
+++ b/unoxml/source/events/event.cxx
@@ -22,7 +22,7 @@
using namespace css::uno;
using namespace css::xml::dom::events;
-namespace DOM { namespace events
+namespace DOM::events
{
CEvent::CEvent()
@@ -103,6 +103,6 @@ namespace DOM { namespace events
m_cancelable = cancelableArg;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/events/eventdispatcher.cxx b/unoxml/source/events/eventdispatcher.cxx
index 40a08305bfd0..ef07dff5ad2d 100644
--- a/unoxml/source/events/eventdispatcher.cxx
+++ b/unoxml/source/events/eventdispatcher.cxx
@@ -32,7 +32,7 @@ using namespace css::uno;
using namespace css::xml::dom;
using namespace css::xml::dom::events;
-namespace DOM { namespace events {
+namespace DOM::events {
void CEventDispatcher::addListener(xmlNodePtr pNode, const OUString& aType, const Reference<XEventListener>& aListener, bool bCapture)
{
@@ -245,6 +245,6 @@ namespace DOM { namespace events {
}
}
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/events/mouseevent.cxx b/unoxml/source/events/mouseevent.cxx
index 6b84ec577be7..8f276f0eae9a 100644
--- a/unoxml/source/events/mouseevent.cxx
+++ b/unoxml/source/events/mouseevent.cxx
@@ -23,7 +23,7 @@ using namespace css::uno;
using namespace css::xml::dom::events;
using namespace css::xml::dom::views;
-namespace DOM { namespace events
+namespace DOM::events
{
CMouseEvent::CMouseEvent()
: CMouseEvent_Base()
@@ -191,6 +191,6 @@ namespace DOM { namespace events
// base initializer
CUIEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg);
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/events/mutationevent.cxx b/unoxml/source/events/mutationevent.cxx
index b0648a6de5a9..a81720c7c1e0 100644
--- a/unoxml/source/events/mutationevent.cxx
+++ b/unoxml/source/events/mutationevent.cxx
@@ -23,7 +23,7 @@ using namespace css::uno;
using namespace css::xml::dom;
using namespace css::xml::dom::events;
-namespace DOM { namespace events
+namespace DOM::events
{
CMutationEvent::CMutationEvent()
: CMutationEvent_Base()
@@ -132,6 +132,6 @@ namespace DOM { namespace events
// base initializer
CEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg);
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/events/uievent.cxx b/unoxml/source/events/uievent.cxx
index 48ad583c2d4c..faa15113b824 100644
--- a/unoxml/source/events/uievent.cxx
+++ b/unoxml/source/events/uievent.cxx
@@ -23,7 +23,7 @@ using namespace css::uno;
using namespace css::xml::dom::events;
using namespace css::xml::dom::views;
-namespace DOM { namespace events
+namespace DOM::events
{
CUIEvent::CUIEvent()
: CUIEvent_Base()
@@ -110,6 +110,6 @@ namespace DOM { namespace events
// base initializer
CEvent::initEvent(eventTypeArg, canBubbleArg, cancelableArg);
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index ee55df6b651e..9e0218782fe7 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -81,9 +81,7 @@ using namespace ::com::sun::star;
using namespace ::ooo::vba;
-namespace ooo
-{
-namespace vba
+namespace ooo::vba
{
namespace { const double factor = 2540.0 / 72.0; }
@@ -1128,7 +1126,6 @@ SfxObjectShell* getSfxObjShell( const uno::Reference< frame::XModel >& xModel )
return pFoundShell;
}
-} // openoffice
} //org
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/bitmap.cxx b/vcl/backendtest/outputdevice/bitmap.cxx
index 2e7e0713294a..79cd3d3795cd 100644
--- a/vcl/backendtest/outputdevice/bitmap.cxx
+++ b/vcl/backendtest/outputdevice/bitmap.cxx
@@ -13,8 +13,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <bitmapwriteaccess.hxx>
-namespace vcl {
-namespace test {
+namespace vcl::test {
Bitmap OutputDeviceTestBitmap::setupDrawTransformedBitmap()
{
@@ -189,6 +188,6 @@ TestResult OutputDeviceTestBitmap::checkBlend(BitmapEx& rBitmapEx)
return checkRectangles(aBitmap, aExpected);
}
-}} // end namespace vcl::test
+} // end namespace vcl::test
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/common.cxx b/vcl/backendtest/outputdevice/common.cxx
index a7e857ffd1fd..e76150c49c1f 100644
--- a/vcl/backendtest/outputdevice/common.cxx
+++ b/vcl/backendtest/outputdevice/common.cxx
@@ -12,8 +12,7 @@
#include <bitmapwriteaccess.hxx>
#include <salgdi.hxx>
-namespace vcl {
-namespace test {
+namespace vcl::test {
namespace
{
@@ -469,6 +468,6 @@ TestResult OutputDeviceTestCommon::checkBezier(Bitmap& rBitmap)
return checkRectangles(rBitmap, aExpected);
}
-}} // end namespace vcl::test
+} // end namespace vcl::test
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/gradient.cxx b/vcl/backendtest/outputdevice/gradient.cxx
index 58e20e5d6092..9880fedd1e4c 100644
--- a/vcl/backendtest/outputdevice/gradient.cxx
+++ b/vcl/backendtest/outputdevice/gradient.cxx
@@ -11,8 +11,7 @@
#include <test/outputdevice.hxx>
#include <vcl/gradient.hxx>
-namespace vcl {
-namespace test {
+namespace vcl::test {
Bitmap OutputDeviceTestGradient::setupLinearGradient()
{
@@ -39,6 +38,6 @@ Bitmap OutputDeviceTestGradient::setupRadialGradient()
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
}
-}} // end namespace vcl::test
+} // end namespace vcl::test
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/line.cxx b/vcl/backendtest/outputdevice/line.cxx
index a43c72a62dc0..b9236dcc210d 100644
--- a/vcl/backendtest/outputdevice/line.cxx
+++ b/vcl/backendtest/outputdevice/line.cxx
@@ -10,8 +10,7 @@
#include <test/outputdevice.hxx>
-namespace vcl {
-namespace test {
+namespace vcl::test {
namespace
{
@@ -109,6 +108,6 @@ Bitmap OutputDeviceTestLine::setupAALines()
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
}
-}} // end namespace vcl::test
+} // end namespace vcl::test
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/outputdevice.cxx b/vcl/backendtest/outputdevice/outputdevice.cxx
index 4f31501b6f3b..c05c03e06a3a 100644
--- a/vcl/backendtest/outputdevice/outputdevice.cxx
+++ b/vcl/backendtest/outputdevice/outputdevice.cxx
@@ -10,8 +10,7 @@
#include <test/outputdevice.hxx>
-namespace vcl {
-namespace test {
+namespace vcl::test {
Bitmap OutputDeviceTestAnotherOutDev::setupDrawOutDev()
{
@@ -75,6 +74,6 @@ TestResult OutputDeviceTestAnotherOutDev::checkXOR(Bitmap& rBitmap)
return checkRectangles(rBitmap, aExpected);
}
-}} // end namespace vcl::test
+} // end namespace vcl::test
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/pixel.cxx b/vcl/backendtest/outputdevice/pixel.cxx
index b231396ab7ff..71997868fdf6 100644
--- a/vcl/backendtest/outputdevice/pixel.cxx
+++ b/vcl/backendtest/outputdevice/pixel.cxx
@@ -10,8 +10,7 @@
#include <test/outputdevice.hxx>
-namespace vcl {
-namespace test {
+namespace vcl::test {
namespace
{
@@ -52,6 +51,6 @@ Bitmap OutputDeviceTestPixel::setupRectangle(bool bEnableAA)
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
}
-}} // end namespace vcl::test
+} // end namespace vcl::test
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/polygon.cxx b/vcl/backendtest/outputdevice/polygon.cxx
index f0977abfb5f6..8d207ade9b64 100644
--- a/vcl/backendtest/outputdevice/polygon.cxx
+++ b/vcl/backendtest/outputdevice/polygon.cxx
@@ -10,8 +10,7 @@
#include <test/outputdevice.hxx>
-namespace vcl {
-namespace test {
+namespace vcl::test {
namespace
{
@@ -153,6 +152,6 @@ Bitmap OutputDeviceTestPolygon::setupAALines()
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
}
-}} // end namespace vcl::test
+} // end namespace vcl::test
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/polyline.cxx b/vcl/backendtest/outputdevice/polyline.cxx
index 53a9edab9d11..e1d1fd9e0ae0 100644
--- a/vcl/backendtest/outputdevice/polyline.cxx
+++ b/vcl/backendtest/outputdevice/polyline.cxx
@@ -10,8 +10,7 @@
#include <test/outputdevice.hxx>
-namespace vcl {
-namespace test {
+namespace vcl::test {
namespace
{
@@ -135,6 +134,6 @@ Bitmap OutputDeviceTestPolyLine::setupAALines()
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
}
-}} // end namespace vcl::test
+} // end namespace vcl::test
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/polyline_b2d.cxx b/vcl/backendtest/outputdevice/polyline_b2d.cxx
index 3674fa5d172c..65658d7aeb1d 100644
--- a/vcl/backendtest/outputdevice/polyline_b2d.cxx
+++ b/vcl/backendtest/outputdevice/polyline_b2d.cxx
@@ -11,9 +11,7 @@
#include <test/outputdevice.hxx>
#include <vcl/bitmapex.hxx>
-namespace vcl
-{
-namespace test
+namespace vcl::test
{
namespace
{
@@ -124,7 +122,6 @@ Bitmap OutputDeviceTestPolyLineB2D::setupAABezier()
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
}
-}
} // end namespace vcl::test
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/polypolygon.cxx b/vcl/backendtest/outputdevice/polypolygon.cxx
index e5a527042bdc..a53acbaf72be 100644
--- a/vcl/backendtest/outputdevice/polypolygon.cxx
+++ b/vcl/backendtest/outputdevice/polypolygon.cxx
@@ -11,8 +11,7 @@
#include <test/outputdevice.hxx>
-namespace vcl {
-namespace test {
+namespace vcl::test {
namespace
{
@@ -68,6 +67,6 @@ Bitmap OutputDeviceTestPolyPolygon::setupFilledRectangle(bool useLineColor)
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
}
-}} // end namespace vcl::test
+} // end namespace vcl::test
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/polypolygon_b2d.cxx b/vcl/backendtest/outputdevice/polypolygon_b2d.cxx
index 977f73dcc1f4..737cfae195f2 100644
--- a/vcl/backendtest/outputdevice/polypolygon_b2d.cxx
+++ b/vcl/backendtest/outputdevice/polypolygon_b2d.cxx
@@ -10,9 +10,7 @@
#include <test/outputdevice.hxx>
-namespace vcl
-{
-namespace test
+namespace vcl::test
{
namespace
{
@@ -67,7 +65,6 @@ Bitmap OutputDeviceTestPolyPolygonB2D::setupFilledRectangle(bool useLineColor)
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
}
-}
} // end namespace vcl::test
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/backendtest/outputdevice/rectangle.cxx b/vcl/backendtest/outputdevice/rectangle.cxx
index 033ebb3c54ae..8e7c0ba861aa 100644
--- a/vcl/backendtest/outputdevice/rectangle.cxx
+++ b/vcl/backendtest/outputdevice/rectangle.cxx
@@ -10,8 +10,7 @@
#include <test/outputdevice.hxx>
-namespace vcl {
-namespace test {
+namespace vcl::test {
namespace
{
@@ -110,6 +109,6 @@ Bitmap OutputDeviceTestRect::setupInvert_TrackFrame()
return mpVirtualDevice->GetBitmap(maVDRectangle.TopLeft(), maVDRectangle.GetSize());
}
-}} // end namespace vcl::test
+} // end namespace vcl::test
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qa/cppunit/canvasbitmaptest.cxx b/vcl/qa/cppunit/canvasbitmaptest.cxx
index 69971210db92..34ddd8825e60 100644
--- a/vcl/qa/cppunit/canvasbitmaptest.cxx
+++ b/vcl/qa/cppunit/canvasbitmaptest.cxx
@@ -43,7 +43,7 @@
using namespace ::com::sun::star;
using namespace vcl::unotools;
-namespace com { namespace sun { namespace star { namespace rendering
+namespace com::sun::star::rendering
{
static bool operator==( const RGBColor& rLHS, const ARGBColor& rRHS )
@@ -51,7 +51,7 @@ static bool operator==( const RGBColor& rLHS, const ARGBColor& rRHS )
return rLHS.Red == rRHS.Red && rLHS.Green == rRHS.Green && rLHS.Blue == rRHS.Blue;
}
-} } } }
+}
namespace
{
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index dcb35069e0cd..a5aefbbf2f2f 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1634,7 +1634,7 @@ void Application::setDeInitHook(Link<LinkParamNone*,void> const & hook) {
pSVData->maAppData.mbInAppMain = true;
}
-namespace vcl { namespace lok {
+namespace vcl::lok {
void registerPollCallbacks(
LibreOfficeKitPollCallback pPollCallback,
@@ -1674,6 +1674,6 @@ bool isUnipoll()
return pSVData && pSVData->mpPollCallback != nullptr;
}
-} } // namespace lok, namespace vcl
+} // namespace lok, namespace vcl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx
index 832156788215..9005467d90e4 100644
--- a/vcl/source/app/unohelp2.cxx
+++ b/vcl/source/app/unohelp2.cxx
@@ -29,7 +29,7 @@
using namespace ::com::sun::star;
-namespace vcl { namespace unohelper {
+namespace vcl::unohelper {
TextDataObject::TextDataObject( const OUString& rText ) : maText( rText )
{
@@ -93,6 +93,6 @@ namespace vcl { namespace unohelper {
return ( nT == SotClipboardFormatId::STRING );
}
-}} // namespace vcl::unohelper
+} // namespace vcl::unohelper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx
index 119781aca94d..7786ce516424 100644
--- a/vcl/source/bitmap/BitmapTools.cxx
+++ b/vcl/source/bitmap/BitmapTools.cxx
@@ -41,10 +41,7 @@ using namespace css;
using drawinglayer::primitive2d::Primitive2DSequence;
using drawinglayer::primitive2d::Primitive2DReference;
-namespace vcl
-{
-
-namespace bitmap
+namespace vcl::bitmap
{
BitmapEx loadFromName(const OUString& rFileName, const ImageLoadFlags eFlags)
@@ -1120,6 +1117,6 @@ bool convertBitmap32To24Plus8(BitmapEx const & rInput, BitmapEx & rResult)
return true;
}
-}} // end vcl::bitmap
+} // end vcl::bitmap
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/ipdf/pdfdocument.cxx b/vcl/source/filter/ipdf/pdfdocument.cxx
index aeeb91104c92..73d7f452688d 100644
--- a/vcl/source/filter/ipdf/pdfdocument.cxx
+++ b/vcl/source/filter/ipdf/pdfdocument.cxx
@@ -29,9 +29,7 @@
using namespace com::sun::star;
-namespace vcl
-{
-namespace filter
+namespace vcl::filter
{
const int MAX_SIGNATURE_CONTENT_LENGTH = 50000;
@@ -3007,7 +3005,6 @@ bool PDFEndArrayElement::Read(SvStream& rStream)
sal_uInt64 PDFEndArrayElement::GetOffset() const { return m_nOffset; }
-} // namespace filter
} // namespace vcl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/font/Feature.cxx b/vcl/source/font/Feature.cxx
index bace78ec4377..99a3910b81fb 100644
--- a/vcl/source/font/Feature.cxx
+++ b/vcl/source/font/Feature.cxx
@@ -14,9 +14,7 @@
#include <hb.h>
-namespace vcl
-{
-namespace font
+namespace vcl::font
{
OUString featureCodeAsString(uint32_t nFeature)
{
@@ -162,7 +160,6 @@ FeatureParameterType FeatureDefinition::getType() const { return m_eType; }
FeatureDefinition::operator bool() const { return m_nCode != 0; }
uint32_t FeatureDefinition::getDefault() const { return m_nDefault; }
-} // end font namespace
-} // end vcl namespace
+} // end vcl::font namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/font/FeatureCollector.cxx b/vcl/source/font/FeatureCollector.cxx
index ed110ccbf073..a606d629aa6c 100644
--- a/vcl/source/font/FeatureCollector.cxx
+++ b/vcl/source/font/FeatureCollector.cxx
@@ -13,9 +13,7 @@
#include <hb-ot.h>
#include <hb-graphite2.h>
-namespace vcl
-{
-namespace font
+namespace vcl::font
{
bool FeatureCollector::collectGraphite()
{
@@ -154,7 +152,6 @@ bool FeatureCollector::collect()
}
}
-} // end namespace font
-} // end namespace vcl
+} // end namespace vcl::font
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/font/FeatureParser.cxx b/vcl/source/font/FeatureParser.cxx
index b8afe2f36b06..c886482dfd96 100644
--- a/vcl/source/font/FeatureParser.cxx
+++ b/vcl/source/font/FeatureParser.cxx
@@ -11,9 +11,7 @@
#include <vcl/font/FeatureParser.hxx>
#include <vcl/font/Feature.hxx>
-namespace vcl
-{
-namespace font
+namespace vcl::font
{
OUString trimFontNameFeatures(OUString const& rFontName)
{
@@ -66,8 +64,6 @@ std::unordered_map<uint32_t, uint32_t> FeatureParser::getFeaturesMap() const
return aResultMap;
}
-} // end font namespace
-
-} // end vcl namespace
+} // end vcl::font namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx b/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
index 7b9aadfc01d2..6b9584bb73d8 100644
--- a/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
+++ b/vcl/source/font/OpenTypeFeatureDefinitonList.cxx
@@ -15,9 +15,7 @@
#include <algorithm>
-namespace vcl
-{
-namespace font
+namespace vcl::font
{
OpenTypeFeatureDefinitonListPrivate::OpenTypeFeatureDefinitonListPrivate() { init(); }
@@ -193,7 +191,6 @@ bool OpenTypeFeatureDefinitonListPrivate::isRequired(sal_uInt32 nFeatureCode)
!= m_aRequiredFeatures.end();
}
-} // end font namespace
-} // end vcl namespace
+} // end vcl::font namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/pdfbuildin_fonts.cxx b/vcl/source/gdi/pdfbuildin_fonts.cxx
index ddf7e3bcb145..41c208b93b67 100644
--- a/vcl/source/gdi/pdfbuildin_fonts.cxx
+++ b/vcl/source/gdi/pdfbuildin_fonts.cxx
@@ -23,9 +23,7 @@
using namespace vcl;
-namespace vcl
-{
-namespace pdf
+namespace vcl::pdf
{
OString BuildinFont::getNameObject() const
{
@@ -737,7 +735,6 @@ BuildinFontFace::CreateFontInstance(const FontSelectPattern& rFSP) const
return new BuildinFontInstance(*this, rFSP);
}
-} // namespace pdf
} // namespace vcl
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/graphic/GraphicLoader.cxx b/vcl/source/graphic/GraphicLoader.cxx
index b1127f541515..c26b2b9d0cfe 100644
--- a/vcl/source/graphic/GraphicLoader.cxx
+++ b/vcl/source/graphic/GraphicLoader.cxx
@@ -16,9 +16,7 @@
using namespace css;
-namespace vcl
-{
-namespace graphic
+namespace vcl::graphic
{
Graphic loadFromURL(OUString const& rURL, weld::Window* pParentWin)
{
@@ -41,7 +39,6 @@ Graphic loadFromURL(OUString const& rURL, weld::Window* pParentWin)
return aGraphic;
}
-}
} // end vcl::graphic
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/graphic/GraphicObject.cxx b/vcl/source/graphic/GraphicObject.cxx
index 1cf7ccd8bb0f..40f1033b372b 100644
--- a/vcl/source/graphic/GraphicObject.cxx
+++ b/vcl/source/graphic/GraphicObject.cxx
@@ -47,9 +47,7 @@ using com::sun::star::beans::XPropertySet;
#define WATERMARK_LUM_OFFSET 50
#define WATERMARK_CON_OFFSET -70
-namespace vcl
-{
-namespace graphic
+namespace vcl::graphic
{
void SearchForGraphics(uno::Reference<uno::XInterface> const & xInterface,
@@ -93,7 +91,7 @@ void SearchForGraphics(uno::Reference<uno::XInterface> const & xInterface,
}
}
-}} // end namespace vcl::graphic
+} // end namespace vcl::graphic
namespace
{
diff --git a/vcl/source/graphic/Manager.cxx b/vcl/source/graphic/Manager.cxx
index 5942b5cb8784..5107ff19ffc6 100644
--- a/vcl/source/graphic/Manager.cxx
+++ b/vcl/source/graphic/Manager.cxx
@@ -26,9 +26,7 @@
using namespace css;
-namespace vcl
-{
-namespace graphic
+namespace vcl::graphic
{
namespace
{
@@ -238,7 +236,6 @@ void Manager::changeExisting(const ImpGraphic* pImpGraphic, sal_Int64 nOldSizeBy
mnUsedSize -= nOldSizeBytes;
mnUsedSize += getGraphicSizeBytes(pImpGraphic);
}
-}
} // end vcl::graphic
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index d9f6a9923a0c..18f923d50016 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -46,10 +46,8 @@
using namespace ::com::sun::star;
-namespace vcl
+namespace vcl::unotools
{
- namespace unotools
- {
uno::Reference< rendering::XBitmap > xBitmapFromBitmapEx(const ::BitmapEx& inputBitmap )
{
SAL_INFO( "vcl.helper", "vcl::unotools::xBitmapFromBitmapEx()" );
@@ -620,8 +618,6 @@ namespace vcl
toByteColor(aARGBColor.Blue) );
}
- } // namespace vcltools
-
} // namespace canvas
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx
index 075fd4e7ced1..1b010a9d50fc 100644
--- a/vcl/source/helper/commandinfoprovider.cxx
+++ b/vcl/source/helper/commandinfoprovider.cxx
@@ -38,7 +38,7 @@
using namespace css;
using namespace css::uno;
-namespace vcl { namespace CommandInfoProvider {
+namespace vcl::CommandInfoProvider {
static Reference<container::XNameAccess> GetCommandDescription()
{
@@ -467,6 +467,6 @@ OUString GetModuleIdentifier(const Reference<frame::XFrame>& rxFrame)
return OUString();
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx b/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx
index 04a9533e6d10..0066fa004cbf 100644
--- a/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx
+++ b/vcl/unx/gtk3/gtk3gtkprintwrapper.cxx
@@ -9,9 +9,7 @@
#include <unx/gtk/gtkprintwrapper.hxx>
-namespace vcl
-{
-namespace unx
+namespace vcl::unx
{
GtkPrintWrapper::GtkPrintWrapper()
@@ -151,6 +149,5 @@ void GtkPrintWrapper::print_unix_dialog_set_has_selection(GtkPrintUnixDialog* di
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx
index d1459eb3b162..af05d4f5c92b 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -28,9 +28,7 @@
#include <comphelper/sequence.hxx>
#include <tools/color.hxx>
-namespace writerfilter {
-
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace ::com::sun::star;
@@ -210,7 +208,6 @@ void BorderHandler::appendGrabBag(const OUString& aKey, const OUString& aValue)
m_aInteropGrabBag.push_back(aProperty);
}
-} //namespace dmapper
-} //namespace writerfilter
+} //namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index f96737efd082..bf705eb74915 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -28,8 +28,7 @@
#include <comphelper/sequence.hxx>
#include <tools/color.hxx>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace ::com::sun::star;
@@ -329,7 +328,6 @@ bool CellColorHandler::isInteropGrabBagEnabled() const
return !(m_aInteropGrabBagName.isEmpty());
}
-} //namespace dmapper
} //namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx
index 08ff20cc675f..7b9340ef45a4 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.cxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.cxx
@@ -24,8 +24,7 @@
#include <comphelper/sequence.hxx>
#include <sal/log.hxx>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace ::com::sun::star;
using namespace ::writerfilter;
@@ -174,7 +173,6 @@ beans::PropertyValue CellMarginHandler::getInteropGrabBag()
return aRet;
}
-} //namespace dmapper
-} //namespace writerfilter
+} //namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index d82614cc931c..9efd355b05ef 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -32,9 +32,7 @@
using namespace com::sun::star;
-namespace writerfilter {
-namespace dmapper{
-namespace ConversionHelper{
+namespace writerfilter::dmapper::ConversionHelper{
/// Convert OOXML border style to WW8 that editeng can handle.
static sal_Int32 lcl_convertBorderStyleFromToken(sal_Int32 nOOXMLType)
@@ -647,8 +645,6 @@ util::DateTime ConvertDateStringToDateTime( const OUString& rDateTime )
}
-} // namespace ConversionHelper
-} //namespace dmapper
} //namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index d7545309ea99..83237017ea84 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -88,9 +88,7 @@
using namespace ::com::sun::star;
using namespace oox;
-namespace writerfilter {
-
-namespace dmapper{
+namespace writerfilter::dmapper{
struct
{
@@ -3936,7 +3934,6 @@ void DomainMapper::finishParagraph(const bool bRemove)
m_pImpl->finishParagraph(m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH), bRemove);
}
-} //namespace dmapper
} //namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index fe9f6e8863a8..8198378fc254 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -41,8 +41,7 @@
#include <rtl/ustring.hxx>
#endif
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace ::com::sun::star;
using namespace ::std;
@@ -1322,6 +1321,6 @@ DomainMapper_Impl& DomainMapperTableHandler::getDomainMapperImpl()
return m_rDMapper_Impl;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index c4245715ff8e..313a918a3eb4 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -37,8 +37,7 @@
#include <sal/log.hxx>
#include <numeric>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace ::com::sun::star;
using namespace ::std;
@@ -782,6 +781,6 @@ void DomainMapperTableManager::clearData()
m_sTableStyleName.clear();
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f5bab69875ae..cf046b571342 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -105,8 +105,7 @@
using namespace ::com::sun::star;
using namespace oox;
-namespace writerfilter {
-namespace dmapper{
+namespace writerfilter::dmapper{
//line numbering for header/footer
static void lcl_linenumberingHeaderFooter( const uno::Reference<container::XNameContainer>& xStyles, const OUString& rname, DomainMapper_Impl* dmapper )
@@ -6887,6 +6886,6 @@ void DomainMapper_Impl::substream(Id rName,
assert(m_aPropertyStacks[i].size() == propSize[i]);
}
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx
index 65ac1fa7f604..58a0e130513d 100644
--- a/writerfilter/source/dmapper/FFDataHandler.cxx
+++ b/writerfilter/source/dmapper/FFDataHandler.cxx
@@ -20,8 +20,7 @@
#include <ooxml/resourceids.hxx>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
/************************
* class: FFDataHandler *
@@ -185,6 +184,6 @@ void FFDataHandler::lcl_attribute(Id name, Value & val)
}
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 9bd11bdf1474..533eb41008dd 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -29,8 +29,7 @@
using namespace com::sun::star;
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
{
struct FontTable_Impl
@@ -285,7 +284,6 @@ void EmbeddedFontHandler::lcl_sprm( Sprm& )
}
-}//namespace dmapper
-}//namespace writerfilter
+}//namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx
index c916d9baa7c4..9c89bc0ad98a 100644
--- a/writerfilter/source/dmapper/FormControlHelper.cxx
+++ b/writerfilter/source/dmapper/FormControlHelper.cxx
@@ -39,8 +39,7 @@
#include <comphelper/sequence.hxx>
#include <tools/diagnose_ex.h>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace ::com::sun::star;
@@ -371,6 +370,6 @@ void FormControlHelper::insertControl(uno::Reference<text::XTextRange> const& xT
m_pImpl->getDrawPage()->add(xShape);
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index 3339156ae3b2..abe881592161 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -38,8 +38,7 @@
#include <iostream>
#include <memory>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace com::sun::star;
@@ -320,6 +319,6 @@ OUString GraphicNamingHelper::NameGraphic(const OUString& rTemplate)
return aRet;
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 95a6727027ff..560d5c8645cd 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -84,9 +84,7 @@ bool isTopGroupObj(const uno::Reference<drawing::XShape>& xShape)
}
}
-namespace writerfilter {
-
-namespace dmapper
+namespace writerfilter::dmapper
{
namespace {
@@ -1526,6 +1524,5 @@ sal_Int32 GraphicImport::GetLeftMarginOrig() const
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.cxx b/writerfilter/source/dmapper/LatentStyleHandler.cxx
index 66c383eb7233..484948bfb70e 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.cxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.cxx
@@ -9,9 +9,7 @@
#include "LatentStyleHandler.hxx"
#include <ooxml/resourceids.hxx>
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
{
using namespace ::com::sun::star;
@@ -71,7 +69,6 @@ const std::vector<beans::PropertyValue>& LatentStyleHandler::getAttributes() con
return m_aAttributes;
}
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx
index 2e949fe0f393..cd9145d1f6ea 100644
--- a/writerfilter/source/dmapper/MeasureHandler.cxx
+++ b/writerfilter/source/dmapper/MeasureHandler.cxx
@@ -24,8 +24,7 @@
#include <com/sun/star/text/SizeType.hpp>
#include <comphelper/sequence.hxx>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace ::com::sun::star;
@@ -133,7 +132,6 @@ beans::PropertyValue MeasureHandler::getInteropGrabBag()
return aRet;
}
-} //namespace dmapper
-} //namespace writerfilter
+} //namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx
index 3b3c36c9597e..fa8a688ed9ea 100644
--- a/writerfilter/source/dmapper/ModelEventListener.cxx
+++ b/writerfilter/source/dmapper/ModelEventListener.cxx
@@ -31,8 +31,7 @@
#include <com/sun/star/view/XFormLayerAccess.hpp>
#include <tools/diagnose_ex.h>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace ::com::sun::star;
@@ -115,7 +114,6 @@ void ModelEventListener::disposing( const lang::EventObject& rEvent )
}
}
-} //namespace dmapper
-} //namespace writerfilter
+} //namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 1daedb1e09d3..5574039cca5b 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -45,8 +45,7 @@
using namespace com::sun::star;
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
//--------------------------------------------------- Utility functions
template <typename T>
@@ -1194,6 +1193,5 @@ void ListsManager::CreateNumberingRules( )
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index 3750398c0800..ab9e9861fcee 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -50,8 +50,7 @@
#include <com/sun/star/text/WrapTextMode.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace ::com::sun::star;
@@ -319,7 +318,6 @@ OUString OLEHandler::copyOLEOStream(
return sRet;
}
-} //namespace dmapper
-} //namespace writerfilter
+} //namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PageBordersHandler.cxx b/writerfilter/source/dmapper/PageBordersHandler.cxx
index 1cecd891e738..4a48b0e854be 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.cxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.cxx
@@ -21,8 +21,7 @@
#include <ooxml/resourceids.hxx>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
PgBorder::PgBorder( ) :
m_nDistance( 0 ),
@@ -137,6 +136,6 @@ void PageBordersHandler::SetBorders( SectionPropertyMap* pSectContext )
pSectContext->SetBorderOffsetFrom(m_eOffsetFrom);
}
-} }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index 132ec9f63995..8b925fe37f9f 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -19,8 +19,7 @@
#include <rtl/ustring.hxx>
#include "PropertyIds.hxx"
-namespace writerfilter {
-namespace dmapper{
+namespace writerfilter::dmapper{
OUString getPropertyName( PropertyIds eId )
{
@@ -365,7 +364,6 @@ bool isCharacterProperty( const PropertyIds eId )
return eId > PROP_CHARACTER_STYLES && eId < PROP_CHARACTER_END;
}
-} //namespace dmapper
} //namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index fd8ad553a18f..4174dab5ef0a 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -59,8 +59,7 @@
using namespace com::sun::star;
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
uno::Sequence< beans::PropertyValue > PropertyMap::GetPropertyValues( bool bCharGrabBag )
{
@@ -1992,7 +1991,6 @@ void TablePropertyMap::insertTableProperties( const PropertyMap* pMap, const boo
#endif
}
-} // namespace dmapper
} // namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index 77fc5d89407c..59f59b1b2372 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -21,9 +21,7 @@
#include "TagLogger.hxx"
#include "PropertyMapHelper.hxx"
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
{
using namespace ::com::sun::star;
@@ -98,6 +96,5 @@ void lcl_DumpPropertyValueSeq(css::uno::Sequence<css::beans::PropertyValues> con
#endif // DBG_UTIL
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index bdd82cc11b04..65fa272cea55 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -20,9 +20,7 @@
#include "DomainMapper_Impl.hxx"
#include "StyleSheetTable.hxx"
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
{
using namespace ::com::sun::star;
@@ -210,7 +208,6 @@ bool SdtHelper::containedInInteropGrabBag(const OUString& rValueName)
return false;
}
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.cxx b/writerfilter/source/dmapper/SectionColumnHandler.cxx
index 320708b80a68..1e299b93cb88 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.cxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.cxx
@@ -22,8 +22,7 @@
#include <ooxml/resourceids.hxx>
#include <osl/diagnose.h>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace ::com::sun::star;
@@ -90,7 +89,6 @@ void SectionColumnHandler::lcl_sprm(Sprm & rSprm)
OSL_FAIL( "SectionColumnHandler: unknown sprm");
}
}
-} //namespace dmapper
-} //namespace writerfilter
+} //namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/SmartTagHandler.cxx b/writerfilter/source/dmapper/SmartTagHandler.cxx
index 41f68ac08b0e..2f2c2a943ed0 100644
--- a/writerfilter/source/dmapper/SmartTagHandler.cxx
+++ b/writerfilter/source/dmapper/SmartTagHandler.cxx
@@ -31,9 +31,7 @@ OUString lcl_getTypePath(OUString& rType)
}
}
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
{
using namespace ::com::sun::star;
@@ -123,7 +121,6 @@ void SmartTagHandler::handle(const uno::Reference<text::XTextRange>& xParagraph)
}
}
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 9927f253ed4d..bf3fb63664ed 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -48,8 +48,7 @@
using namespace ::com::sun::star;
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
{
typedef ::std::map< OUString, OUString> StringPairMap_t;
@@ -1567,7 +1566,6 @@ OUString StyleSheetTable::getOrCreateCharStyle( PropertyValueVector_t& rCharProp
return sListLabel;
}
-}//namespace dmapper
}//namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 2c235e678c6d..8f0011ceeb89 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -27,8 +27,7 @@
#include <com/sun/star/text/VertOrientation.hpp>
#include <comphelper/sequence.hxx>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace ::com::sun::star;
@@ -456,7 +455,6 @@ void TDefTableHandler::appendGrabBag(const OUString& aKey, const OUString& aValu
m_aInteropGrabBag.push_back(aProperty);
}
-} //namespace dmapper
} //namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx
index b9384b9e08df..7572e6b39c0d 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -24,9 +24,7 @@
#include <tools/diagnose_ex.h>
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
{
void TableManager::clearData()
@@ -486,6 +484,4 @@ TableManager::~TableManager() = default;
}
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx b/writerfilter/source/dmapper/TablePositionHandler.cxx
index 8cb8a312edfa..ab7886b1d764 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.cxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.cxx
@@ -15,9 +15,7 @@
#include <com/sun/star/text/RelOrientation.hpp>
#include <comphelper/sequenceashashmap.hxx>
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
{
using namespace ::com::sun::star;
@@ -161,7 +159,6 @@ bool TablePositionHandler::operator== (const TablePositionHandler& rHandler) con
m_nX == rHandler.m_nX;
}
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index aa9ad66b5903..13adf771b89d 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -37,8 +37,7 @@
using namespace com::sun::star;
using namespace oox;
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
TablePropertiesHandler::TablePropertiesHandler() :
m_pCurrentInteropGrabBag(nullptr),
@@ -393,6 +392,6 @@ namespace dmapper {
{
m_pCurrentInteropGrabBag = &rValue;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index 3d403d483b55..c6c7d2d60688 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -26,8 +26,7 @@
using namespace css;
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
TblStylePrHandler::TblStylePrHandler( DomainMapper & rDMapper ) :
LoggedProperties("TblStylePrHandler"),
@@ -240,6 +239,6 @@ beans::PropertyValue TblStylePrHandler::getInteropGrabBag(const OUString& aName)
return aRet;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index 1c0a9da9a26c..afd69d0281e4 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -20,8 +20,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
{
using namespace com::sun::star;
@@ -799,7 +798,6 @@ sal_uInt8 TextEffectsHandler::GetTextFillSolidFillAlpha(const css::beans::Proper
return nVal / oox::drawingml::PER_PERCENT;
}
-}//namespace dmapper
-} //namespace writerfilter
+} // namespace
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index 3764a8a95c54..48c01a57cbe5 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -23,8 +23,7 @@
using namespace com::sun::star;
-namespace writerfilter {
-namespace dmapper
+namespace writerfilter::dmapper
{
struct ThemeTable_Impl
@@ -557,7 +556,6 @@ OUString ThemeTable::fromLCIDToScriptTag(LanguageType lang)
}
}
-}//namespace dmapper
} //namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.cxx b/writerfilter/source/dmapper/TrackChangesHandler.cxx
index 71629000ed49..212f88261c4a 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.cxx
+++ b/writerfilter/source/dmapper/TrackChangesHandler.cxx
@@ -13,8 +13,7 @@
#include <oox/token/tokens.hxx>
#include <osl/diagnose.h>
-namespace writerfilter {
-namespace dmapper {
+namespace writerfilter::dmapper {
using namespace ::com::sun::star;
using namespace oox;
@@ -91,7 +90,6 @@ uno::Sequence<beans::PropertyValue> TrackChangesHandler::getRedlineProperties()
void TrackChangesHandler::lcl_sprm(Sprm &) {}
-} //namespace dmapper
-} //namespace writerfilter
+} //namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/domainmapperfactory.cxx b/writerfilter/source/dmapper/domainmapperfactory.cxx
index 3ba69bec8f68..cc581a9eabed 100644
--- a/writerfilter/source/dmapper/domainmapperfactory.cxx
+++ b/writerfilter/source/dmapper/domainmapperfactory.cxx
@@ -10,9 +10,7 @@
#include "DomainMapper.hxx"
#include <unotools/mediadescriptor.hxx>
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
{
Stream::Pointer_t DomainMapperFactory::createMapper(css::uno::Reference<css::uno::XComponentContext> const& xContext,
@@ -34,7 +32,6 @@ Stream::Pointer_t DomainMapperFactory::createMapper(css::uno::Reference<css::uno
return Stream::Pointer_t(new DomainMapper(xContext, xInputStream, xModel, bRepairStorage, eDocumentType, rMediaDesc));
}
-} // namespace dmapper
-} // namespace writerfilter
+} // namespace writerfilter::dmapper
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/util.cxx b/writerfilter/source/dmapper/util.cxx
index c400a47089d0..9c2535dea2e4 100644
--- a/writerfilter/source/dmapper/util.cxx
+++ b/writerfilter/source/dmapper/util.cxx
@@ -21,9 +21,7 @@
#include <string>
#include "util.hxx"
-namespace writerfilter
-{
-namespace dmapper
+namespace writerfilter::dmapper
{
using namespace com::sun::star;
@@ -71,6 +69,4 @@ void resolveSprmProps(Properties & rHandler, Sprm & rSprm)
}
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/Handler.cxx b/writerfilter/source/ooxml/Handler.cxx
index 459e0adc480a..c582b71aba82 100644
--- a/writerfilter/source/ooxml/Handler.cxx
+++ b/writerfilter/source/ooxml/Handler.cxx
@@ -22,8 +22,7 @@
#include <sal/log.hxx>
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
/*
@@ -399,6 +398,6 @@ void OOXMLHyperlinkURLHandler::sprm(Sprm & /*rSprm*/)
{
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
index 429c9ff4c35a..1cf7ba7d01cc 100644
--- a/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
+++ b/writerfilter/source/ooxml/OOXMLBinaryObjectReference.cxx
@@ -19,8 +19,7 @@
#include "OOXMLBinaryObjectReference.hxx"
#include <string.h>
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
using namespace ::com::sun::star;
@@ -67,6 +66,6 @@ void OOXMLBinaryObjectReference::resolve(BinaryObj & rHandler)
mSequence.size());
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index dbf002e1a664..3b963c1e34cf 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -51,8 +51,7 @@
OUString customTarget;
OUString embeddingsTarget;
using namespace ::com::sun::star;
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
OOXMLDocumentImpl::OOXMLDocumentImpl(OOXMLStream::Pointer_t const & pStream, const uno::Reference<task::XStatusIndicator>& xStatusIndicator, bool bSkipImages, const uno::Sequence<beans::PropertyValue>& rDescriptor)
@@ -882,6 +881,5 @@ OOXMLDocumentFactory::createDocument
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index fde5ccc0b425..f9ba5df7e9da 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -22,8 +22,7 @@
#include "OOXMLFactory.hxx"
#include "OOXMLFastHelper.hxx"
-namespace writerfilter {
-namespace ooxml {
+namespace writerfilter::ooxml {
using namespace com::sun::star;
@@ -215,6 +214,5 @@ void OOXMLFactory_ns::attributeAction(OOXMLFastContextHandler *, Token_t, const
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 19dc3bb917e0..14f40a0494d8 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -46,8 +46,7 @@ static const sal_Unicode uSoftHyphen = 0xAD;
static const sal_uInt8 cFtnEdnCont = 0x4;
static const sal_uInt8 cFieldLock = 0x8;
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
using namespace ::com::sun::star;
using namespace oox;
@@ -2149,6 +2148,6 @@ void OOXMLFastContextHandlerMath::process()
}
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
index d2aa979e5f2f..3fc69670b1cc 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx
@@ -22,8 +22,7 @@
#include "OOXMLFastContextHandler.hxx"
#include "OOXMLFactory.hxx"
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
using namespace ::com::sun::star;
using namespace ::std;
@@ -191,6 +190,6 @@ void OOXMLFastDocumentHandler::setIsSubstream( bool bSubstream )
}
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx
index c7fc43e46bdd..fb7ad574457f 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -24,8 +24,7 @@
#include <sal/log.hxx>
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
/*
class OOXMLParserState
@@ -278,6 +277,6 @@ void OOXMLParserState::endTxbxContent()
inTxbxContent = false;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
index 2165524954a2..15e3fc5523ea 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
@@ -26,8 +26,7 @@
#include <sax/tools/converter.hxx>
#include <tools/color.hxx>
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
using namespace ::std;
using namespace com::sun::star;
@@ -856,6 +855,6 @@ void OOXMLPropertySetEntryToBool::attribute(Id nId, Value & rValue)
mValue = (rValue.getInt() != 0);
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 2b773e02cf5e..d29cdf5b6a00 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -26,8 +26,7 @@
#include <com/sun/star/xml/sax/Parser.hpp>
#include <comphelper/storagehelper.hxx>
-namespace writerfilter {
-namespace ooxml
+namespace writerfilter::ooxml
{
using namespace com::sun::star;
@@ -441,6 +440,6 @@ OOXMLDocumentFactory::createStream
return pRet;
}
-}}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfcharsets.cxx b/writerfilter/source/rtftok/rtfcharsets.cxx
index 4309351d9f70..69e416ce8bc5 100644
--- a/writerfilter/source/rtftok/rtfcharsets.cxx
+++ b/writerfilter/source/rtftok/rtfcharsets.cxx
@@ -10,9 +10,7 @@
#include "rtfcharsets.hxx"
#include <sal/macros.h>
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
// See RTF spec v1.9.1, page 19
RTFEncoding const aRTFEncodings[] = {
@@ -52,7 +50,6 @@ RTFEncoding const aRTFEncodings[] = {
int nRTFEncodings = SAL_N_ELEMENTS(aRTFEncodings);
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index 7f3f7f9573d2..38bc9d6dd442 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -10,9 +10,7 @@
#include "rtfcontrolwords.hxx"
#include <oox/token/namespaces.hxx>
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
RTFSymbol const aRTFControlWords[] = {
// sKeyword nControlType nIndex
@@ -1897,7 +1895,6 @@ bool RTFMathSymbol::operator<(const RTFMathSymbol& rOther) const
return m_eKeyword < rOther.m_eKeyword;
}
-} // namespace rtftok
} // namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index 79dfe91504c6..0afb3c1f395c 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -30,9 +30,7 @@
using namespace com::sun::star;
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
{
@@ -661,7 +659,6 @@ RTFError RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
return RTFError::OK;
}
-} // namespace rtftok
} // namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index 894716b2897c..58d4eecf5c26 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -26,9 +26,7 @@
using namespace com::sun::star;
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
{
@@ -1229,7 +1227,6 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
return RTFError::OK;
}
-} // namespace rtftok
} // namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
index 69879fcd1b62..54886fb81d9e 100644
--- a/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchsymbol.cxx
@@ -21,9 +21,7 @@
using namespace com::sun::star;
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
{
@@ -429,7 +427,6 @@ RTFError RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
return RTFError::OK;
}
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentfactory.cxx b/writerfilter/source/rtftok/rtfdocumentfactory.cxx
index 5a8de68916c3..75b109b6842d 100644
--- a/writerfilter/source/rtftok/rtfdocumentfactory.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentfactory.cxx
@@ -9,9 +9,7 @@
#include "rtfdocumentimpl.hxx"
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
RTFDocument::Pointer_t RTFDocumentFactory::createDocument(
css::uno::Reference<css::uno::XComponentContext> const& xContext,
@@ -25,7 +23,6 @@ RTFDocument::Pointer_t RTFDocumentFactory::createDocument(
rMediaDescriptor);
}
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index bb491e363ae9..7981ee6126ba 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -75,9 +75,7 @@ util::DateTime getDateTimeFromUserProp(const OUString& rString)
}
} // anonymous namespace
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
Id getParagraphBorder(sal_uInt32 nIndex)
{
@@ -3830,7 +3828,6 @@ bool RTFFrame::hasProperties() const
|| m_nVertAnchor != 0;
}
-} // namespace rtftok
} // namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx
index d60057d52bb1..d3a84683d3d8 100644
--- a/writerfilter/source/rtftok/rtflookahead.cxx
+++ b/writerfilter/source/rtftok/rtflookahead.cxx
@@ -12,25 +12,14 @@
#include <tools/stream.hxx>
#include "rtftokenizer.hxx"
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace task
+namespace com::sun::star::task
{
class XStatusIndicator;
}
-}
-}
-}
using namespace com::sun::star;
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
RTFLookahead::RTFLookahead(SvStream& rStream, sal_uInt64 nGroupStart)
: m_rStream(rStream)
@@ -107,7 +96,6 @@ void RTFLookahead::finishSubstream() {}
bool RTFLookahead::isSubstream() const { return false; }
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfreferenceproperties.cxx b/writerfilter/source/rtftok/rtfreferenceproperties.cxx
index c2d88ccb9194..d32557bc7d46 100644
--- a/writerfilter/source/rtftok/rtfreferenceproperties.cxx
+++ b/writerfilter/source/rtftok/rtfreferenceproperties.cxx
@@ -9,9 +9,7 @@
#include "rtfreferenceproperties.hxx"
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
RTFReferenceProperties::RTFReferenceProperties(RTFSprms aAttributes, RTFSprms aSprms)
: m_aAttributes(std::move(aAttributes))
@@ -37,7 +35,6 @@ void RTFReferenceProperties::resolve(Properties& rHandler)
}
}
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfreferencetable.cxx b/writerfilter/source/rtftok/rtfreferencetable.cxx
index 48785b0559c1..ffa9eddaec9a 100644
--- a/writerfilter/source/rtftok/rtfreferencetable.cxx
+++ b/writerfilter/source/rtftok/rtfreferencetable.cxx
@@ -9,9 +9,7 @@
#include "rtfreferencetable.hxx"
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
RTFReferenceTable::RTFReferenceTable(Entries_t aEntries)
: m_aEntries(std::move(aEntries))
@@ -26,7 +24,6 @@ void RTFReferenceTable::resolve(Table& rHandler)
rHandler.entry(rEntry.first, rEntry.second);
}
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 86cae03f4260..b0bd39d79830 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -53,9 +53,7 @@
using namespace com::sun::star;
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
RTFSdrImport::RTFSdrImport(RTFDocumentImpl& rDocument,
uno::Reference<lang::XComponent> const& xDstDoc)
@@ -1148,7 +1146,6 @@ void RTFSdrImport::appendGroupProperty(const OUString& aKey, const OUString& aVa
applyProperty(xShape, aKey, aValue);
}
-} // namespace rtftok
} // namespace writerfilter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfskipdestination.cxx b/writerfilter/source/rtftok/rtfskipdestination.cxx
index 8e17b8c47d6b..47ada340e8b8 100644
--- a/writerfilter/source/rtftok/rtfskipdestination.cxx
+++ b/writerfilter/source/rtftok/rtfskipdestination.cxx
@@ -12,9 +12,7 @@
#include <sal/log.hxx>
#include "rtflistener.hxx"
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
RTFSkipDestination::RTFSkipDestination(RTFListener& rImport)
: m_rImport(rImport)
@@ -40,7 +38,6 @@ void RTFSkipDestination::setParsed(bool bParsed) { m_bParsed = bParsed; }
void RTFSkipDestination::setReset(bool bReset) { m_bReset = bReset; }
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index c7ae29effe2e..22cdda6b4b6f 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -14,9 +14,7 @@
#include "rtfdocumentimpl.hxx"
#include <algorithm>
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
RTFSprm::RTFSprm(Id nKeyword, RTFValue::Pointer_t& pValue)
: m_nKeyword(nKeyword)
@@ -438,7 +436,6 @@ void RTFSprms::clear()
m_pSprms = tools::SvRef<RTFSprmsImpl>(new RTFSprmsImpl);
}
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 0b39232cd983..5f5782cea8d7 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -23,9 +23,7 @@
using namespace com::sun::star;
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
std::unordered_map<OString, RTFSymbol> RTFTokenizer::s_aRTFControlWords;
bool RTFTokenizer::s_bControlWordsInitialised;
@@ -328,7 +326,6 @@ OUString RTFTokenizer::getPosition()
return aRet.makeStringAndClear();
}
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx b/writerfilter/source/rtftok/rtfvalue.cxx
index 49ebfc10eef4..e4b3a5a11c68 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -13,9 +13,7 @@
using namespace com::sun::star;
-namespace writerfilter
-{
-namespace rtftok
+namespace writerfilter::rtftok
{
RTFValue::RTFValue(int nValue, OUString sValue, const RTFSprms& rAttributes, const RTFSprms& rSprms,
uno::Reference<drawing::XShape> xShape, uno::Reference<io::XInputStream> xStream,
@@ -207,7 +205,6 @@ RTFSprms& RTFValue::getAttributes() { return *m_pAttributes; }
RTFSprms& RTFValue::getSprms() { return *m_pSprms; }
-} // namespace rtftok
-} // namespace writerfilter
+} // namespace writerfilter::rtftok
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/qa/unit/WpftFilterFixture.cxx b/writerperfect/qa/unit/WpftFilterFixture.cxx
index f7c3dfcc5999..142ff22c36be 100644
--- a/writerperfect/qa/unit/WpftFilterFixture.cxx
+++ b/writerperfect/qa/unit/WpftFilterFixture.cxx
@@ -17,9 +17,7 @@ namespace document = com::sun::star::document;
namespace frame = com::sun::star::frame;
namespace uno = com::sun::star::uno;
-namespace writerperfect
-{
-namespace test
+namespace writerperfect::test
{
void WpftFilterFixture::setUp()
{
@@ -33,6 +31,5 @@ void WpftFilterFixture::setUp()
m_xTypeMap.set(m_xTypeDetection, uno::UNO_QUERY_THROW);
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/qa/unit/WpftFilterTestBase.cxx b/writerperfect/qa/unit/WpftFilterTestBase.cxx
index ea6ad5a89612..1c5989c792bb 100644
--- a/writerperfect/qa/unit/WpftFilterTestBase.cxx
+++ b/writerperfect/qa/unit/WpftFilterTestBase.cxx
@@ -17,9 +17,7 @@
namespace uno = com::sun::star::uno;
-namespace writerperfect
-{
-namespace test
+namespace writerperfect::test
{
WpftFilterTestBase::WpftFilterTestBase(const OUString& rFactoryURL)
: ::test::FiltersTest()
@@ -60,6 +58,5 @@ void WpftFilterTestBase::doTest(const OUString& rFilter, const OUString& rPath,
m_pOptionalMap = nullptr;
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/qa/unit/WpftLoader.cxx b/writerperfect/qa/unit/WpftLoader.cxx
index f29cd89c001f..f28937668e5b 100644
--- a/writerperfect/qa/unit/WpftLoader.cxx
+++ b/writerperfect/qa/unit/WpftLoader.cxx
@@ -38,9 +38,7 @@ namespace ucb = com::sun::star::ucb;
namespace uno = com::sun::star::uno;
namespace util = com::sun::star::util;
-namespace writerperfect
-{
-namespace test
+namespace writerperfect::test
{
WpftLoader::WpftLoader(const OUString& rURL,
const css::uno::Reference<css::document::XFilter>& rxFilter,
@@ -207,6 +205,5 @@ void WpftLoader::impl_detectFilterName(uno::Sequence<beans::PropertyValue>& rDes
throw container::NoSuchElementException();
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx b/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
index abae977a6389..f281e39a4556 100644
--- a/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
+++ b/writerperfect/source/writer/exp/XMLBase64ImportContext.cxx
@@ -13,9 +13,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
XMLBase64ImportContext::XMLBase64ImportContext(XMLImport& rImport)
: XMLImportContext(rImport)
@@ -62,7 +60,6 @@ const librevenge::RVNGBinaryData& XMLBase64ImportContext::getBinaryData() const
return m_aBinaryData;
}
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx b/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
index d11ad62e7357..cdc08c50b697 100644
--- a/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
+++ b/writerperfect/source/writer/exp/XMLFootnoteImportContext.cxx
@@ -16,9 +16,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
namespace
{
@@ -123,7 +121,6 @@ void XMLFootnoteImportContext::startElement(
const css::uno::Reference<css::xml::sax::XAttributeList>& /*xAttribs*/)
{
}
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLSectionContext.cxx b/writerperfect/source/writer/exp/XMLSectionContext.cxx
index dbd1f9663539..839400e52a36 100644
--- a/writerperfect/source/writer/exp/XMLSectionContext.cxx
+++ b/writerperfect/source/writer/exp/XMLSectionContext.cxx
@@ -14,9 +14,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
XMLSectionContext::XMLSectionContext(XMLImport& rImport)
: XMLImportContext(rImport)
@@ -41,7 +39,6 @@ void XMLSectionContext::endElement(const OUString& /*rName*/)
GetImport().GetGenerator().closeSection();
}
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
index 23a60970bc1a..d6f0a3fd5c30 100644
--- a/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextFrameContext.cxx
@@ -18,9 +18,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
namespace
{
@@ -168,7 +166,6 @@ void XMLTextFrameContext::endElement(const OUString& /*rName*/)
GetImport().GetGenerator().closeFrame();
}
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLTextListContext.cxx b/writerperfect/source/writer/exp/XMLTextListContext.cxx
index 77a378e8179d..8798c9a396d6 100644
--- a/writerperfect/source/writer/exp/XMLTextListContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextListContext.cxx
@@ -13,9 +13,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
XMLTextListContext::XMLTextListContext(XMLImport& rImport)
: XMLImportContext(rImport)
@@ -30,7 +28,6 @@ rtl::Reference<XMLImportContext> XMLTextListContext::CreateChildContext(
return nullptr;
}
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/XMLTextListItemContext.cxx b/writerperfect/source/writer/exp/XMLTextListItemContext.cxx
index 16a64d0bcdaf..36f3f2ce63e7 100644
--- a/writerperfect/source/writer/exp/XMLTextListItemContext.cxx
+++ b/writerperfect/source/writer/exp/XMLTextListItemContext.cxx
@@ -14,9 +14,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
XMLTextListItemContext::XMLTextListItemContext(XMLImport& rImport)
: XMLImportContext(rImport)
@@ -33,7 +31,6 @@ rtl::Reference<XMLImportContext> XMLTextListItemContext::CreateChildContext(
return nullptr;
}
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/txtparai.cxx b/writerperfect/source/writer/exp/txtparai.cxx
index e3ba3bde1f26..11dfd8cfe908 100644
--- a/writerperfect/source/writer/exp/txtparai.cxx
+++ b/writerperfect/source/writer/exp/txtparai.cxx
@@ -50,9 +50,7 @@ void FillStyle(const OUString& rName, std::map<OUString, librevenge::RVNGPropert
}
}
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
namespace
{
@@ -627,7 +625,6 @@ void FillStyles(const OUString& rName,
FillStyle(rName, rNamedStyles, rAutomaticStyles, rNamedStyles, rPropertyList);
}
-} // namespace exp
} // namespace writerperfect
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/txtstyli.cxx b/writerperfect/source/writer/exp/txtstyli.cxx
index 9c7a156de984..53ac4b4e52f0 100644
--- a/writerperfect/source/writer/exp/txtstyli.cxx
+++ b/writerperfect/source/writer/exp/txtstyli.cxx
@@ -13,9 +13,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
namespace
{
@@ -412,7 +410,6 @@ librevenge::RVNGPropertyList& XMLStyleContext::GetPageLayoutPropertyList()
return m_aPageLayoutPropertyList;
}
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/xmlfmt.cxx b/writerperfect/source/writer/exp/xmlfmt.cxx
index eaba8085fa4e..f34540dddc1e 100644
--- a/writerperfect/source/writer/exp/xmlfmt.cxx
+++ b/writerperfect/source/writer/exp/xmlfmt.cxx
@@ -17,9 +17,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
XMLStylesContext::XMLStylesContext(XMLImport& rImport, StyleType eType)
: XMLImportContext(rImport)
@@ -292,7 +290,6 @@ rtl::Reference<XMLImportContext> XMLFontFaceDeclsContext::CreateChildContext(
return nullptr;
}
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/xmlictxt.cxx b/writerperfect/source/writer/exp/xmlictxt.cxx
index 02ac21ab73e3..ebfe58402ff3 100644
--- a/writerperfect/source/writer/exp/xmlictxt.cxx
+++ b/writerperfect/source/writer/exp/xmlictxt.cxx
@@ -13,9 +13,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
XMLImportContext::XMLImportContext(XMLImport& rImport)
: mrImport(rImport)
@@ -53,7 +51,6 @@ void XMLImportContext::setDocumentLocator(
{
}
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/xmlimp.cxx b/writerperfect/source/writer/exp/xmlimp.cxx
index 09692ccc9308..9ade95990987 100644
--- a/writerperfect/source/writer/exp/xmlimp.cxx
+++ b/writerperfect/source/writer/exp/xmlimp.cxx
@@ -32,9 +32,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
namespace
{
@@ -614,7 +612,6 @@ void XMLImport::HandlePageSpan(const librevenge::RVNGPropertyList& rPropertyList
}
}
-} // namespace exp
} // namespace writerperfect
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/xmlmetai.cxx b/writerperfect/source/writer/exp/xmlmetai.cxx
index 76b8699f5e97..2e42f740f419 100644
--- a/writerperfect/source/writer/exp/xmlmetai.cxx
+++ b/writerperfect/source/writer/exp/xmlmetai.cxx
@@ -13,9 +13,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
namespace
{
@@ -282,7 +280,6 @@ void XMPParser::processingInstruction(const OUString& /*rTarget*/, const OUStrin
void XMPParser::setDocumentLocator(const uno::Reference<xml::sax::XLocator>& /*xLocator*/) {}
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/xmltbli.cxx b/writerperfect/source/writer/exp/xmltbli.cxx
index 68e0b29116a4..0e5818f0b17f 100644
--- a/writerperfect/source/writer/exp/xmltbli.cxx
+++ b/writerperfect/source/writer/exp/xmltbli.cxx
@@ -17,9 +17,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
namespace
{
@@ -251,7 +249,6 @@ void XMLTableContext::endElement(const OUString& /*rName*/)
}
}
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerperfect/source/writer/exp/xmltext.cxx b/writerperfect/source/writer/exp/xmltext.cxx
index d976ebdbf846..01e185c4391c 100644
--- a/writerperfect/source/writer/exp/xmltext.cxx
+++ b/writerperfect/source/writer/exp/xmltext.cxx
@@ -17,9 +17,7 @@
using namespace com::sun::star;
-namespace writerperfect
-{
-namespace exp
+namespace writerperfect::exp
{
XMLBodyContentContext::XMLBodyContentContext(XMLImport& rImport)
: XMLImportContext(rImport)
@@ -52,7 +50,6 @@ rtl::Reference<XMLImportContext> CreateTextChildContext(XMLImport& rImport, cons
return nullptr;
}
-} // namespace exp
-} // namespace writerperfect
+} // namespace writerperfect::exp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index 388e33d60e01..14ed004f4028 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -74,9 +74,7 @@ sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& N
} // anonymous namespace
-namespace xmloff
-{
-namespace chart
+namespace xmloff::chart
{
ColorPropertySet::ColorPropertySet( sal_Int32 nColor ) :
@@ -154,7 +152,6 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyDefault( const OUString& aPropert
return uno::Any();
}
-} // namespace chart
-} // namespace xmloff
+} // namespace xmloff::chart
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index bbd9aa3fcf7c..96115303c31b 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -22,7 +22,7 @@
#include <rtl/ustring.hxx>
-namespace xmloff { namespace token {
+namespace xmloff::token {
// keep the tokens (and their length)
namespace
@@ -3433,6 +3433,5 @@ namespace xmloff { namespace token {
return aIter.isString( pToken->pChar );
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index 3abca04a50db..22e88df0ced6 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -22,7 +22,7 @@
#include <unordered_map>
#include <memory>
-namespace xmloff { namespace EnhancedCustomShapeToken {
+namespace xmloff::EnhancedCustomShapeToken {
typedef std::unordered_map< const char*, EnhancedCustomShapeTokenEnum, rtl::CStringHash, rtl::CStringEqual> TypeNameHashMap;
static TypeNameHashMap* pHashMap = nullptr;
@@ -205,6 +205,5 @@ OUString EASGet( const EnhancedCustomShapeTokenEnum eToken )
}
}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/forms/property_meta_data.cxx b/xmloff/source/forms/property_meta_data.cxx
index 9f99426091e9..5908f1396b9a 100644
--- a/xmloff/source/forms/property_meta_data.cxx
+++ b/xmloff/source/forms/property_meta_data.cxx
@@ -31,7 +31,7 @@
#include <unordered_map>
-namespace xmloff { namespace metadata
+namespace xmloff::metadata
{
using namespace ::xmloff::token;
@@ -171,6 +171,6 @@ namespace xmloff { namespace metadata
return attribute;
}
-} } // namespace xmloff::metadata
+} // namespace xmloff::metadata
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
index a9a22991eac7..db928cde972c 100644
--- a/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
+++ b/xmloff/source/text/XMLTextCharStyleNamesElementExport.cxx
@@ -24,9 +24,7 @@
#include <xmloff/xmlexp.hxx>
#include <osl/diagnose.h>
-namespace com { namespace sun { namespace star {
- namespace beans { class XPropertySet; }
-} } }
+namespace com::sun::star::beans { class XPropertySet; }
using namespace ::com::sun::star::uno;
using ::com::sun::star::beans::XPropertySet;
diff --git a/xmlsecurity/source/pdfio/pdfdocument.cxx b/xmlsecurity/source/pdfio/pdfdocument.cxx
index febcd2e3a1ea..b39dd5407ce9 100644
--- a/xmlsecurity/source/pdfio/pdfdocument.cxx
+++ b/xmlsecurity/source/pdfio/pdfdocument.cxx
@@ -23,9 +23,7 @@
using namespace com::sun::star;
-namespace xmlsecurity
-{
-namespace pdfio
+namespace xmlsecurity::pdfio
{
bool ValidateSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignature,
SignatureInformation& rInformation, bool bLast)
@@ -169,7 +167,6 @@ bool ValidateSignature(SvStream& rStream, vcl::filter::PDFObjectElement* pSignat
rInformation);
}
-} // namespace pdfio
-} // namespace xmlsecurity
+} // namespace xmlsecurity::pdfio
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */